From 228eb52401d19116f537bd2202692b7ad39438e3 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <Russ.Treadon@noaa.gov>
Date: Fri, 10 Jan 2025 18:56:52 +0000
Subject: [PATCH 1/3] update sorc/gdas.cd hash (#3219)

---
 sorc/gdas.cd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sorc/gdas.cd b/sorc/gdas.cd
index d6097afdd4..15113adfdb 160000
--- a/sorc/gdas.cd
+++ b/sorc/gdas.cd
@@ -1 +1 @@
-Subproject commit d6097afdd435fe73cc99d8ddb594c3143b72820a
+Subproject commit 15113adfdbf2500ec2d5099fc9b62b21fbfcc9b8

From d7e46c0afb36f2e88246cc7341e8b9ae27759029 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <Russ.Treadon@noaa.gov>
Date: Fri, 10 Jan 2025 18:59:53 +0000
Subject: [PATCH 2/3] updates required to run GDASApp using spack-stack/1.6.0
 on WCOSS2 (#3219)

---
 env/WCOSS2.env      | 4 ++++
 ush/module-setup.sh | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
index fe6acf88fb..ed9cd65523 100755
--- a/env/WCOSS2.env
+++ b/env/WCOSS2.env
@@ -13,6 +13,10 @@ step=$1
 export launcher="mpiexec -l"
 export mpmd_opt="--cpu-bind verbose,core cfp"
 
+# Add path to GDASApp libraries
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOMEgfs/sorc/gdas.cd/build/lib"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/cray/pe/mpich/8.1.19/ofi/intel/19.0/lib"
+
 # Calculate common resource variables
 # Check first if the dependent variables are set
 if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-}" ]]; then
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
index 398562652d..366286d142 100755
--- a/ush/module-setup.sh
+++ b/ush/module-setup.sh
@@ -51,6 +51,8 @@ elif [[ ${MACHINE_ID} = s4* ]] ; then
 
 elif [[ ${MACHINE_ID} = wcoss2 ]]; then
     # We are on WCOSS2
+    # Ignore default modules of the same version lower in the search path (req'd by spack-stack)
+    export LMOD_TMOD_FIND_FIRST=yes
     module reset
 
 elif [[ ${MACHINE_ID} = cheyenne* ]] ; then

From 4e73a31bf2c6d8207c93d9c9aca5811e72cd270c Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <Russ.Treadon@noaa.gov>
Date: Fri, 10 Jan 2025 19:21:20 +0000
Subject: [PATCH 3/3] fix shellnorm violations (#3219)

---
 env/WCOSS2.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
index ed9cd65523..1d589d3689 100755
--- a/env/WCOSS2.env
+++ b/env/WCOSS2.env
@@ -14,8 +14,8 @@ export launcher="mpiexec -l"
 export mpmd_opt="--cpu-bind verbose,core cfp"
 
 # Add path to GDASApp libraries
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOMEgfs/sorc/gdas.cd/build/lib"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/cray/pe/mpich/8.1.19/ofi/intel/19.0/lib"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOMEgfs}/sorc/gdas.cd/build/lib"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/cray/pe/mpich/8.1.19/ofi/intel/19.0/lib"
 
 # Calculate common resource variables
 # Check first if the dependent variables are set