Merge branch 'eve-petsc-module' into 'master'

[eve] Use modules for petsc and hdf5. See merge request ogs/ogs!4852
ufz · Jan 4, 2024 · 2f85a04 · 2f85a04
2 parents f4d70c9 + adb11f5
commit 2f85a04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake
@@ -149,10 +149,10 @@ if(OGS_USE_PETSC)
         set(_petsc_source URL ${_petsc_source_file})
     elseif(NOT (OGS_PETSC_CONFIG_OPTIONS OR OGS_BUILD_PETSC))
         find_package(PkgConfig REQUIRED)
-        pkg_search_module(PETSC IMPORTED_TARGET PETSc)
+        pkg_search_module(PETSc IMPORTED_TARGET PETSc)
     endif()
 
-    if(NOT PETSC_FOUND)
+    if(NOT TARGET PkgConfig::PETSc)
         set(_configure_opts "")
         if(NOT "--download-fc" IN_LIST OGS_PETSC_CONFIG_OPTIONS)
             list(APPEND _configure_opts --with-fc=0)

diff --git a/scripts/env/eve/petsc.sh b/scripts/env/eve/petsc.sh
@@ -7,11 +7,13 @@ fi
 source $DIR/mpi.sh
 
 # TODO build these for foss2022b or remove it:
-#module load petsc/3.18.5_foss2020b
 #module load vtk/9.2.5_mpi_foss2020b
-#module load hdf5/1.14.0_mpi_foss_2020b
 
-export OGS_PETSC_CONFIG_OPTIONS="--download-fc;--download-mumps;--download-hypre;--download-scalapack"
+module load petsc/3.19.5_foss2022b
+module load hdf5/1.14.2_mpi_foss_2022b
+
+export CMAKE_PREFIX_PATH=/global/apps/petsc/3.19.5.foss_2022b
+export HDF5_ROOT=/global/apps/hdf5/1.14.2_mpi
 
 echo -e "Note: If you want to run a simulation on the cluster be aware of the"\
      "mixed CPU architecture. There are Sandy-Bridge-based nodes (orte-28,"\