Fix modulefiles for Hera/Rocky8 OS. (#2194)

- update module paths in Hera intel/gnu lua files for Rocky8 OS spack-stack libraries.
ufs-community · Mar 22, 2024 · 7fdb58c · 7fdb58c
1 parent 3c8338c
commit 7fdb58c
Show file tree

Hide file tree

Showing 8 changed files with 1,690 additions and 1,537 deletions.
diff --git a/modulefiles/ufs_hera.gnu.lua b/modulefiles/ufs_hera.gnu.lua
@@ -2,9 +2,7 @@ help([[
 loads UFS Model prerequisites for Hera/GNU
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
--- for openmpi, need
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
 
 stack_gnu_ver=os.getenv("stack_gnu_ver") or "9.2.0"
 load(pathJoin("stack-gcc", stack_gnu_ver))

diff --git a/modulefiles/ufs_hera.intel.lua b/modulefiles/ufs_hera.intel.lua
@@ -2,7 +2,7 @@ help([[
 loads UFS Model prerequisites for Hera/Intel
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/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/tests/logs/RegressionTests_derecho.log b/tests/logs/RegressionTests_derecho.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -374,7 +374,7 @@ RUN | gnv1_c96_no_nest_debug                            | + hera hercules
 
 
 COMPILE | wam_debug | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | + hera hercules | fv3 |
-RUN | control_wam_debug                                 | + hera                     | baseline |
+RUN | control_wam_debug                                 | + hercules                     | baseline |
 
 
 ### 32-bit physics tests ###
@@ -413,13 +413,13 @@ RUN | rap_control_dyn64_phy32_debug                     | + hera hercules
 
 ### S2S tests ###
 COMPILE | s2swa | gnu | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera hercules | fv3 |
-RUN | cpld_control_p8                                   | + hera                     | baseline |
+# RUN | cpld_control_p8                                   | + hera                     | baseline |
 
 COMPILE | s2s | gnu | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera hercules | fv3 |
 RUN | cpld_control_nowave_noaero_p8                     | + hera                     | baseline |
 
 COMPILE | s2swa_debug | gnu | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera hercules | fv3 |
-RUN | cpld_debug_p8                                     | + hera                     | baseline |
+# RUN | cpld_debug_p8                                     | + hera                     | baseline |
 
 # Unstructured WW3
 COMPILE | s2sw_pdlib | gnu | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | + hera hercules | fv3 |