Compile.sh

conf/before_components.mk

@@ -8,42 +8,45 @@
 # FV3, CCPP, FMS, MOM6, CICE, WW3 or NEMS.  Otherwise, applications will
 # break.  There should only be logic specific this coupled app. 
 #
-# Logic specific to FV3, CCPP, FMS, or NEMS belong in NEMS/src/incmake.
+# Logic specific to FV3, CCPP, FMS, WW3, or NEMS belong in NEMS/src/incmake.
 
 # ----------------------------------------------------------------------
 # Decide the conf and modulefile names.
 # S2S_DEBUG_MODULE is defined in GNUmakefile
-ifeq ($(S2S_DEBUG_MODULE),false)
-  CHOSEN_MODULE=$(BUILD_TARGET)/fv3_coupled
-else
+
+#CHOSEN_MODULE=$(BUILD_TARGET)/fv3
+CHOSEN_MODULE=$(BUILD_TARGET)/fv3_coupled
+
+ifeq ($(S2S_DEBUG_MODULE),true)
   CHOSEN_MODULE=$(BUILD_TARGET)/fv3_coupled_debug
 endif
 
 #$(info CHOSEN_MODULE is $(CHOSEN_MODULE))
 
-CONFIGURE_NEMS_FILE=configure.fv3_coupled.$(BUILD_TARGET)
+CONFIGURE_NEMS_FILE=configure.fv3.$(BUILD_TARGET)
 
 # ----------------------------------------------------------------------
 # Exit for systems that are currently not supported
+
 ifeq ($(BUILD_TARGET),theia.pgi)
   $(error Model currently not supported on $(BUILD_TARGET))
 else ifeq ($(BUILD_TARGET),cheyenne.pgi)
   $(error Model currently not supported on $(BUILD_TARGET))
 endif
 
+
 # ----------------------------------------------------------------------
 # Copy the executable and modules.nems files into the tests/ directory
 # if a TEST_BUILD_NAME is specified.
-
+ 
 ifneq ($(TEST_BUILD_NAME),)
-$(info Will copy modules.nems and NEMS.x as $(TEST_BUILD_NAME) under tests/)
-$(ROOTDIR)/tests/$(TEST_BUILD_NAME).exe: $(NEMS_EXE)
+ $(info Will copy modules.nems and NEMS.x as $(TEST_BUILD_NAME) under tests/)
+ $(ROOTDIR)/tests/$(TEST_BUILD_NAME).exe: $(NEMS_EXE)
 	set -xe ; cp "$<" "$@"
-
-$(ROOTDIR)/tests/modules.$(TEST_BUILD_NAME): $(NEMSDIR)/src/conf/modules.nems
+ 
+ $(ROOTDIR)/tests/modules.$(TEST_BUILD_NAME): $(NEMSDIR)/src/conf/modules.nems
 	set -xe ; cp "$<" "$@"
-
-configure: $(ROOTDIR)/tests/modules.$(TEST_BUILD_NAME) ;
-build: $(ROOTDIR)/tests/$(TEST_BUILD_NAME).exe ;
+ 
+ configure: $(ROOTDIR)/tests/modules.$(TEST_BUILD_NAME) ;
+ build: $(ROOTDIR)/tests/$(TEST_BUILD_NAME).exe ;
 endif
-

conf/configure.fv3.hera.intel

@@ -31,6 +31,8 @@ OPENMP = Y
 AVX2 = Y
 HYDRO = N
 CCPP = N
+CUST_POST = Y
+NO_INLINE_POST =
 
 include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)
@@ -65,45 +67,49 @@ CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DUSE_GFSL
 CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
 
 ifeq ($(HYDRO),Y)
-CPPDEFS +=
+  CPPDEFS +=
 else
-CPPDEFS += -DMOIST_CAPPA -DUSE_COND
+  CPPDEFS += -DMOIST_CAPPA -DUSE_COND
 endif
 
 ifeq ($(32BIT),Y)
-CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
-FFLAGS += -i4 -real-size 32
+  CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
+  FFLAGS += -i4 -real-size 32
 else
-ifeq ($(REPRO),Y)
-FFLAGS += -i4 -real-size 64
-else
-FFLAGS += -i4 -real-size 64 -no-prec-div -no-prec-sqrt
-endif
+  ifeq ($(REPRO),Y)
+    FFLAGS += -i4 -real-size 64
+  else
+    FFLAGS += -i4 -real-size 64 -no-prec-div -no-prec-sqrt
+  endif
 endif
 
 ifeq ($(REPRO),Y)
-FFLAGS += -qno-opt-dynamic-align
-CFLAGS += -qno-opt-dynamic-align
+  FFLAGS += -qno-opt-dynamic-align
+  CFLAGS += -qno-opt-dynamic-align
 else
-ifeq ($(AVX2),Y)
+  ifeq ($(AVX2),Y)
 # Don't use the AVX512 flags yet on hera
-#FFLAGS += -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512 -qno-opt-dynamic-align
-#CFLAGS += -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512 -qno-opt-dynamic-align
-FFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
-CFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
-else
-FFLAGS += -qno-opt-dynamic-align
-CFLAGS += -qno-opt-dynamic-align
-endif
+#   FFLAGS += -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512 -qno-opt-dynamic-align
+#   CFLAGS += -axSSE4.2,AVX,CORE-AVX2,CORE-AVX512 -qno-opt-dynamic-align
+    FFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
+    CFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
+  else
+    FFLAGS += -qno-opt-dynamic-align
+    CFLAGS += -qno-opt-dynamic-align
+  endif
 endif
 
 ifeq ($(MULTI_GASES),Y)
-CPPDEFS += -DMULTI_GASES
+  CPPDEFS += -DMULTI_GASES
+endif
+
+ifeq ($(NO_INLINE_POST),Y)
+  CPPDEFS += -DNO_INLINE_POST
 endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
 FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
-FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv -link_mpi=dbg
 
 TRANSCENDENTALS := -fast-transcendentals
 FFLAGS_OPENMP = -qopenmp
@@ -129,49 +135,53 @@ LDFLAGS_VERBOSE := -Wl,-V,--verbose,-cref,-M
 LIBS :=
 
 ifeq ($(REPRO),Y)
-CPPDEFS += -DREPRO
-CFLAGS += $(CFLAGS_REPRO)
-FFLAGS += $(FFLAGS_REPRO)
-FAST :=
+  CPPDEFS += -DREPRO
+  CFLAGS += $(CFLAGS_REPRO)
+  FFLAGS += $(FFLAGS_REPRO)
+  FAST :=
 else ifeq ($(DEBUG),Y)
-CPPDEFS += -DDEBUG
-CFLAGS += $(CFLAGS_DEBUG)
-FFLAGS += $(FFLAGS_DEBUG)
-FAST :=
+  CPPDEFS += -DDEBUG
+  CFLAGS += $(CFLAGS_DEBUG)
+  FFLAGS += $(FFLAGS_DEBUG)
+  FAST :=
 else ifeq ($(TEST),Y)
-CFLAGS += $(CFLAGS_TEST)
-FFLAGS += $(FFLAGS_TEST)
-FAST :=
+  CFLAGS += $(CFLAGS_TEST)
+  FFLAGS += $(FFLAGS_TEST)
+  FAST :=
 else
-CFLAGS += $(CFLAGS_OPT)
-FFLAGS += $(FFLAGS_OPT)
-FAST := $(TRANSCENDENTALS)
+  CFLAGS += $(CFLAGS_OPT)
+  FFLAGS += $(FFLAGS_OPT)
+  FAST := $(TRANSCENDENTALS)
 endif
 
 ifeq ($(OPENMP),Y)
