Clean up IFI support and add library prereqs to modulefiles (#1056)

* modulefile for external ifi on hera * IFI.F: less wordy logging and faster IFI debug output * compile_upp.sh: -B = build ifi executables & -D = option sent to cmake * update libIFI hash * correct argument length to eliminate runtime error * update libIFI.fd hash * IFI.F: some code cleanup and correctly handle spval * compile_upp.sh: -B flag to compile IFI executables * connect new library requirements to build system * Jet module paths for ifi * remove duplicate line * add hera rt log * add hercules rt log * add orion rt log * update author information in INITPOST_NETCDF.f * gcc tests use same ubuntu version as intel * gcc tests ubuntu 22.04 * explicitly specify gcc 11 hoping it will work * set ubuntu 22.04 in another place * revert accidental change * update libIFI.fd hash --------- Co-authored-by: WenMeng-NOAA <[email protected]> Co-authored-by: gspetro-NOAA <[email protected]>
NOAA-EMC · Oct 17, 2024 · ef204d7 · ef204d7
1 parent 72108ee
commit ef204d7
Show file tree

Hide file tree

Showing 12 changed files with 415 additions and 241 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