Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix modulefiles for Hera/Rocky8 OS. #2194

Merged
merged 10 commits into from
Mar 22, 2024
4 changes: 1 addition & 3 deletions modulefiles/ufs_hera.gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
526 changes: 263 additions & 263 deletions tests/logs/RegressionTests_derecho.log

Large diffs are not rendered by default.

540 changes: 270 additions & 270 deletions tests/logs/RegressionTests_gaea.log

Large diffs are not rendered by default.

732 changes: 365 additions & 367 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

797 changes: 438 additions & 359 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

620 changes: 349 additions & 271 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand Down Expand Up @@ -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 |
jkbk2004 marked this conversation as resolved.
Show resolved Hide resolved

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 |
Expand Down