generalize machine specific sub scripts to allow different modulefile…

…s for updat and contrl ctest jobs (#447)
hu5970 · Sep 12, 2023 · dc96296 · dc96296
1 parent 047001b
commit dc96296
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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