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

Updates for NOAA Cloud Rocky 8 platforms #2436

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion modulefiles/ufs_common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local ufs_modules = {
{["esmf"] = "8.6.0"},
{["fms"] = "2023.04"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["crtm"] = "2.4.0.1"},
{["g2"] = "3.5.1"},
{["g2tmpl"] = "1.13.0"},
{["ip"] = "4.3.0"},
Expand Down
12 changes: 9 additions & 3 deletions modulefiles/ufs_noaacloud.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@ help([[
loads UFS Model prerequisites for NOAA Parallelworks/Intel
]])

prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/apps/modules/modulefiles")
prepend_path("PATH", "/contrib/EPIC/bin")
load("gnu")
load("stack-intel")
load("stack-intel-oneapi-mpi")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
unload("gnu")

cmake_ver=os.getenv("cmake_ver") or "3.23.1"
load(pathJoin("cmake", cmake_ver))
Expand Down
13 changes: 9 additions & 4 deletions tests/fv3_conf/fv3_slurm.IN_noaacloud
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ echo -n " $( date +%s )," > job_timestamp.txt
set +x
MACHINE_ID=noaacloud
module use $( pwd -P )
module use /contrib/EPIC/spack-stack/spack-stack-1.3.0/envs/unified-dev/install/modulefiles/Core
module load stack-intel/2021.3.0 stack-intel-oneapi-mpi/2021.3.0
module load ufs-weather-model-env/unified-dev
module list
module load gnu
module use /contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
module use /apps/modules/modulefiles
module load stack-intel
module load stack-intel-oneapi-mpi
module load stack-intel/2021.10.0
module load stack-intel-oneapi-mpi/2021.10.0
module load cmake/3.23.1
module load ufs-weather-model-env/1.0.0

set -x

Expand Down
3 changes: 1 addition & 2 deletions tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -951,11 +951,10 @@ case ${MACHINE_ID} in
;;
noaacloud)
echo "rt.sh: Setting up noaacloud..."
export PATH="/contrib/EPIC/bin:${PATH}"
module use /apps/modules/modulefiles

if [[ "${ROCOTO:-false}" == true ]] ; then
module load rocoto/1.3.3
module load rocoto/1.3.7
ROCOTO_SCHEDULER=slurm
fi

Expand Down