From dc96296fbc8ce736e24bf25f7e5a0bf3869eaf19 Mon Sep 17 00:00:00 2001
From: "russ.treadon" <Russ.Treadon@noaa.gov>
Date: Tue, 12 Sep 2023 16:06:15 +0000
Subject: [PATCH] generalize machine specific sub scripts to allow different
 modulefiles for updat and contrl ctest jobs (#447)

---
 ush/sub_cheyenne | 2 +-
 ush/sub_discover | 2 +-
 ush/sub_gaea     | 2 +-
 ush/sub_hera     | 2 +-
 ush/sub_jet      | 2 +-
 ush/sub_orion    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ush/sub_cheyenne b/ush/sub_cheyenne
index cb671ce8c1..7389bfeb24 100644
--- a/ush/sub_cheyenne
+++ b/ush/sub_cheyenne
@@ -125,7 +125,7 @@ echo "" >>$cfile
 echo "cfile = $cfile"
 echo "source /glade/u/apps/ch/modulefiles/default/localinit/localinit.sh >> $cfile"
 echo "module purge"                                        >> $cfile
-echo "module use $gsisrc/modulefiles"                      >> $cfile
+echo "module use $modulefiles"                      >> $cfile
 echo "module load gsi_cheyenne.intel" >> $cfile
 echo "module list" >> $cfile
 
diff --git a/ush/sub_discover b/ush/sub_discover
index 835cd37ace..583ffbef86 100755
--- a/ush/sub_discover
+++ b/ush/sub_discover
@@ -129,7 +129,7 @@ echo "export OMP_NUM_THREADS=$threads"     >> $cfile
 echo "" >>$cfile
 echo ". "$(awk '{ print $1, $2, $3, $4, $5, $6, $7, $8, $9 }' $regdir/regression_var.out)  >>$cfile
 echo "" >>$cfile
-echo "module use -a $gsisrc/modulefiles"   >> $cfile
+echo "module use -a $modulefiles"   >> $cfile
 echo "module load gsi_discover" >> $cfile
 echo "" >>$cfile
 echo "jobname=$jobname" >>$cfile
diff --git a/ush/sub_gaea b/ush/sub_gaea
index b00e547a6a..6fed1b3c10 100755
--- a/ush/sub_gaea
+++ b/ush/sub_gaea
@@ -128,7 +128,7 @@ echo ". "$(awk '{ print $1, $2, $3, $4, $5, $6, $7, $8, $9 }' $regdir/regression
 echo "" >>$cfile
 
 echo "source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh"  >> $cfile
-echo "module use $gsisrc/modulefiles"                        >> $cfile
+echo "module use $modulefiles"                        >> $cfile
 echo "module load gsi_gaea" >> $cfile
 echo "module list"                                           >> $cfile
 echo "" >>$cfile
diff --git a/ush/sub_hera b/ush/sub_hera
index d904417190..610756af00 100755
--- a/ush/sub_hera
+++ b/ush/sub_hera
@@ -137,7 +137,7 @@ echo "" >>$cfile
 
 echo ". /apps/lmod/lmod/init/sh"                           >> $cfile
 echo "module purge"                                        >> $cfile
-echo "module use $gsisrc/modulefiles"                      >> $cfile
+echo "module use $modulefiles"                      >> $cfile
 echo "module load gsi_hera.intel" >> $cfile
 echo "module list"                                         >> $cfile
 echo "" >>$cfile
diff --git a/ush/sub_jet b/ush/sub_jet
index e45dcc0b3c..d30c566ce3 100755
--- a/ush/sub_jet
+++ b/ush/sub_jet
@@ -126,7 +126,7 @@ echo "" >>$cfile
 
 echo ". /apps/lmod/lmod/init/sh"                           >> $cfile
 echo "module purge"                                        >> $cfile
-echo "module use $gsisrc/modulefiles"                      >> $cfile
+echo "module use $modulefiles"                      >> $cfile
 echo "module load gsi_jet" >> $cfile
 echo "module list"                                         >> $cfile
 echo "" >>$cfile
diff --git a/ush/sub_orion b/ush/sub_orion
index 065e7c8ab0..1bcce5cc4f 100755
--- a/ush/sub_orion
+++ b/ush/sub_orion
@@ -126,7 +126,7 @@ echo "" >>$cfile
 
 echo ". /apps/lmod/lmod/init/sh"                           >> $cfile
 echo "module purge"                                        >> $cfile
-echo "module use $gsisrc/modulefiles"                      >> $cfile
+echo "module use $modulefiles"                      >> $cfile
 echo "module load gsi_orion" >> $cfile
 echo "module list"                                         >> $cfile
 echo ""                                                    >> $cfile