Issue #164 - remove build_libs.sh, update module_base.hera for hpc-st…

…ack, plus updates for building enkf_chgres_recenter, gfs_bufr, and tocsbufr with hpc-stack
NOAA-EMC · Jan 22, 2021 · 40184c2 · 40184c2
1 parent 6ab44fe
commit 40184c2
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 101 deletions.
diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter.hera b/modulefiles/fv3gfs/enkf_chgres_recenter.hera
@@ -2,11 +2,15 @@
 ## enkf_chgres_recenter component - hera
 #############################################################
 
-module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-module load nemsio/2.2.3
-module load bacio/2.0.2
-module load w3nco/2.0.6
-module load ip/3.0.1
-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 nemsio/2.5.2
+module load bacio/2.4.1
+module load w3nco/2.4.1
+module load ip/3.3.3
+module load sp/2.3.3
 
 export FC=ifort
diff --git a/modulefiles/gfs_bufr.hera b/modulefiles/gfs_bufr.hera
@@ -2,24 +2,23 @@
 ## bufrsnd
 #############################################################
 
-# Loading Intel Compiler Suite
-module load intel
-module load impi
-module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-# Loading nceplibs modules
-module load sigio/2.1.1
-module load bacio/2.0.3
-module load w3nco/2.0.6
-module load bufr/11.3.0
-module load nemsio/2.2.3
-module load intelpython/3.6.8
-module load w3emc/2.3.1
+#Load from hpc-stack
+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 sigio/2.3.2
+module load bacio/2.4.1
+module load w3nco/2.4.1
+module load bufr/11.4.0
+module load nemsio/2.5.2
+module load w3emc/2.7.3
 
-module use /scratch2/NCEPDEV/nwprod/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 netcdf/4.7.4
+module load hdf5/1.10.6
 
+module load intelpython/3.6.8
 
 export myFC=$FCOMP
 export myFCFLAGS="-O3 -convert big_endian -traceback -g -fp-model source -qopenmp"

diff --git a/modulefiles/module_base.hera b/modulefiles/module_base.hera
@@ -3,24 +3,27 @@
 ##      FV3GFS prerequisites
 ##
 
-module load intel/18.0.5.274
-module load impi/2018.0.4
+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 wgrib2/2.0.8
 module load hpss/hpss
-module load nco/4.7.0
+module load nco/4.9.1
 module load gempak/7.4.2
 
-#Load from official NCEPLIBS
-module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-module load prod_util/1.1.0
-module load grib_util/1.1.1
-module load g2tmpl/1.6.0
+#Load from hpc-stack
+module load prod_util/1.2.2
+module load grib_util/1.2.2
+module load g2tmpl/1.9.1
 module load crtm/2.3.0
 
-module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles/
-module load netcdf_parallel/4.7.4.release
-module load hdf5_parallel/1.10.6.release
-module load esmf/8.0.1_ParallelNetCDF.release
+setenv CRTM_FIX /scratch2/NCEPDEV/nwprod/NCEPLIBS/fix/crtm_v2.3.0
+
+module load netcdf/4.7.4
+module load hdf5/1.10.6
+module load esmf/8_1_0_beta_snapshot_27
 
 # python
 module use -a /contrib/anaconda/modulefiles

diff --git a/sorc/build_libs.sh b/sorc/build_libs.sh
diff --git a/sorc/gfs_bufr.fd/makefile_module b/sorc/gfs_bufr.fd/makefile_module
@@ -8,20 +8,20 @@
 FC = $(myFC) $(myFCFLAGS)
 CPP = $(myCPP) $(myCPPFLAGS)
 
-FFLAGS   = -I$(NETCDF_INC) \
+FFLAGS   = -I$(NETCDF_INCLUDES) \
     	   -I$(NEMSIO_INC) \
-           -I$(SIGIO_INC4) \
+           -I$(SIGIO_INC) \
            -I$(W3EMC_INC4)
 
-LIBS =    -L$(NETCDF_LIB) -lnetcdf -lnetcdff \
-          -L$(HDF5_LIB) -lhdf5_hl -lhdf5 \
+LIBS =    -L$(NETCDF_LIBRARIES) -lnetcdff -lnetcdf \
+          -L$(HDF5_LIBRARIES) -lhdf5_hl -lhdf5 -lz \
 	       $(NEMSIO_LIB) \
            $(W3EMC_LIB4) \
            $(W3NCO_LIB4) \
            $(BUFR_LIB4) \
            $(BACIO_LIB4) \
            $(SP_LIB4) \
-           $(SIGIO_LIB4)
+           $(SIGIO_LIB)
 
 SRCM    = gfsbufr.f
 OBJS    = physcons.o funcphys.o meteorg.o bfrhdr.o newsig1.o terp3.o\

diff --git a/sorc/tocsbufr.fd/makefile_module b/sorc/tocsbufr.fd/makefile_module
@@ -47,7 +47,7 @@ LIBS     = $(W3EMC_LIB4) \
            $(BUFR_LIB4) \
            $(BACIO_LIB4) \
            $(SP_LIB4) \
-           $(SIGIO_LIB4)
+           $(SIGIO_LIB)
 CMD =		../../exec/tocsbufr
 PROFLIB =	-lprof