From cf4a226caa40c132a3c944fbf9585db0ac93427e Mon Sep 17 00:00:00 2001
From: "Kate.Friedman" <Kate.Friedman@noaa.gov>
Date: Mon, 25 Jan 2021 19:57:07 +0000
Subject: [PATCH] Issue #164 - stack updates for regrid_nemsio build

---
 modulefiles/modulefile.regrid_nemsio.hera | 25 +++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/modulefiles/modulefile.regrid_nemsio.hera b/modulefiles/modulefile.regrid_nemsio.hera
index 6280a02436..d33110842a 100644
--- a/modulefiles/modulefile.regrid_nemsio.hera
+++ b/modulefiles/modulefile.regrid_nemsio.hera
@@ -2,16 +2,19 @@
 ## Module file for regrid_nemsio
 #############################################################
 
-module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-module load netcdf/4.7.0
-module load hdf5/1.10.5
-module load bacio/2.0.2
-module load nemsio/2.2.3
-module load w3nco/2.0.6
-module load sp/2.0.2
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
+module load hpc-intel/18.0.5.274
+module load hpc-impi/2018.0.4
+
+module load netcdf/4.7.4
+module load hdf5/1.10.6
+module load bacio/2.4.1
+module load nemsio/2.5.2
+module load w3nco/2.4.1
+module load sp/2.3.3
 
 export FCMP="$FCOMP" 
-export  NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -lnetcdf  -L${HDF5}/lib -lhdf5 -lhdf5_hl -lhdf5 -lz"
-export  NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdf -lnetcdff -lnetcdf  -L${HDF5}/lib -lhdf5 -lhdf5_hl -lhdf5 -lz"
-export NETCDF_INCLUDE=-I$NETCDF/include
-#export FCMP="mpif90 -f90=ifort"
+export NETCDF_LDFLAGS_F="-L${NETCDF_LIBRARIES} -lnetcdf -lnetcdff -lnetcdf  -L${HDF5_LIBRARIES} -lhdf5 -lhdf5_hl -lhdf5 -lz"
+export NETCDF_LDFLAGS="-L${NETCDF_LIBRARIES} -lnetcdf -lnetcdff -lnetcdf  -L${HDF5_LIBRARIES} -lhdf5 -lhdf5_hl -lhdf5 -lz"
+export NETCDF_INCLUDE="-I${NETCDF_INCLUDES}"