feature/cmake This commit references ufs-community#91.

Additional clean up for the Cray driver scripts.
GeorgeGayno-NOAA · May 12, 2020 · 333df02 · 333df02
1 parent a170ec1
commit 333df02
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 4 deletions.
diff --git a/driver_scripts/driver_grid.cray.sh b/driver_scripts/driver_grid.cray.sh
@@ -49,8 +49,8 @@
 #
 #-----------------------------------------------------------------------
 
-. $MODULESHOME/init/sh
-module load PrgEnv-intel cfp-intel-sandybridge/1.1.0
+source ../sorc/machine-setup.sh > /dev/null 2>&1
+source ../modulefiles/build.wcoss_cray
 module list
 
 #-----------------------------------------------------------------------

diff --git a/modulefiles/build.wcoss_cray b/modulefiles/build.wcoss_cray
@@ -1,13 +1,17 @@
 #%Module#####################################################
-## Build module for WCOSS-Cray
+## Build and run module for WCOSS-Cray
 #############################################################
 
+module load hpss/4.1.0.3
+module load xt-lsfhpc/9.1.3
+module load cfp-intel-sandybridge/1.1.0
 module load cmake/3.16.2
 module load PrgEnv-intel/5.2.56
 module rm intel
 module load intel/16.3.210
 module load cray-mpich/7.2.0
 module load craype-haswell
+module load alps/5.2.4-2.0502.9822.32.1.ari
 module load cray-netcdf/4.3.3.1
 module load cray-hdf5/1.8.14
 module load w3nco-intel/2.0.6

diff --git a/reg_tests/chgres_cube/driver.cray.sh b/reg_tests/chgres_cube/driver.cray.sh
@@ -22,6 +22,7 @@
 
 set -x
 
+source ../../sorc/machine-setup.sh > /dev/null 2>&1
 source ../../modulefiles/build.wcoss_cray
 module list
 

diff --git a/reg_tests/global_cycle/driver.cray.sh b/reg_tests/global_cycle/driver.cray.sh
@@ -27,6 +27,7 @@
 #BSUB -W 00:05
 #BSUB -extsched 'CRAYLINUX[]'
 
+source ../../sorc/machine-setup.sh > /dev/null 2>&1
 source ../../modulefiles/build.wcoss_cray
 module list
 

diff --git a/reg_tests/grid_gen/driver.cray.sh b/reg_tests/grid_gen/driver.cray.sh
@@ -19,8 +19,8 @@
 #
 #-----------------------------------------------------------------------------
 
+source ../../sorc/machine-setup.sh > /dev/null 2>&1
 source ../../modulefiles/build.wcoss_cray
-module load cfp-intel-sandybridge/1.1.0
 module list
 
 set -x

diff --git a/reg_tests/ice_blend/driver.cray.sh b/reg_tests/ice_blend/driver.cray.sh
@@ -28,6 +28,7 @@
 
 set -x
 
+source ../../sorc/machine-setup.sh > /dev/null 2>&1
 source ../../modulefiles/build.wcoss_cray
 module list
 

diff --git a/reg_tests/snow2mdl/driver.cray.sh b/reg_tests/snow2mdl/driver.cray.sh
@@ -28,6 +28,7 @@
 
 set -x
 
+source ../../sorc/machine-setup.sh > /dev/null 2>&1
 source ../../modulefiles/build.wcoss_cray
 module list
 

diff --git a/util/gdas_init/driver.cray.sh b/util/gdas_init/driver.cray.sh
@@ -8,6 +8,7 @@
 
 set -x
 
+source ../../sorc/machine-setup.sh > /dev/null 2>&1
 source ../../modulefiles/build.wcoss_cray
 module list
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ @@
     set -x
+    source ../../sorc/machine-setup.sh > /dev/null 2>&1
     source ../../modulefiles/build.wcoss_cray
     module list
@@ Expand Down @@