From cc95696c92716c69cf76e7613d597db6125b01c6 Mon Sep 17 00:00:00 2001
From: Wei Huang <Wei.Huang@noaa.gov>
Date: Wed, 17 Apr 2024 14:54:56 +0000
Subject: [PATCH 1/3] changes for AWS

---
 modulefiles/noaacloud-run.intel.lua | 19 +++++++++++++++++++
 modulefiles/noaacloud.intel.lua     | 16 ++++++++++++++++
 ush/module-setup.sh                 | 10 ++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 modulefiles/noaacloud-run.intel.lua
 create mode 100644 modulefiles/noaacloud.intel.lua

diff --git a/modulefiles/noaacloud-run.intel.lua b/modulefiles/noaacloud-run.intel.lua
new file mode 100644
index 0000000..32dd4f9
--- /dev/null
+++ b/modulefiles/noaacloud-run.intel.lua
@@ -0,0 +1,19 @@
+help([[
+]])
+
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
+local grads_ver=os.getenv("grads_ver") or "2.2.3"
+local perl_ver=os.getenv("perl_ver") or "5.38.0"
+local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
+
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("grads", grads_ver))
+load(pathJoin("prod_util", prod_util_ver))
+
+load("common-run")
+
+whatis("Description: GSI Monitoring run-time environment on Hera.intel")
diff --git a/modulefiles/noaacloud.intel.lua b/modulefiles/noaacloud.intel.lua
new file mode 100644
index 0000000..99de9a5
--- /dev/null
+++ b/modulefiles/noaacloud.intel.lua
@@ -0,0 +1,16 @@
+help([[
+]])
+
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("cmake", cmake_ver))
+
+load("common")
+
+whatis("Description: GSI Monitoring environment on Hera with Intel Compilers")
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index 60f9b54..58f1dbc 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -98,6 +98,16 @@ elif [[ $MACHINE_ID = discover* ]]; then
     export PATH=$PATH:$SPACK_ROOT/bin
     . $SPACK_ROOT/share/spack/setup-env.sh
 
+elif [[ $MACHINE_ID = noaacloud* ]]; then
+    # We are on NOAA Cloud
+    if ( ! eval module help > /dev/null 2>&1 ) ; then
+        source /apps/lmod/8.5.2/init/bash
+    fi
+    module purge
+   #export SPACK_ROOT=/contrib/spack-stack/spack-stack-1.6.0/spack
+   #export PATH=$PATH:$SPACK_ROOT/bin
+   #. $SPACK_ROOT/share/spack/setup-env.sh
+
 else
     echo WARNING: UNKNOWN PLATFORM 1>&2
 fi

From dafeed8d315f39c344bb4a1540eb22254b88d117 Mon Sep 17 00:00:00 2001
From: Wei Huang <Wei.Huang@noaa.gov>
Date: Thu, 25 Apr 2024 17:56:16 +0000
Subject: [PATCH 2/3] minor word correction

---
 modulefiles/noaacloud-run.intel.lua | 2 +-
 modulefiles/noaacloud.intel.lua     | 2 +-
 ush/module-setup.sh                 | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modulefiles/noaacloud-run.intel.lua b/modulefiles/noaacloud-run.intel.lua
index 32dd4f9..4c9d85e 100644
--- a/modulefiles/noaacloud-run.intel.lua
+++ b/modulefiles/noaacloud-run.intel.lua
@@ -16,4 +16,4 @@ load(pathJoin("prod_util", prod_util_ver))
 
 load("common-run")
 
-whatis("Description: GSI Monitoring run-time environment on Hera.intel")
+whatis("Description: GSI Monitoring run-time environment on NOAA Cloud Intel compiler")
diff --git a/modulefiles/noaacloud.intel.lua b/modulefiles/noaacloud.intel.lua
index 99de9a5..4e90c7f 100644
--- a/modulefiles/noaacloud.intel.lua
+++ b/modulefiles/noaacloud.intel.lua
@@ -13,4 +13,4 @@ load(pathJoin("cmake", cmake_ver))
 
 load("common")
 
-whatis("Description: GSI Monitoring environment on Hera with Intel Compilers")
+whatis("Description: GSI Monitoring environment on NOAA Cloud with Intel Compilers")
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index 58f1dbc..dc0fd7c 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -104,9 +104,6 @@ elif [[ $MACHINE_ID = noaacloud* ]]; then
         source /apps/lmod/8.5.2/init/bash
     fi
     module purge
-   #export SPACK_ROOT=/contrib/spack-stack/spack-stack-1.6.0/spack
-   #export PATH=$PATH:$SPACK_ROOT/bin
-   #. $SPACK_ROOT/share/spack/setup-env.sh
 
 else
     echo WARNING: UNKNOWN PLATFORM 1>&2

From 1c9a72a4aec87994d894414c3d61d5d4540ae2ab Mon Sep 17 00:00:00 2001
From: Wei Huang <Wei.Huang@noaa.gov>
Date: Fri, 26 Apr 2024 14:27:35 +0000
Subject: [PATCH 3/3] Remove perl define, as it is unloaded, and unused.

---
 modulefiles/noaacloud-run.intel.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modulefiles/noaacloud-run.intel.lua b/modulefiles/noaacloud-run.intel.lua
index 4c9d85e..48d89f7 100644
--- a/modulefiles/noaacloud-run.intel.lua
+++ b/modulefiles/noaacloud-run.intel.lua
@@ -6,7 +6,6 @@ prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
 local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
 local grads_ver=os.getenv("grads_ver") or "2.2.3"
-local perl_ver=os.getenv("perl_ver") or "5.38.0"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
 load(pathJoin("stack-intel", stack_intel_ver))