update modules on orion for rocky 8. gempak is not available

NOAA-EMC · Jun 28, 2024 · 7836e55 · 7836e55
1 parent 6df304f
commit 7836e55
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/modulefiles/gfsutils_orion.intel.lua b/modulefiles/gfsutils_orion.intel.lua
@@ -2,10 +2,15 @@ help([[
 Build environment for GFS utilities on Orion
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+-- Spack Stack installation specs
+local ss_dir="/work/noaa/epic/role-epic/spack-stack/orion"
+local ss_ver=os.getenv("stack_ver") or "1.6.0"
+local ss_env=os.getenv("stack_env") or "gsi-addon-env-rocky9"
 
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
-local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+prepend_path("MODULEPATH", pathJoin(ss_dir, "spack-stack-" .. ss_ver, "envs", ss_env, "install/modulefiles/Core"))
+
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 
 load(pathJoin("stack-intel", stack_intel_ver))

diff --git a/modulefiles/rdbfmsua_orion.intel.lua b/modulefiles/rdbfmsua_orion.intel.lua
@@ -2,10 +2,15 @@ help([[
 Build environment for GFS utilities on Orion
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+-- Spack Stack installation specs
+local ss_dir="/work/noaa/epic/role-epic/spack-stack/orion"
+local ss_ver=os.getenv("stack_ver") or "1.6.0"
+local ss_env=os.getenv("stack_env") or "gsi-addon-env-rocky9"
 
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
-local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+prepend_path("MODULEPATH", pathJoin(ss_dir, "spack-stack-" .. ss_ver, "envs", ss_env, "install/modulefiles/Core"))
+
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

diff --git a/ush/build.sh b/ush/build.sh
@@ -48,7 +48,14 @@ module use "${DIR_ROOT}/modulefiles"
 if module load "rdbfmsua_${MACHINE_ID}.${COMPILER}" &> /dev/null; then
   module list
 else
-  echo "WARNING: Unable to load modelfile for 'rdbfmsua' on '${MACHINE_ID}' (does it exist?)."
+  if [[ -f "${DIR_ROOT}/modulefiles/rdbfmsua_${MACHINE_ID}.${COMPILER}.lua" ]]; then
+    echo "WARNING: Unable to load modulefile for 'rdbfmsua' on '${MACHINE_ID}'."
+    set +e
+    module load "rdbfmsua_${MACHINE_ID}.${COMPILER}"
+    set -e
+  else
+    echo "${DIR_ROOT}/modulefiles/rdbfmsua_${MACHINE_ID}.${COMPILER}.lua does not exist!"
+  fi
   echo "  Skipping building 'rdbfmsua.x'"
   exit 0
 fi