-CPPDEFS += -DOPENMP
-CFLAGS += $(CFLAGS_OPENMP)
-FFLAGS += $(FFLAGS_OPENMP)
-LDFLAGS += $(LDFLAGS_OPENMP)
+  CPPDEFS += -DOPENMP
+  CFLAGS += $(CFLAGS_OPENMP)
+  FFLAGS += $(FFLAGS_OPENMP)
+  LDFLAGS += $(LDFLAGS_OPENMP)
 endif
 
 ifeq ($(VERBOSE),Y)
-CFLAGS += $(CFLAGS_VERBOSE)
-FFLAGS += $(FFLAGS_VERBOSE)
-LDFLAGS += $(LDFLAGS_VERBOSE)
+  CFLAGS += $(CFLAGS_VERBOSE)
+  FFLAGS += $(FFLAGS_VERBOSE)
+  LDFLAGS += $(LDFLAGS_VERBOSE)
 endif
 
 ifeq ($(CCPP),Y)
-CPPDEFS += -DCCPP
-CFLAGS += -I$(PATH_CCPP)/include
-FFLAGS += -I$(PATH_CCPP)/include
-LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
+  CPPDEFS += -DCCPP
+  CFLAGS += -I$(PATH_CCPP)/include
+  FFLAGS += -I$(PATH_CCPP)/include
+  LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
+endif
+
+ifeq ($(CMEPS),Y)
+  CPPDEFS += -DCMEPS
 endif
 
 LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile
-FFLAGS += $(ESMF_INC)
-CPPFLAGS += -traditional
-EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS) $(NETCDF_LIB)
+  FFLAGS += $(ESMF_INC)
+  CPPFLAGS += -DFV3_CPLD -traditional
+  EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS) $(NETCDF_LIB)
 endif

conf/configure.fv3.orion.intel

@@ -1,6 +1,6 @@
 ## NEMS configuration file
 ##
-## Platform: Hera
+## Platform: Orion
 ## Compiler: Intel with IntelMPI
 
 SHELL=/bin/sh
@@ -103,7 +103,7 @@ endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
 FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
-FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv -link_mpi=dbg
 
 TRANSCENDENTALS := -fast-transcendentals
 FFLAGS_OPENMP = -qopenmp
@@ -168,10 +168,14 @@ FFLAGS += -I$(PATH_CCPP)/include
 LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
 endif
 
+ifeq ($(CMEPS),Y)
+CPPDEFS += -DCMEPS
+endif
+
 LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)
-CPPFLAGS += -traditional
+CPPFLAGS += -DFV3_CPLD -traditional
 EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS) $(NETCDF_LIB)
 endif

conf/configure.fv3.wcoss_dell_p3

@@ -47,32 +47,32 @@ CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO  -DUSE_GFS
 CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
 
 ifeq ($(HYDRO),Y)
-CPPDEFS +=
+  CPPDEFS +=
 else
-CPPDEFS += -DMOIST_CAPPA -DUSE_COND
+  CPPDEFS += -DMOIST_CAPPA -DUSE_COND
 endif
 
 ifeq ($(32BIT),Y)
-CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
-FFLAGS += -i4 -real-size 32
+  CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
+  FFLAGS += -i4 -real-size 32
 else
-ifeq ($(REPRO),Y)
-FFLAGS += -i4 -real-size 64
-else
-FFLAGS += -i4 -real-size 64 -no-prec-div -no-prec-sqrt
-endif
+  ifeq ($(REPRO),Y)
+    FFLAGS += -i4 -real-size 64
+  else
+    FFLAGS += -i4 -real-size 64 -no-prec-div -no-prec-sqrt
+  endif
 endif
 
 ifeq ($(REPRO),Y)
-FFLAGS += -qno-opt-dynamic-align
-CFLAGS += -qno-opt-dynamic-align
+  FFLAGS += -qno-opt-dynamic-align
+  CFLAGS += -qno-opt-dynamic-align
 else
-FFLAGS += -xHOST -qno-opt-dynamic-align
-CFLAGS += -xHOST -qno-opt-dynamic-align
+  FFLAGS += -xHOST -qno-opt-dynamic-align
+  CFLAGS += -xHOST -qno-opt-dynamic-align
 endif
 
 ifeq ($(MULTI_GASES),Y)
