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.

Sign up for GitHub

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

RDHPCS Hera Rocky-8 support #924

Merged
merged 12 commits into from
Mar 21, 2024
Merged

RDHPCS Hera Rocky-8 support #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
580f5ba
Update for Rocky 8.
henrywinterbottom-wxdev Feb 27, 2024
aae72f2
ESMF update.
HenryRWinterbottom Mar 12, 2024
d375e2d
Merge branch 'ufs-community:develop' into feature/gwdev_issue_2329
HenryRWinterbottom Mar 12, 2024
0d0bdf0
Reverted stack.
HenryRWinterbottom Mar 12, 2024
2350d46
Corrected stack path.
HenryRWinterbottom Mar 13, 2024
5912ca3
Merge branch 'ufs-community:develop' into feature/gwdev_issue_2329
HenryRWinterbottom Mar 13, 2024
c056d1b
Merge branch 'ufs-community:develop' into feature/gwdev_issue_2329
HenryRWinterbottom Mar 18, 2024
ba42028
Updated driver scripts for regression tests.
HenryRWinterbottom Mar 20, 2024
080eb7d
Merge branch 'ufs-community:develop' into feature/gwdev_issue_2329
HenryRWinterbottom Mar 20, 2024
e86029f
Updated for Rocky-8 GNU compiler.
henrywinterbottom-wxdev Mar 20, 2024
32d90c0
Update modulefiles/build.hera.intel.lua
HenryRWinterbottom Mar 21, 2024
3a5fb60
Updated with reviewer suggestion.
henrywinterbottom-wxdev Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions modulefiles/build.hera.gnu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ Load environment to compile UFS_UTILS on Hera using Gnu
hpss_ver=os.getenv("hpss_ver") or ""
load(pathJoin("hpss", hpss_ver))

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
-- For openmpi:
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")

stack_gcc_ver=os.getenv("stack_gcc_ver") or "9.2"
load(pathJoin("stack-gcc", gnu_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build.hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Load environment to compile UFS_UTILS on Hera using Intel
hpss_ver=os.getenv("hpss_ver") or ""
load(pathJoin("hpss", hpss_ver))

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/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))
Expand Down
10 changes: 4 additions & 6 deletions reg_tests/ice_blend/driver.hera.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ compiler=${compiler:-"intel"}
source ../../sorc/machine-setup.sh > /dev/null 2>&1
module use ../../modulefiles
module load build.$target.$compiler
module load grib-util
# Because of a bug in the grib-util module, the wgrib2 module
# must be loaded last.
module load wgrib2/2.0.8
module list

export DATA="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}"
Expand All @@ -50,12 +54,6 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export WGRIB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/wgrib
export WGRIB2=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/wgrib2
export COPYGB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/copygb
export COPYGB2=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/copygb2
export CNVGRIB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/cnvgrib

export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/ice_blend
export HOMEgfs=$PWD/../..

Expand Down
11 changes: 9 additions & 2 deletions reg_tests/snow2mdl/driver.hera.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,17 @@ compiler=${compiler:-"intel"}
source ../../sorc/machine-setup.sh > /dev/null 2>&1
module use ../../modulefiles
module load build.$target.$compiler
module load grib-util
module load wgrib2/2.0.8
module list

# Because of a bug in the grib-util module, need to construct this
# variable.
WGRIB=${grib_util_ROOT}/bin/wgrib

export WGRIB
export WGRIB2

DATA_ROOT="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}"
DATA_ROOT="${DATA_ROOT}/reg-tests/snow2mdl"

Expand All @@ -48,8 +57,6 @@ fi

export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/snow2mdl
export HOMEgfs=$PWD/../..
export WGRIB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/wgrib
export WGRIB2=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/wgrib2

# The first test mimics GFS OPS.

Expand Down
Loading