Upgraded PETSc minimum to 3.18.6.

Workarounds for 3.16 can be reverted. 3.16 does not build on recent Arch, make 4.4.1, see https://gitlab.com/petsc/petsc/-/merge_requests/6140
ufz · Dec 22, 2023 · 889b368 · 889b368
1 parent 7b1d028
commit 889b368
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
diff --git a/scripts/ci/jobs/package.yml b/scripts/ci/jobs/package.yml
@@ -62,8 +62,6 @@ create cpm cache:
     - cd ext
     - wget --no-verbose --output-document tfel-rliv-${TFEL_RLIV_VERSION}.zip https://github.com/thelfer/tfel/archive/refs/heads/rliv-${TFEL_RLIV_VERSION}.zip
     - wget --no-verbose --output-document petsc-v${PETSC_VERSION}.zip https://gitlab.com/petsc/petsc/-/archive/v${PETSC_VERSION}/petsc-v${PETSC_VERSION}.zip
-    # Remove after upgrading PETSc to > 3.18
-    - wget --no-verbose --output-document f2cblaslapack-3.4.2.q4.tar.gz http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz
     - wget --no-verbose --output-document lis-${LIS_VERSION}.zip https://github.com/anishida/lis/archive/refs/tags/${LIS_VERSION}.zip
     - wget --no-verbose --output-document hdf5-${HDF5_VERSION}.zip https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${HDF5_VERSION//./_}.zip
     - wget --no-verbose --output-document vtk-v${VTK_VERSION}.zip https://github.com/Kitware/VTK/archive/refs/tags/v${VTK_VERSION}.zip
@@ -104,5 +102,4 @@ offline configure:
       rm CMakeCache.txt
       cmake ../../ogs -B . -G Ninja --preset release-petsc \
         -DOGS_DOWNLOAD_CPM_CACHE=ON \
-        -DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext \
-        -DOGS_PETSC_CONFIG_OPTIONS="--download-f2cblaslapack=$PWD/ext/f2cblaslapack-3.4.2.q4.tar.gz"
+        -DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext
diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake
@@ -159,20 +159,14 @@ if(OGS_USE_PETSC)
         endif()
 
         unset(ENV{PETSC_DIR})
-        # Remove after upgrading PETSc to > 3.18
-        file(
-            DOWNLOAD
-            http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz
-            ${CMAKE_CURRENT_BINARY_DIR}/f2cblaslapack-3.4.2.q4.tar.gz
-        )
         BuildExternalProject(
             PETSc ${_petsc_source}
             LOG_OUTPUT_ON_FAILURE ON
             CONFIGURE_COMMAND
                 ./configure
-                --download-f2cblaslapack=${CMAKE_CURRENT_BINARY_DIR}/f2cblaslapack-3.4.2.q4.tar.gz
                 --prefix=<INSTALL_DIR>
-                --download-hypre
+                --download-f2cblaslapack=1
+                --download-hypre=1
                 --with-debugging=$<CONFIG:Debug>
                 ${_configure_opts}
                 ${OGS_PETSC_CONFIG_OPTIONS}

diff --git a/web/data/versions.json b/web/data/versions.json
@@ -16,7 +16,7 @@
     "eigen": "3.4.0",
     "eigen-unsupported": "9441d94dccccd5db8d64179516fdc5b53994a047",
     "vtk": "9.1.0",
-    "petsc": "3.16.1",
+    "petsc": "3.18.6",
     "qt": "5.14.2",
     "python": "3.6",
     "snakemake": "7.20.0",