From 814077d46f3846f0e4cf486a3545f831ecacaf5d Mon Sep 17 00:00:00 2001
From: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com>
Date: Tue, 11 Jan 2022 15:32:40 -0500
Subject: [PATCH] Update release/gfs_v16 with the feedback from NCO (#433)

* Update with the feedback from NCO.

* Remove envvar and update craype version
---
 modulefiles/post/post_wcoss2.lua | 8 +++-----
 modulefiles/upp/upp_wcoss2.lua   | 8 +++-----
 sorc/build_ncep_post.sh          | 4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modulefiles/post/post_wcoss2.lua b/modulefiles/post/post_wcoss2.lua
index 7237a749f..06039ab59 100644
--- a/modulefiles/post/post_wcoss2.lua
+++ b/modulefiles/post/post_wcoss2.lua
@@ -2,12 +2,10 @@ help([[
 Load environment to build post on WCOSS2
 ]])
 
-envvar_ver=os.getenv("envvar_ver") or "1.0"
 PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
 intel_ver=os.getenv("intel_ver") or "19.1.3.304"
-craype_ver=os.getenv("craype_ver") or "2.7.8"
+craype_ver=os.getenv("craype_ver") or "2.7.10"
 cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
-load(pathJoin("envvar", envvar_ver))
 load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
 load(pathJoin("intel", intel_ver))
 load(pathJoin("craype", craype_ver))
@@ -25,7 +23,7 @@ load(pathJoin("jasper", jasper_ver))
 load(pathJoin("libpng", libpng_ver))
 load(pathJoin("zlib", zlib_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.4"
+g2_ver=os.getenv("g2_ver") or "3.4.5"
 g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.9.1"
 w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
@@ -33,7 +31,7 @@ gfsio_ver=os.getenv("gfsio_ver") or "1.4.1"
 ip_ver=os.getenv("ip_ver") or "3.3.3"
 sp_ver=os.getenv("sp_ver") or "2.3.3"
 crtm_ver=os.getenv("crtm_ver") or "2.3.0"
-w3emc_ver=os.getenv("w3emc_ver") or "2.7.3"
+w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 load(pathJoin("g2", g2_ver))
 load(pathJoin("g2tmpl", g2tmpl_ver))
 load(pathJoin("w3nco", w3nco_ver))
diff --git a/modulefiles/upp/upp_wcoss2.lua b/modulefiles/upp/upp_wcoss2.lua
index d83258f4b..bd03b2a12 100644
--- a/modulefiles/upp/upp_wcoss2.lua
+++ b/modulefiles/upp/upp_wcoss2.lua
@@ -2,12 +2,10 @@ help([[
 Load environment to build upp lib on WCOSS2
 ]])
 
-envvar_ver=os.getenv("envvar_ver") or "1.0"
 PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
 intel_ver=os.getenv("intel_ver") or "19.1.3.304"
-craype_ver=os.getenv("craype_ver") or "2.7.8"
+craype_ver=os.getenv("craype_ver") or "2.7.10"
 cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9"
-load(pathJoin("envvar", envvar_ver))
 load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
 load(pathJoin("intel", intel_ver))
 load(pathJoin("craype", craype_ver))
@@ -25,7 +23,7 @@ load(pathJoin("jasper", jasper_ver))
 load(pathJoin("libpng", libpng_ver))
 load(pathJoin("zlib", zlib_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.4"
+g2_ver=os.getenv("g2_ver") or "3.4.5"
 g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.9.1"
 w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
@@ -33,7 +31,7 @@ gfsio_ver=os.getenv("gfsio_ver") or "1.4.1"
 ip_ver=os.getenv("ip_ver") or "3.3.3"
 sp_ver=os.getenv("sp_ver") or "2.3.3"
 crtm_ver=os.getenv("crtm_ver") or "2.3.0"
-w3emc_ver=os.getenv("w3emc_ver") or "2.7.3"
+w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 load(pathJoin("g2", g2_ver))
 load(pathJoin("g2tmpl", g2tmpl_ver))
 load(pathJoin("w3nco", w3nco_ver))
diff --git a/sorc/build_ncep_post.sh b/sorc/build_ncep_post.sh
index 1e5e95862..97579b8b0 100755
--- a/sorc/build_ncep_post.sh
+++ b/sorc/build_ncep_post.sh
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 
 
 # Lin Gan Module Load
-module purge
+module reset
 set -x
 mac=$(hostname | cut -c1-1)
 mac2=$(hostname | cut -c1-2)
@@ -54,7 +54,7 @@ moduledir=`dirname $(readlink -f ../modulefiles/post)`
 cd ncep_post.fd
 
 if [ $machine = wcoss2 ] ; then
-module purge
+module reset
 module use ${moduledir}/post
 module load post_${machine}
 module list