Merge pull request NOAA-EMC#9 from JessicaMeixner-NOAA/new/scotchfix

Update to CMAKE and CI testing for SCOTCH
aliabdolali · Feb 12, 2023 · 8184ada · 8184ada
2 parents 1401eda + 3007ca8
commit 8184ada
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/gnu.yml b/.github/workflows/gnu.yml
@@ -7,7 +7,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  cache_key: gnu7
+  cache_key: gnu8
   CC: gcc-10
   FC: gfortran-10
   CXX: g++-10

diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
@@ -8,7 +8,7 @@ concurrency:
 
 # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran
 env:
-  cache_key: intel8
+  cache_key: intel9
   CC: icc
   FC: ifort
   CXX: icpc

diff --git a/cmake/FindSCOTCH.cmake b/cmake/FindSCOTCH.cmake
@@ -46,9 +46,7 @@ set_target_properties(PTSCOTCHparmetis::PTSCOTCHparmetis PROPERTIES
 
 
 ## Interfaces and links
-  target_link_libraries(PTSCOTCHparmetis::PTSCOTCHparmetis INTERFACE PTSCOTCHerr::PTSCOTCHerr SCOTCHerr::SCOTCHerr PTSCOTCH::PTSCOTCH SCOTCH::SCOTCH)
-
-  target_link_libraries(ww3_lib PUBLIC PTSCOTCHparmetis::PTSCOTCHparmetis SCOTCHerr::SCOTCHerr)
+target_link_libraries(PTSCOTCHparmetis::PTSCOTCHparmetis INTERFACE PTSCOTCH::PTSCOTCH PTSCOTCHerr::PTSCOTCHerr  SCOTCH::SCOTCH)
 
 
 ## Finalize find_package

diff --git a/model/bin/switch_ite_pdlib b/model/bin/switch_ite_pdlib
@@ -1 +1 @@
-NOGRB PDLIB METIS TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IC0 IS0 REF1 WNT2 WNX1 RWND CRT1 CRX1 TIDE O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
+NOGRB PDLIB SCOTCH TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IC0 IS0 REF1 WNT2 WNX1 RWND CRT1 CRX1 TIDE O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
diff --git a/model/ci/spack_gnu.yaml b/model/ci/spack_gnu.yaml
@@ -6,6 +6,7 @@ spack:
   specs:
   - [email protected]~shared
   - [email protected]~shared
+  - [email protected]+mpi+metis~shared
   - [email protected]~dap
   - [email protected]
   - [email protected]
@@ -15,4 +16,4 @@ spack:
   - [email protected]~pio~pnetcdf~xerces
   view: true
   concretizer:
-    unify: true
+    unify: when_possible
diff --git a/model/ci/spack_intel.yaml b/model/ci/spack_intel.yaml
@@ -7,6 +7,7 @@ spack:
   specs:
   - [email protected]~shared
   - [email protected]~shared
+  - [email protected]+mpi+metis~shared
   - [email protected]~dap
   - [email protected]
   - [email protected]
@@ -17,4 +18,4 @@ spack:
   - intel-oneapi-mpi %intel
   view: true
   concretizer:
-    unify: true
+    unify: when_possible
diff --git a/model/src/CMakeLists.txt b/model/src/CMakeLists.txt
@@ -160,7 +160,7 @@ if("PDLIB" IN_LIST switches)
   if("SCOTCH" IN_LIST switches)
   find_package(SCOTCH REQUIRED)
   target_sources(ww3_lib PRIVATE ${pdlib_src})
-  target_link_libraries(ww3_lib PUBLIC SCOTCH::SCOTCH)
+  target_link_libraries(ww3_lib PUBLIC PTSCOTCHparmetis::PTSCOTCHparmetis)
 elseif("METIS"  IN_LIST switches)
   find_package(ParMETIS REQUIRED)
   target_sources(ww3_lib PRIVATE ${pdlib_src})
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		NOGRB PDLIB METIS TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IC0 IS0 REF1 WNT2 WNX1 RWND CRT1 CRX1 TIDE O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
		NOGRB PDLIB SCOTCH TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IC0 IS0 REF1 WNT2 WNX1 RWND CRT1 CRX1 TIDE O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7