Merge branch 'NOAA-EMC:develop' into c5OSup

NOAA-EMC · Oct 18, 2024 · ad35fff · ad35fff
2 parents 620f4ef + ef204d7
commit ad35fff
Show file tree

Hide file tree

Showing 11 changed files with 386 additions and 237 deletions.
diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -31,7 +31,7 @@ env:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: checkout-upp  # This is for getting spack.yaml
@@ -67,7 +67,7 @@ jobs:
 
   build:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: checkout-upp

diff --git a/modulefiles/hera_external_ifi.lua b/modulefiles/hera_external_ifi.lua
@@ -0,0 +1,6 @@
+help([[
+Load external libIFI for UPP on hera
+]])
+
+prepend_path("MODULEPATH", "/scratch2/BMC/ifi/modulefiles")
+load("ifi/20230511-intel-2022.1.2")
diff --git a/modulefiles/hera_ifi_test_prereqs.lua b/modulefiles/hera_ifi_test_prereqs.lua
@@ -0,0 +1,6 @@
+help([[
+Load prerequisites for IFI's own internal test programs and its "fip2 lookalike." This is only needed with the internal IFI when building with -DBUILD_IFI_EXECUTABLES=ON (the -B option to compile_upp.sh).
+]])
+
+
+load("netcdf-cxx4/4.3.1")
diff --git a/modulefiles/jet_external_ifi.lua b/modulefiles/jet_external_ifi.lua
@@ -0,0 +1,6 @@
+help([[
+Load external libIFI for UPP on hera
+]])
+
+prepend_path("MODULEPATH", "/lfs5/BMC/ifi/modulefiles")
+load("ifi/20241001-intel-2022.1.2")
diff --git a/modulefiles/jet_ifi_test_prereqs.lua b/modulefiles/jet_ifi_test_prereqs.lua
@@ -0,0 +1,6 @@
+help([[
+Load prerequisites for IFI's own internal test programs and its "fip2 lookalike." This is only needed with the internal IFI when building with -DBUILD_IFI_EXECUTABLES=ON (the -B option to compile_upp.sh).
+]])
+
+
+load("netcdf-cxx4/4.3.1")
diff --git a/sorc/libIFI.fd b/sorc/libIFI.fd