From 4dce5217b7b5d000ecde238b6c3af988ca20107a Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 27 Aug 2024 20:50:04 -0500 Subject: [PATCH] Update llvm modulefiles --- modulefiles/ufs_gaea.intelllvm.lua | 2 +- modulefiles/ufs_hera.intelllvm.lua | 2 +- modulefiles/ufs_hercules.intelllvm.lua | 2 +- modulefiles/ufs_orion.intelllvm.lua | 2 +- tests/rt_utils.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modulefiles/ufs_gaea.intelllvm.lua b/modulefiles/ufs_gaea.intelllvm.lua index 39f2d79572..f91a712d27 100644 --- a/modulefiles/ufs_gaea.intelllvm.lua +++ b/modulefiles/ufs_gaea.intelllvm.lua @@ -5,7 +5,7 @@ help([[ whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===]) -prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0" load(pathJoin("stack-intel", stack_intel_ver)) diff --git a/modulefiles/ufs_hera.intelllvm.lua b/modulefiles/ufs_hera.intelllvm.lua index 4dc7a56727..49e9f2b4a9 100644 --- a/modulefiles/ufs_hera.intelllvm.lua +++ b/modulefiles/ufs_hera.intelllvm.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hera/IntelLLVM ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/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/modulefiles/ufs_hercules.intelllvm.lua b/modulefiles/ufs_hercules.intelllvm.lua index bfd19a44c2..5fb97a59fc 100644 --- a/modulefiles/ufs_hercules.intelllvm.lua +++ b/modulefiles/ufs_hercules.intelllvm.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for Hercules/IntelLLVM ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) diff --git a/modulefiles/ufs_orion.intelllvm.lua b/modulefiles/ufs_orion.intelllvm.lua index 76fb59d3ba..81f6a07b52 100644 --- a/modulefiles/ufs_orion.intelllvm.lua +++ b/modulefiles/ufs_orion.intelllvm.lua @@ -2,7 +2,7 @@ help([[ loads UFS Model prerequisites for OrionLLVM/Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh index bd64edb1f8..6ada22450b 100755 --- a/tests/rt_utils.sh +++ b/tests/rt_utils.sh @@ -205,7 +205,7 @@ submit_and_wait() { job_running=true else job_running=false - job_info=$( sacct -n -j "${jobid}" --format=JobID,state%20,Jobname%64 | grep "^${jobid}" | grep "${JBNME}" ) + job_info=$( sacct -n -j "${jobid}" --format=JobID,state%20,Jobname%128 | grep "^${jobid}" | grep "${JBNME}" ) fi # Getting the status letter from scheduler info status=$( grep "${jobid}" <<< "${job_info}" )