diff --git a/.github/workflows/reusable_docker_build.yml b/.github/workflows/reusable_docker_build.yml index 8174cdc..5736e18 100644 --- a/.github/workflows/reusable_docker_build.yml +++ b/.github/workflows/reusable_docker_build.yml @@ -102,7 +102,7 @@ jobs: build-args: | ARCH=default BRANCH=${{ inputs.firedrake-branch }} - PETSC_EXTRA_ARGS=--download-eigen --download-metis --download-parmetis --download-mmg --download-mmg-cmake-arguments=-DUSE_SCOTCH=OFF --download-parmmg + PETSC_EXTRA_ARGS=--download-metis --download-parmetis --download-mmg --download-mmg-cmake-arguments=-DUSE_SCOTCH=OFF --download-parmmg - name: Save Docker image if: ${{ inputs.save-docker-image-artifact != null }} diff --git a/wiki/Installation-Instructions.md b/wiki/Installation-Instructions.md index 9e13b18..cab90be 100644 --- a/wiki/Installation-Instructions.md +++ b/wiki/Installation-Instructions.md @@ -11,9 +11,9 @@ As described on the [Firedrake installation page](https://www.firedrakeproject.o 2. Installing PETSc 3. Installing Firedrake itself. -To use the mesh adaptation modules, we can install system dependencies (step 1) and Firedrake (step 3) exactly as described, but we must [customise the PETSc installation](https://www.firedrakeproject.org/install.html#id29) (step 2) to install additional packages: Eigen, ParMETIS, MMG, and ParMMG. We do that simply by passing the `--download-` flags when running PETSc `configure`: +To use the mesh adaptation modules, we can install system dependencies (step 1) and Firedrake (step 3) exactly as described, but we must [customise the PETSc installation](https://www.firedrakeproject.org/install.html#id29) (step 2) to install additional packages: METIS, ParMETIS, MMG, and ParMMG. We do that simply by passing the `--download-` flags when running PETSc `configure`: ``` -python3 ../firedrake-configure --show-petsc-configure-options | xargs -L1 ./configure --download-eigen --download-metis --download-parmetis --download-mmg --download-mmg-cmake-arguments=-DUSE_SCOTCH=OFF --download-parmmg +python3 ../firedrake-configure --show-petsc-configure-options | xargs -L1 ./configure --download-metis --download-parmetis --download-mmg --download-mmg-cmake-arguments=-DUSE_SCOTCH=OFF --download-parmmg ``` ### Reconfiguring an existing installation @@ -21,7 +21,7 @@ python3 ../firedrake-configure --show-petsc-configure-options | xargs -L1 ./conf If you have previously installed PETSc without the additional mesh adaptation packages listed above, you can install them using PETSc's [reconfigure](https://petsc.org/release/install/multibuild/#reconfigure) script as follows: ``` cd $PETSC_DIR -$PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/reconfigure-$PETSC_ARCH.py --download-eigen --download-metis --download-parmetis --download-mmg --download-mmg-cmake-arguments=-DUSE_SCOTCH=OFF --download-parmmg +$PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/reconfigure-$PETSC_ARCH.py --download-metis --download-parmetis --download-mmg --download-mmg-cmake-arguments=-DUSE_SCOTCH=OFF --download-parmmg make PETSC_DIR=${PETSC_DIR} PETSC_ARCH=${PETSC_ARCH} all ```