ufs-community · junwang-noaa · Aug 25, 2020 · Aug 19, 2020 · Aug 19, 2020 · Aug 19, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "FV3"]
 	path = FV3
-	url = https://github.com/NOAA-EMC/fv3atm
-	branch = develop
+	url = https://github.com/junwang-noaa/fv3atm
+	branch = esmf810bs21
 [submodule "NEMS"]
 	path = NEMS
-	url = https://github.com/NOAA-EMC/NEMS
-	branch = develop
+	url = https://github.com/junwang-noaa/NEMS
+	branch = esmf810bs21
 [submodule "FMS"]
 	path = FMS
 	url = https://github.com/NOAA-GFDL/FMS

diff --git a/FV3 b/FV3
diff --git a/NEMS b/NEMS
diff --git a/cmake/configure_wcoss_cray.cmake b/cmake/configure_wcoss_cray.cmake
@@ -1 +1,2 @@
 set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
+set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
diff --git a/conf/configure.fv3.wcoss_cray b/conf/configure.fv3.wcoss_cray
@@ -39,7 +39,7 @@ ifneq ($(need),$(ok))
 $(error Need at least make version $(need).  Load module gmake/3.81)
 endif
 
-NETCDF_ROOT = $(NETCDF_DIR)
+NETCDF_ROOT = $(NETCDF)
 INCLUDE = -I$(NETCDF_ROOT)/include
 
 FPPFLAGS := -fpp -Wp,-w $(INCLUDE)
@@ -48,7 +48,7 @@ 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 +=
@@ -109,6 +109,7 @@ FFLAGS_TEST = -O3 -debug minimal -fp-model source -qoverride-limits
 CFLAGS_TEST = -O2
 
 LDFLAGS :=
+LDFLAGS += $(Z_LIB) -L$(NETCDF_ROOT)/lib
 LDFLAGS_OPENMP := -qopenmp
 LDFLAGS_VERBOSE := -Wl,-V,--verbose,-cref,-M
 
@@ -157,16 +158,12 @@ FFLAGS += -I$(PATH_CCPP)/include
 LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
 endif
 
-ifneq ($(findstring netcdf/4,$(LOADEDMODULES)),)
-  LIBS += -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lz
-else
-  LIBS += -lnetcdf
-endif
+LIBS += -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 $(Z_LIB)
 
 LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)
 CPPFLAGS += -traditional
-EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS)
+EXTLIBS = $(NCEPLIBS) $(LDFLAGS) $(ESMF_LIB)
 endif
diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
@@ -46,9 +46,9 @@ module load sigio/2.3.0
 ## use pre-compiled EMSF library for above compiler / MPI combination
 ##
 module use -a /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-module load hdf5_parallel/1.10.6
-module load netcdf_parallel/4.7.4
-module load esmf/8.0.0_ParallelNetCDF
+module load netcdf_parallel/4.7.4.release
+module load esmf/8.1.0bs21
+module load hdf5_parallel/1.10.6.release
 
 ##
 ## load cmake

diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/orion.intel/fv3
@@ -50,8 +50,8 @@ module load z/1.2.6
 ## use pre-compiled EMSF library for above compiler / MPI combination
 ##
 module use /apps/contrib/NCEPLIBS/lib/modulefiles
-module load netcdfp/4.7.4
-module load esmflocal/8.0.0.para
+module load netcdfp/4.7.4.release
+module load esmflocal/8.1.0.21bs.release
 module load post-intel-sandybridge/8.0.5
 
 ###

diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -17,18 +17,19 @@ module-whatis "loads NEMS FV3 prerequisites on Surge and Luna"
 ##
 module load PrgEnv-intel
 module rm intel
-module rm NetCDF-intel-sandybridge/4.2
 module load intel/18.1.163
-module load cray-netcdf/4.3.3.1
-setenv NETCDF /opt/cray/netcdf/4.3.3.1/INTEL/14.0
-module load cray-hdf5/1.8.14
+module rm NetCDF-intel-sandybridge/4.2
 module load xt-lsfhpc/9.1.3
 module load craype-haswell
 module load python/2.7.14
 module load cmake/3.16.2
+module load gcc/5.3.0
 #
+module use /usrx/local/dev/modulefiles
+module load NetCDF-intel-sandybridge/4.7.4
+module load HDF5-parallel-intel-sandybridge/1.10.6
+
 ## WCOSS cray for WW3
-module load gcc/4.9.2
 module load jasper-gnu-sandybridge/1.900.1
 module load png-intel-sandybridge/1.2.49
 module load zlib-intel-sandybridge/1.2.7
@@ -63,7 +64,7 @@ module load udreg
 module load ugni
 
 module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
-module load esmf/8.0.0_intel18
+module load esmf/8.1.0bs21
 
 module swap pmi pmi/5.0.11
 

diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
@@ -43,10 +43,12 @@ module load sigio/2.3.0
 
 module load jasper/1.900.29
 
+module use /usrx/local/dev/modulefiles/mpi_third/ips/18.0.1/impi/18.0.1
+module load NetCDF-parallel/4.7.4
+module load HDF5-parallel/1.10.6
+
 module use /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/soft/modulefiles
-module load hdf5_parallel/1.10.6
-module load netcdf_parallel/4.7.4
-module load esmf/8.0.0_ParallelNetCDF
+module load esmf/8.1.0bs21
 
 ##
 ## load cmake

diff --git a/parm/model_configure.IN b/parm/model_configure.IN
@@ -30,6 +30,8 @@ num_files:               @[NUM_FILES]
 filename_base:           @[FILENAME_BASE]
 output_grid:             @[OUTPUT_GRID]
 output_file:             @[OUTPUT_FILE]
+ideflate:                @[IDEFLATE]
+nbits:                   @[NBITS]
 write_nemsioflip:        @[WRITE_NEMSIOFLIP]
 write_fsyncflag:         @[WRITE_FSYNCFLAG]
 imo:                     @[IMO]