-CPPDEFS += -DMULTI_GASES
+  CPPDEFS += -DMULTI_GASES
 endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
@@ -104,43 +104,43 @@ LDFLAGS_VERBOSE := -Wl,-V,--verbose,-cref,-M
 LIBS :=
 
 ifeq ($(REPRO),Y)
-CPPDEFS += -DREPRO
-CFLAGS += $(CFLAGS_REPRO)
-FFLAGS += $(FFLAGS_REPRO)
-FAST :=
+  CPPDEFS += -DREPRO
+  CFLAGS += $(CFLAGS_REPRO)
+  FFLAGS += $(FFLAGS_REPRO)
+  FAST :=
 else ifeq ($(DEBUG),Y)
-CPPDEFS += -DDEBUG
-CFLAGS += $(CFLAGS_DEBUG)
-FFLAGS += $(FFLAGS_DEBUG)
-FAST :=
+  CPPDEFS += -DDEBUG
+  CFLAGS += $(CFLAGS_DEBUG)
+  FFLAGS += $(FFLAGS_DEBUG)
+  FAST :=
 else ifeq ($(TEST),Y)
-CFLAGS += $(CFLAGS_TEST)
-FFLAGS += $(FFLAGS_TEST)
-FAST :=
+  CFLAGS += $(CFLAGS_TEST)
+  FFLAGS += $(FFLAGS_TEST)
+  FAST :=
 else
-CFLAGS += $(CFLAGS_OPT)
-FFLAGS += $(FFLAGS_OPT)
-FAST := $(TRANSCENDENTALS)
+  CFLAGS += $(CFLAGS_OPT)
+  FFLAGS += $(FFLAGS_OPT)
+  FAST := $(TRANSCENDENTALS)
 endif
 
 ifeq ($(OPENMP),Y)
-CPPDEFS += -DOPENMP
-CFLAGS += $(CFLAGS_OPENMP)
-FFLAGS += $(FFLAGS_OPENMP)
-LDFLAGS += $(LDFLAGS_OPENMP)
+  CPPDEFS += -DOPENMP
+  CFLAGS += $(CFLAGS_OPENMP)
+  FFLAGS += $(FFLAGS_OPENMP)
+  LDFLAGS += $(LDFLAGS_OPENMP)
 endif
 
 ifeq ($(VERBOSE),Y)
-CFLAGS += $(CFLAGS_VERBOSE)
-FFLAGS += $(FFLAGS_VERBOSE)
-LDFLAGS += $(LDFLAGS_VERBOSE)
+  CFLAGS += $(CFLAGS_VERBOSE)
+  FFLAGS += $(FFLAGS_VERBOSE)
+  LDFLAGS += $(LDFLAGS_VERBOSE)
 endif
 
 ifeq ($(CCPP),Y)
-CPPDEFS += -DCCPP
-CFLAGS += -I$(PATH_CCPP)/include
-FFLAGS += -I$(PATH_CCPP)/include
-LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
+  CPPDEFS += -DCCPP
+  CFLAGS += -I$(PATH_CCPP)/include
+  FFLAGS += -I$(PATH_CCPP)/include
+  LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
 endif
 
 ifneq ($(findstring NetCDF/4,$(LOADEDMODULES)),)
@@ -152,7 +152,7 @@ endif
 LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile
-FFLAGS += $(ESMF_INC)
-CPPFLAGS += -traditional
-EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS)
+  FFLAGS += $(ESMF_INC)
+  CPPFLAGS += -DFV3_CPLD -traditional
+  EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS)
 endif

modulefiles/hera.intel/fv3

@@ -41,7 +41,7 @@ module load jasper/1.900.1
 module load png/1.2.44
 module load z/1.2.11
 ## load modules for nceppost grib
-module load post/8.0.5
+module load post/8.0.6
 
 ##
 ## load ESMF library for above compiler / MPI combination