GFS.v16: using NCO installed upp lib on wcoss (ufs-community#212)

* update post lib to upp/8.0.11 on wcoss * update GFS post control files to be consistent with post repo Co-authored-by: Jun Wang <[email protected]>
mkavulich · Oct 3, 2020 · 5e818ad · 5e818ad
1 parent cd9698e
commit 5e818ad
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 181 deletions.
diff --git a/FV3 b/FV3
diff --git a/conf/configure.fv3.wcoss_cray b/conf/configure.fv3.wcoss_cray
@@ -27,7 +27,7 @@ include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)
 
 NEMSIOINC = -I$(NEMSIO_INC)
-NCEPLIBS = $(POST_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
+NCEPLIBS = $(UPP_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
 
 ##############################################
 # Need to use at least GNU Make version 3.81 #
@@ -39,15 +39,15 @@ $(error Need at least make version $(need).  Load module gmake/3.81)
 endif
 
 NETCDF_ROOT = $(NETCDF_DIR)
-INCLUDE = -I$(NETCDF_ROOT)/include
+INCLUDE = -I$(NETCDF_ROOT)/include -I$(HDF5)/include
 
 FPPFLAGS := -fpp -Wp,-w $(INCLUDE)
 CFLAGS := $(INCLUDE)
 
 FFLAGS := $(INCLUDE) -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte
 
 CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO  -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
-CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_PARALLEL_NETCDF
+CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
 
 ifeq ($(HYDRO),Y)
 CPPDEFS +=
@@ -157,13 +157,8 @@ LDFLAGS += -L$(PATH_CCPP)/lib -lccpp
 endif
 endif
 
-ifneq ($(findstring netcdf/4,$(LOADEDMODULES)),)
-  LIBS += -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lz
-else
-  LIBS += -lnetcdf
-endif
-
-LDFLAGS += $(LIBS)
+LDFLAGS += $(Z_LIB) -L$(NETCDF_ROOT)/lib -L$(HDF5)/lib
+LIBS += -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 $(Z_LIB)
 
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)

diff --git a/conf/configure.fv3.wcoss_dell_p3 b/conf/configure.fv3.wcoss_dell_p3
@@ -25,7 +25,7 @@ include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)
 
 NEMSIOINC = -I$(NEMSIO_INC)
-NCEPLIBS = $(POST_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
+NCEPLIBS = $(UPP_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
 
 ##############################################
 # Need to use at least GNU Make version 3.81 #

diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -49,7 +49,7 @@ module load g2tmpl-intel/1.6.0
 module load crtm-intel/2.3.0
 
 module use /gpfs/hps/nco/ops/nwtest/lib/modulefiles
-module load post-intel/8.0.11
+module load upp-intel/8.0.11
 
 ## WCOSS Cray execution prereqs:
 module load rca

diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
@@ -45,7 +45,7 @@ module load HDF5-parallel/1.10.6
 
 # load post lib
 module use -a /gpfs/dell1/nco/ops/nwtest/modulefiles/compiler_prod/ips/18.0.1
-module load post/8.0.11
+module load upp/8.0.11
 
 ##
 ## load cmake