Merge branch 'develop' into feature/submod

Fixes ufs-community#818.
GeorgeGayno-NOAA · May 1, 2023 · 8c177a3 · 8c177a3
2 parents e09a220 + b04c1a9
commit 8c177a3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/reg_tests/ice_blend/driver.jet.sh b/reg_tests/ice_blend/driver.jet.sh
@@ -31,7 +31,11 @@ set -x
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.intel
+module load gnu/9.2.0
+module load wgrib2/3.1.1_ncep
+set +x
 module list
+set -x
 
 export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
 export DATA="${DATA}/reg-tests/ice-blend"
@@ -48,7 +52,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
 fi
 
 export WGRIB=/apps/wgrib/1.8.1.0b/bin/wgrib
-export WGRIB2=/apps/wgrib2/0.1.9.6a/bin/wgrib2
+export WGRIB2=${WGRIB2_ROOT}/bin/wgrib2
 export COPYGB=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/grib_util/NCEPLIBS-grib_util/exec/bin/copygb
 export COPYGB2=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/grib_util/NCEPLIBS-grib_util/exec/bin/copygb2
 export CNVGRIB=/apps/cnvgrib/1.4.0/bin/cnvgrib

diff --git a/reg_tests/snow2mdl/driver.jet.sh b/reg_tests/snow2mdl/driver.jet.sh
@@ -24,7 +24,11 @@ set -x
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.intel
+module load gnu/9.2.0
+module load wgrib2/3.1.1_ncep
+set +x
 module list
+set -x
 
 DATA_ROOT="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
 DATA_ROOT="${DATA_ROOT}/reg-tests/snow2mdl"
@@ -46,7 +50,7 @@ fi
 export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/snow2mdl
 export HOMEgfs=$PWD/../..
 export WGRIB=/apps/wgrib/1.8.1.0b/bin/wgrib
-export WGRIB2=/apps/wgrib2/0.1.9.6a/bin/wgrib2
+export WGRIB2=${WGRIB2_ROOT}/bin/wgrib2
 
 rm -fr $DATA_ROOT