From ca92d5469ad2ccfa7457584b4c296bf664bbe695 Mon Sep 17 00:00:00 2001
From: tmcguinness <terry.mcguinness@noaa.gov>
Date: Mon, 21 Oct 2024 21:30:41 +0000
Subject: [PATCH] added to distinct runtime ver vor noaa cload for centos and
 rocky

---
 ush/load_fv3gfs_modules.sh        |  9 ++++++---
 versions/run.noaacloud.centos.ver |  8 ++++++++
 versions/run.noaacloud.rocky.ver  | 12 ++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 versions/run.noaacloud.centos.ver
 create mode 100644 versions/run.noaacloud.rocky.ver

diff --git a/ush/load_fv3gfs_modules.sh b/ush/load_fv3gfs_modules.sh
index 0a8b18872f..8c8cec0648 100755
--- a/ush/load_fv3gfs_modules.sh
+++ b/ush/load_fv3gfs_modules.sh
@@ -13,9 +13,6 @@ ulimit_s=$( ulimit -S -s )
 source "${HOMEgfs}/ush/detect_machine.sh"
 source "${HOMEgfs}/ush/module-setup.sh"
 
-# Source versions file for runtime
-source "${HOMEgfs}/versions/run.${MACHINE_ID}.ver"
-
 # Load our modules:
 module use "${HOMEgfs}/modulefiles"
 
@@ -29,9 +26,15 @@ case "${MACHINE_ID}" in
       /contrib/Terry.McGuinness/SETUP/mount-epic-contrib.sh
       sudo systemctl daemon-reload
     fi
+    # Check if the OS is Rocky or CentOS
+    OS_NAME=$(grep -E '^ID=' /etc/os-release | sed -E 's/ID="?([^"]*)"?/\1/') || true
+    # Source versions file for runtime
+    source "${HOMEgfs}/versions/run.${MACHINE_ID}.${OS_NAME}.ver"
     module load "module_base.${MACHINE_ID}"
     ;;
   "wcoss2" | "hera" | "orion" | "hercules" | "gaea" | "jet" | "s4")
+    # Source versions file for runtime
+    source "${HOMEgfs}/versions/run.${MACHINE_ID}.ver"
     module load "module_base.${MACHINE_ID}"
     ;;
   *)
diff --git a/versions/run.noaacloud.centos.ver b/versions/run.noaacloud.centos.ver
new file mode 100644
index 0000000000..1b5482a67e
--- /dev/null
+++ b/versions/run.noaacloud.centos.ver
@@ -0,0 +1,8 @@
+export stack_intel_ver=2021.3.0
+export stack_impi_ver=2021.3.0
+export spack_env=gsi-addon-env
+
+source "${HOMEgfs:-}/versions/spack.ver"
+export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
+
+export g2tmpl_ver=1.10.2
diff --git a/versions/run.noaacloud.rocky.ver b/versions/run.noaacloud.rocky.ver
new file mode 100644
index 0000000000..0f2a815dec
--- /dev/null
+++ b/versions/run.noaacloud.rocky.ver
@@ -0,0 +1,12 @@
+export stack_intel_ver=2021.3.0
+export stack_impi_ver=2021.3.0
+export spack_env=gsi-addon-env
+
+source "${HOMEgfs:-}/versions/spack.ver"
+export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
+
+export g2tmpl_ver=1.10.2
+export wgrib2_ver=3.1.2_wmo
+export cdo_ver=2.3.0
+export jasper_ver=4.2.0
+export nco_ver=5.1.6