From f3416d53dabd9067c38c5bd0a5d37232ab2036cd Mon Sep 17 00:00:00 2001
From: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com>
Date: Wed, 30 Sep 2020 09:05:13 -0400
Subject: [PATCH] Post lib ops (#190)

* Update parallel netcdf libs from WCOSS ops site.

* Point crtm/2.3.0 and w3/2.4.0 to nwprod site on WCOSS.
---
 jobs/J_NCEPPOST                       |  2 +-
 modulefiles/post/lib-cray-intel       | 13 ++++++-------
 modulefiles/post/lib-wcoss_dell_p3    |  4 +---
 modulefiles/post/v8.0.0-cray-intel    | 24 ++++++++++++++----------
 modulefiles/post/v8.0.0-wcoss_dell_p3 | 11 ++++-------
 sorc/ncep_post.fd/makefile_module     |  3 ++-
 6 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/jobs/J_NCEPPOST b/jobs/J_NCEPPOST
index a0987d432..746b6babe 100755
--- a/jobs/J_NCEPPOST
+++ b/jobs/J_NCEPPOST
@@ -151,7 +151,7 @@ env
 #########################################################
 # Execute the Script
 #########################################################
-$SCRgfs/ex${RUN}_nceppost.sh
+$SCRgfs/ex${RUN}_atmos_nceppost.sh
 
 ##############################
 # Remove the Temporary working directory
diff --git a/modulefiles/post/lib-cray-intel b/modulefiles/post/lib-cray-intel
index 1453f88d6..ad98cc145 100755
--- a/modulefiles/post/lib-cray-intel
+++ b/modulefiles/post/lib-cray-intel
@@ -32,10 +32,10 @@ module use -a /gpfs/hps/nco/ops/nwprod/lib/modulefiles
 
 # Loading Intel Compiler Suite
 module load PrgEnv-intel
-module load craype-sandybridge
-#module switch intel intel/15.0.3.187
-module switch intel intel/16.3.210
-module load craype/2.3.0
+module rm intel
+module load intel/18.1.163
+module load craype-haswell
+#module load craype/2.3.0
 
 # Loading nceplibs modules
 module load jasper-gnu-sandybridge/1.900.1
@@ -45,7 +45,6 @@ module load g2-intel/3.1.0
 module load g2tmpl-intel/1.6.0
 #module load xmlparse/v2.0.0
 
-module load w3emc-intel/2.2.0
 module load w3nco/2.0.6
 module load w3nco-intel/2.0.6
 module load bacio-intel/2.0.1
@@ -53,7 +52,7 @@ module load gfsio-intel/1.1.0
 #module load sigio/2.1.0
 module load ip-intel/3.0.0
 module load sp-intel/2.0.2
-module use -a /usrx/local/nceplibs/NCEPLIBS/modulefiles
-module load crtm/2.3.0
+module load crtm-intel/2.3.0
+module load w3emc-intel/2.4.0
 
 
diff --git a/modulefiles/post/lib-wcoss_dell_p3 b/modulefiles/post/lib-wcoss_dell_p3
index 3975b2efb..100a7d418 100755
--- a/modulefiles/post/lib-wcoss_dell_p3
+++ b/modulefiles/post/lib-wcoss_dell_p3
@@ -41,15 +41,13 @@ module load g2/3.1.0
 module load g2tmpl/1.6.0
 #module load xmlparse/v2.0.0
 
-#module load w3emc/2.3.0
 module load w3nco/2.0.6
 module load bacio/2.0.2
 module load gfsio/1.1.0
 #module load sigio/2.1.0
 module load ip/3.0.1
 module load sp/2.0.2
-module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
 module load crtm/2.3.0
-module load w3emc_para/2.4.0
+module load w3emc/2.4.0
 
 
diff --git a/modulefiles/post/v8.0.0-cray-intel b/modulefiles/post/v8.0.0-cray-intel
index a8fda2128..57b346818 100644
--- a/modulefiles/post/v8.0.0-cray-intel
+++ b/modulefiles/post/v8.0.0-cray-intel
@@ -18,15 +18,21 @@ set ver v8.0.0
 module use -a /usrx/local/prod/modulefiles
 module use -a /gpfs/hps/nco/ops/nwprod/lib/modulefiles
 module load PrgEnv-intel
-module load craype-sandybridge
-module switch intel intel/16.3.210
-module load craype/2.3.0
-module load prod_util/1.0.33
+module rm intel
+module load intel/18.1.163
+module rm NetCDF-intel-sandybridge/4.2
+module load craype-haswell
+#module load craype/2.3.0
 module load cray-libsci/13.0.3
-module load sigio-intel/2.1.0
+
+module load NetCDF-intel-sandybridge/4.7.4
+module load HDF5-parallel-intel-sandybridge/1.10.6
+
 module load jasper-gnu-sandybridge/1.900.1
 module load png-gnu-sandybridge/1.2.49
 module load zlib-gnu-sandybridge/1.2.7
+
+module load sigio-intel/2.1.0
 module load sfcio-intel/1.0.0
 module load nemsio-intel/2.2.2
 module load bacio-intel/2.0.1
@@ -34,16 +40,14 @@ module load g2-intel/3.1.0
 module load gfsio-intel/1.1.0
 module load ip-intel/3.0.0
 module load sp-intel/2.0.2
-module load w3emc-intel/2.2.0
 module load w3nco-intel/2.0.6
-module load cray-netcdf/4.3.2
 module load wrfio-intel/1.1.1
 module load g2tmpl-intel/1.6.0
-module use -a /usrx/local/nceplibs/NCEPLIBS/modulefiles
-module load crtm/2.3.0
+module load crtm-intel/2.3.0
+module load w3emc-intel/2.4.0
 
 setenv myFC ftn
-setenv OPENMP "-openmp"
+setenv OPENMP "-qopenmp"
 setenv myFCFLAGS "-O2 -convert big_endian -traceback -g -fp-model source -fpp"
 setenv myCPP /lib/cpp 
 setenv myCPPFLAGS "-P"
diff --git a/modulefiles/post/v8.0.0-wcoss_dell_p3 b/modulefiles/post/v8.0.0-wcoss_dell_p3
index 1d531678a..6bc660faa 100644
--- a/modulefiles/post/v8.0.0-wcoss_dell_p3
+++ b/modulefiles/post/v8.0.0-wcoss_dell_p3
@@ -16,28 +16,25 @@ module load ips/18.0.1.163
 module load impi/18.0.1
 module load prod_util/1.1.0 
 
+module load NetCDF-parallel/4.7.4
+module load HDF5-parallel/1.10.6
 
 module load jasper/1.900.1                    
 module load libpng/1.2.59
 module load zlib/1.2.11 
+
 module load sfcio/1.0.0
 module load nemsio/2.2.3 
-
 module load sigio/2.1.0
 module load bacio/2.0.2
 module load g2/3.1.0           
 module load gfsio/1.1.0            
 module load ip/3.0.1          
 module load sp/2.0.2        
-#module load w3emc/2.3.0          
 module load w3nco/2.0.6
-#module load NetCDF/4.5.0
 module load wrfio/1.1.1
 module load g2tmpl/1.6.0          
-module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
-module load hdf5_parallel/1.10.6
-module load netcdf_parallel/4.7.4
-module load w3emc_para/2.4.0
+module load w3emc/2.4.0
 module load crtm/2.3.0
 
 setenv myFC mpiifort
diff --git a/sorc/ncep_post.fd/makefile_module b/sorc/ncep_post.fd/makefile_module
index 099f8022e..95965a04f 100755
--- a/sorc/ncep_post.fd/makefile_module
+++ b/sorc/ncep_post.fd/makefile_module
@@ -27,7 +27,8 @@ CPPFLAGS = -DLINUX
 FREE     = -FR
 
 NETCDF_INC = -I$(NETCDF)/include
-NETCDF_LDFLAGS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
+#NETCDF_LDFLAGS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
+NETCDF_LDFLAGS = -L$(NETCDF)/lib -lnetcdff -lnetcdf -L$(HDF5_LDFLAGS) $(Z_LIB)
 
 CFLAGS   = -DLINUX -Dfunder -DFortranByte=char -DFortranInt=int -DFortranLlong='long long'