From bc273e98a506d4e2724d4c5c35718f74776ce9d7 Mon Sep 17 00:00:00 2001
From: "Kate.Friedman" <Kate.Friedman@noaa.gov>
Date: Mon, 25 Jan 2021 19:50:49 +0000
Subject: [PATCH] Issue #164 - updates to partial build and stack updates for
 tropcy build

---
 .../modulefile.storm_reloc_v6.0.0.hera        | 28 +++++++++--------
 sorc/build_all.sh                             | 30 ++++++-------------
 sorc/build_tropcy_NEMS.sh                     |  8 +++--
 sorc/fv3gfs_build.cfg                         |  1 -
 sorc/partial_build.sh                         |  2 +-
 5 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/modulefiles/modulefile.storm_reloc_v6.0.0.hera b/modulefiles/modulefile.storm_reloc_v6.0.0.hera
index 36f96e01b9..489c9449f1 100644
--- a/modulefiles/modulefile.storm_reloc_v6.0.0.hera
+++ b/modulefiles/modulefile.storm_reloc_v6.0.0.hera
@@ -2,17 +2,21 @@
 ## Module file for storm_reloc_v6.0.0 - Hera
 #############################################################
 
-module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-module load w3emc/2.3.0
-module load w3nco/2.0.6
-module load bacio/2.0.2
-module load sp/2.0.2
-module load nemsio/2.2.3
-module load nemsiogfs/2.2.1
-module load sigio/2.1.1
-module load jasper/1.900.1
-module load png/1.2.44
-module load z/1.2.11
-module load g2/3.1.0
+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 w3emc/2.7.3
+module load w3nco/2.4.1
+module load bacio/2.4.1
+module load sp/2.3.3
+module load nemsio/2.5.2
+module load nemsiogfs/2.5.3
+module load sigio/2.3.2
+module load jasper/2.0.22
+module load png/1.6.35
+module load zlib/1.2.11
+module load g2/3.4.1
 
 set FC mpiifort
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index 4f8cfae730..398abd0089 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -58,15 +58,6 @@ source ./machine-setup.sh > /dev/null 2>&1
 ERRSCRIPT=${ERRSCRIPT:-'eval [[ $err = 0 ]]'}
 err=0
 
-#------------------------------------
-# build libraries first
-#------------------------------------
-$Build_libs && {
-echo " .... Library build not currently supported .... "
-#echo " .... Building libraries .... "
-#./build_libs.sh > $logs_dir/build_libs.log 2>&1
-}
-
 #------------------------------------
 # build fv3
 #------------------------------------
@@ -269,19 +260,16 @@ fi
 #------------------------------------
 # build gfs_util       
 #------------------------------------
-# Only build on WCOSS
-if [ $target = wcoss -o $target = wcoss_cray -o $target = wcoss_dell_p3 ]; then
- $Build_gfs_util && {
- echo " .... Building gfs_util .... "
- ./build_gfs_util.sh > $logs_dir/build_gfs_util.log 2>&1
- rc=$?
- if [[ $rc -ne 0 ]] ; then
-     echo "Fatal error in building gfs_util."
-     echo "The log file is in $logs_dir/build_gfs_util.log"
- fi
- ((err+=$rc))
- }
+$Build_gfs_util && {
+echo " .... Building gfs_util .... "
+./build_gfs_util.sh > $logs_dir/build_gfs_util.log 2>&1
+rc=$?
+if [[ $rc -ne 0 ]] ; then
+    echo "Fatal error in building gfs_util."
+    echo "The log file is in $logs_dir/build_gfs_util.log"
 fi
+((err+=$rc))
+}
 
 #------------------------------------
 # Exception Handling
diff --git a/sorc/build_tropcy_NEMS.sh b/sorc/build_tropcy_NEMS.sh
index 77a69dc95e..4a04a61828 100755
--- a/sorc/build_tropcy_NEMS.sh
+++ b/sorc/build_tropcy_NEMS.sh
@@ -30,7 +30,9 @@ fi
 
 source ../modulefiles/modulefile.storm_reloc_v6.0.0.$target
 export FC=mpiifort
-export JASPER_LIB=${JASPER_LIB:-$JASPER_LIBRARY_DIRS/libjasper.a}
+export JASPER_LIB=${JASPER_LIB:-${JASPER_LIBRARIES}/libjasper.a}
+export PNG_LIB=${PNG_LIB:-${PNG_ROOT}/lib64/libpng.a}
+export Z_LIB=${Z_LIB:-${ZLIB_LIBRARIES}/libz.a}
 
 export INC="${G2_INCd} -I${NEMSIO_INC}"
 export LIBS="${W3EMC_LIBd} ${W3NCO_LIBd} ${BACIO_LIB4} ${G2_LIBd} ${PNG_LIB} ${JASPER_LIB} ${Z_LIB}"
@@ -38,8 +40,8 @@ export LIBS_SUP="${W3EMC_LIBd} ${W3NCO_LIBd}"
 echo lset
 echo lset
  export LIBS_REL="${W3NCO_LIB4}"
-export LIBS_REL="${NEMSIOGFS_LIB} ${NEMSIO_LIB} ${LIBS_REL} ${SIGIO_LIB4} ${BACIO_LIB4} ${SP_LIBd}"
-export LIBS_SIG="${SIGIO_INC4}"
+export LIBS_REL="${NEMSIOGFS_LIB} ${NEMSIO_LIB} ${LIBS_REL} ${SIGIO_LIB} ${BACIO_LIB4} ${SP_LIBd}"
+export LIBS_SIG="${SIGIO_INC}"
 export LIBS_SYN_GET="${W3NCO_LIB4}"
 export LIBS_SYN_MAK="${W3NCO_LIB4} ${BACIO_LIB4}"
 export LIBS_SYN_QCT="${W3NCO_LIB8}"
diff --git a/sorc/fv3gfs_build.cfg b/sorc/fv3gfs_build.cfg
index 130c6dde03..0bc7895b00 100644
--- a/sorc/fv3gfs_build.cfg
+++ b/sorc/fv3gfs_build.cfg
@@ -1,7 +1,6 @@
 #
 # ***** configuration of fv3gfs build *****
 
- Building libraries (libs) ............................. no
  Building fv3gfs (fv3gfs) .............................. yes
  Building gsi (gsi) .................................... yes
  Building gldas (gldas) ................................ yes
diff --git a/sorc/partial_build.sh b/sorc/partial_build.sh
index 264d3c1410..4b911bc94e 100755
--- a/sorc/partial_build.sh
+++ b/sorc/partial_build.sh
@@ -1,7 +1,7 @@
 #
 # define the array of the name of build program
 #
- declare -a Build_prg=("Build_libs" "Build_fv3gfs" \
+ declare -a Build_prg=("Build_fv3gfs" \
                        "Build_gsi" \
                        "Build_gldas" \
                        "Build_ncep_post" \