From 2bf0df4f684ac6bb632a895106827f31472fbb77 Mon Sep 17 00:00:00 2001
From: Jun Wang <junwang-noaa@users.noreply.github.com>
Date: Thu, 8 Oct 2020 01:34:21 +0000
Subject: [PATCH 1/2] update libs on orion and hera

---
 modulefiles/hera.intel/fv3  | 10 +++++-----
 modulefiles/orion.intel/fv3 |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
index 208e1f0e7d..70f43a3092 100644
--- a/modulefiles/hera.intel/fv3
+++ b/modulefiles/hera.intel/fv3
@@ -33,16 +33,16 @@ module load bacio/2.0.3
 module load ip/3.0.2
 module load nemsio/2.2.4
 module load sp/2.0.3
-module load w3emc/2.3.1
-module load w3nco/2.0.7
-module load g2/3.1.1
+module load w3emc/2.4.0
+module load w3nco/2.2.0
+module load g2/3.2.0
 module load g2tmpl/1.6.0
-module load crtm/2.2.6
+module load crtm/2.3.0
 module load jasper/1.900.1
 module load png/1.2.44
 module load z/1.2.11
 ## load modules for nceppost grib
-module load post/8.0.10
+module load upp/8.0.11
 
 ##
 ## load ESMF library for above compiler / MPI combination
diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/orion.intel/fv3
index 9ab6c52826..ba03186fe7 100644
--- a/modulefiles/orion.intel/fv3
+++ b/modulefiles/orion.intel/fv3
@@ -30,14 +30,14 @@ module load ip/3.0.2
 module load nemsio/2.2.4
 module load sp/2.0.3
 module load w3emc/2.4.0
-module load w3nco/2.0.7
-module load g2/3.1.1
+module load w3nco/2.2.0
+module load g2/3.2.0
 module load g2tmpl/1.6.0
 module load crtm/2.3.0
 module load jasper/1.900.2
 module load png/1.2.44
 module load z/1.2.6
-module load post/8.0.10
+module load upp/8.0.11
 
 ##
 ## load ESMF library for above compiler / MPI combination

From 28f3127f76272588557e0ca042102b13e071a58a Mon Sep 17 00:00:00 2001
From: Jun Wang <junwang-noaa@users.noreply.github.com>
Date: Thu, 15 Oct 2020 16:09:08 +0000
Subject: [PATCH 2/2] update upp lib on hera/orion

---
 conf/configure.fv3.hera.intel  | 2 +-
 conf/configure.fv3.orion.intel | 2 +-
 tests/rt.sh                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/configure.fv3.hera.intel b/conf/configure.fv3.hera.intel
index 06a28ec24d..872cb8d223 100644
--- a/conf/configure.fv3.hera.intel
+++ b/conf/configure.fv3.hera.intel
@@ -37,7 +37,7 @@ include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)
 
 NEMSIOINC = -I$(NEMSIO_INC)
-NCEPLIBS = $(POST_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
+NCEPLIBS = $(UPP_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
 
 ##############################################
 # Need to use at least GNU Make version 3.81 #
diff --git a/conf/configure.fv3.orion.intel b/conf/configure.fv3.orion.intel
index 06a28ec24d..872cb8d223 100644
--- a/conf/configure.fv3.orion.intel
+++ b/conf/configure.fv3.orion.intel
@@ -37,7 +37,7 @@ include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)
 
 NEMSIOINC = -I$(NEMSIO_INC)
-NCEPLIBS = $(POST_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
+NCEPLIBS = $(UPP_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
 
 ##############################################
 # Need to use at least GNU Make version 3.81 #
diff --git a/tests/rt.sh b/tests/rt.sh
index d88120bd34..fd87c09081 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -378,8 +378,8 @@ while getopts ":cfsl:mkreh" opt; do
   esac
 done
 
-if [[ $MACHINE_ID = cheyenne.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/develop-20200210/${COMPILER^^}}
+if [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = hera.* ]]; then
+  RTPWD=${RTPWD:-$DISKNM/develop-20200626/${COMPILER^^}}
 else
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200626}
 fi