Add changes for rocky8 on jet.

NOAA-EMC · Mar 17, 2024 · 3f31db8 · 3f31db8
1 parent fe72b17
commit 3f31db8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/modulefiles/jet.lua b/modulefiles/jet.lua
@@ -2,7 +2,7 @@ help([[
 Load environment to build UPP on Jet
 ]])
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))

diff --git a/modulefiles/jet_c.lua b/modulefiles/jet_c.lua
@@ -0,0 +1,22 @@
+help([[
+Load environment to build UPP on Jet
+]])
+
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
+load("upp_common")
+
+setenv("CC","mpiicc")
+setenv("CXX","mpiicpc")
+setenv("FC","mpiifort")
+
+whatis("Description: UPP build environment")
diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
@@ -57,10 +57,10 @@ case $(hostname -f) in
   hfe11)                   MACHINE_ID=hera ;; ### hera11
   hfe12)                   MACHINE_ID=hera ;; ### hera12
 
-  fe1)                     MACHINE_ID=jet ;; ### jet01
-  fe2)                     MACHINE_ID=jet ;; ### jet02
-  fe3)                     MACHINE_ID=jet ;; ### jet03
-  fe4)                     MACHINE_ID=jet ;; ### jet04
+  fe1)                     MACHINE_ID=jet_c ;; ### jet01
+  fe2)                     MACHINE_ID=jet_c ;; ### jet02
+  fe3)                     MACHINE_ID=jet_c ;; ### jet03
+  fe4)                     MACHINE_ID=jet_c ;; ### jet04
   fe5)                     MACHINE_ID=jet ;; ### jet05
   fe6)                     MACHINE_ID=jet ;; ### jet06
   fe7)                     MACHINE_ID=jet ;; ### jet07