Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GFS.v16: using NCO installed upp lib on wcoss #212

Merged
merged 5 commits into from
Oct 3, 2020
Merged

GFS.v16: using NCO installed upp lib on wcoss #212

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce0c29e
update post lib to upp/8.0.11 on wcoss
junwang-noaa Oct 2, 2020
97975ca
update POST_LIB on wcoss
junwang-noaa Oct 2, 2020
cbcc412
update GFS post control files to be consistent with post repo
junwang-noaa Oct 3, 2020
7223eae
cray conf file
junwang-noaa Oct 3, 2020
cbf04fe
point to EMC fv3 repo
junwang-noaa Oct 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = production/GFS.v16
url = https://github.com/junwang-noaa/fv3atm
branch = upp8011
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 1 files
+2 −2 io/makefile
15 changes: 5 additions & 10 deletions conf/configure.fv3.wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand All @@ -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 +=
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion conf/configure.fv3.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/wcoss_cray/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/wcoss_dell_p3/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading