From 4c6c6a41992f44023e1826ff551452295737d80d Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <26926959+RussTreadon-NOAA@users.noreply.github.com>
Date: Fri, 17 Jan 2025 01:49:35 -0500
Subject: [PATCH] Move WCOSS2 LD_LIBRARY_PATH patches to load_ufsda_modules.sh
 (#3236)

This PR moves the `LD_LIBRARY_PATH` patches currently needed to run
GDASApp on WCOSS2 from `WCOSS2.env` to `load_ufsda_modules.sh`. With
this change, the `LD_LIBRARY_PATH` patch is only applied to WCOSS2
GDASApp jobs.

This change was suggested by @aerorahul

Resolves #3232
---
 env/WCOSS2.env            | 5 -----
 ush/load_ufsda_modules.sh | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
index 6c476cda5d..fe6acf88fb 100755
--- a/env/WCOSS2.env
+++ b/env/WCOSS2.env
@@ -13,11 +13,6 @@ step=$1
 export launcher="mpiexec -l"
 export mpmd_opt="--cpu-bind verbose,core cfp"
 
-# TODO: Add path to GDASApp libraries and cray-mpich as temporary patches
-# TODO: Remove LD_LIBRARY_PATH lines as soon as permanent solutions are available
-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/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh
index 1c15484dd7..9c7c57c330 100755
--- a/ush/load_ufsda_modules.sh
+++ b/ush/load_ufsda_modules.sh
@@ -38,6 +38,10 @@ case "${MACHINE_ID}" in
     #TODO: Remove LMOD_TMOD_FIND_FIRST line when spack-stack on WCOSS2
     if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
       export LMOD_TMOD_FIND_FIRST=yes
+      # TODO: Add path to GDASApp libraries and cray-mpich as temporary patches
+      # TODO: Remove LD_LIBRARY_PATH lines as soon as permanent solutions are available	
+      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"
     fi
     module load "${MODS}/${MACHINE_ID}"
     ncdump=$( command -v ncdump )