Skip to content

Commit

Permalink
Port to Orion Rocky 9 (#966)
Browse files Browse the repository at this point in the history
Point to the Rocky 9 spack-stack. 

Fixes #963.
Related to NOAA-EMC/global-workflow#2694
  • Loading branch information
GeorgeGayno-NOAA authored Jun 26, 2024
1 parent 0983f34 commit 3ef2e6b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
6 changes: 3 additions & 3 deletions modulefiles/build.orion.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ help([[
Load environment to compile UFS_UTILS on Orion using Intel
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

cmake_ver=os.getenv("cmake_ver") or "3.23.1"
Expand Down
8 changes: 2 additions & 6 deletions reg_tests/ice_blend/driver.orion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ set -x
source ../../sorc/machine-setup.sh > /dev/null 2>&1
module use ../../modulefiles
module load build.$target.intel
module load grib-util/1.3.0
module load wgrib2/2.0.8
module list

ulimit -s unlimited
Expand All @@ -50,12 +52,6 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export WGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib
export WGRIB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib2
export COPYGB=/apps/contrib/NCEPLIBS/lib/NCEPLIBS-grib_util/v1.1.1/exec/copygb
export COPYGB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/copygb2
export CNVGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/cnvgrib

export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/ice_blend
export HOMEgfs=$PWD/../..

Expand Down
4 changes: 2 additions & 2 deletions reg_tests/snow2mdl/driver.orion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ set -x
source ../../sorc/machine-setup.sh > /dev/null 2>&1
module use ../../modulefiles
module load build.$target.intel
module load grib-util/1.3.0
module load wgrib2/2.0.8
module list

ulimit -s unlimited
Expand All @@ -48,8 +50,6 @@ rm -fr $DATA_ROOT

export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/snow2mdl
export HOMEgfs=$PWD/../..
export WGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib
export WGRIB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib2

# The first test mimics GFS OPS.

Expand Down
2 changes: 1 addition & 1 deletion sorc/machine-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ elif [[ -d /gpfs && -d /ncrc ]] ; then
fi
module reset
target=gaea
elif [[ "$(hostname)" =~ "Orion" ]]; then
elif [[ "$(hostname)" =~ "Orion" || "$(hostname)" =~ "orion" ]]; then
target="orion"
module purge
elif [[ "$(hostname)" =~ "hercules" || "$(hostname)" =~ "Hercules" ]]; then
Expand Down

0 comments on commit 3ef2e6b

Please sign in to comment.