From 969d917e59edf79902a70ec45e99e52372ed9792 Mon Sep 17 00:00:00 2001
From: George Gayno <George.Gayno@noaa.gov>
Date: Mon, 17 Apr 2023 19:41:21 +0000
Subject: [PATCH] Use latest wgrib2 on Jet.

Fixes #780.
---
 reg_tests/ice_blend/driver.jet.sh | 6 +++++-
 reg_tests/snow2mdl/driver.jet.sh  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/reg_tests/ice_blend/driver.jet.sh b/reg_tests/ice_blend/driver.jet.sh
index c66b3922b..6c5498aa9 100755
--- 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
index 87ab421e5..62bd63664 100755
--- 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