Merge pull request ufs-community#2 from ufs-community/develop

Upstream update 10/1/2020
aerorahul · Oct 1, 2020 · fc187e6 · fc187e6
2 parents e3a3489 + 208f36d
commit fc187e6
Show file tree

Hide file tree

Showing 140 changed files with 1,094 additions and 2,732 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -4,8 +4,7 @@
 Provide a detailed description of what this PR does.
 What bug does it fix, or what feature does it add?
 Is a change of answers expected from this PR?
-
-
+Are any library updates included in this PR (modulefiles etc.)?
 
 ### Issue(s) addressed
 
@@ -14,15 +13,12 @@ Link the issues to be closed with this PR, whether in this repository, or in ano
 - fixes #<issue_number>
 - fixes noaa-emc/fv3atm/issues/<issue_number>
 
-
-
 ## Testing
 
 How were these changes tested?
 What compilers / HPCs was it tested with?
 Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
-
-
+Have regression tests and unit tests (utests) been run? On which platforms and with which compilers? (Note that unit tests can only be run on tier-1 platforms)
 
 ## Dependencies
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,6 +22,7 @@ set(AVX2            ON  CACHE BOOL "Enable AVX2 instruction set")
 set(SIMDMULTIARCH   OFF CACHE BOOL "Enable multi-target SIMD instruction sets")
 set(CCPP            ON  CACHE BOOL "Enable CCPP")
 set(DEBUG           OFF CACHE BOOL "Enable DEBUG mode")
+set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")
 set(INLINE_POST     OFF CACHE BOOL "Enable inline post")
 set(MULTI_GASES     OFF CACHE BOOL "Enable MULTI_GASES")
 set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")
@@ -46,6 +47,7 @@ message("AVX2 ............. ${AVX2}")
 message("SIMDMULTIARCH      ${SIMDMULTIARCH}")
 message("CCPP ............. ${CCPP}")
 message("DEBUG ............ ${DEBUG}")
+message("DEBUG_LINKMPI .... ${DEBUG_LINKMPI}")
 message("INLINE_POST ...... ${INLINE_POST}")
 message("MULTI_GASES ...... ${MULTI_GASES}")
 message("OPENMP ........... ${OPENMP}")
@@ -108,7 +110,8 @@ if(CCPP)
 
     if(DEFINED CCPP_SUITES)
         message("Calling CCPP code generator (ccpp_prebuild.py) for SUITES = ${CCPP_SUITES}")
-        execute_process(COMMAND FV3/ccpp/framework/scripts/ccpp_prebuild.py
+        execute_process(COMMAND ${Python_EXECUTABLE}
+                                "FV3/ccpp/framework/scripts/ccpp_prebuild.py"
                                 "--config=FV3/ccpp/config/ccpp_prebuild_config.py"
                                 "--suites=${CCPP_SUITES}"
                                 "--builddir=${PROJECT_BINARY_DIR}/FV3"
@@ -119,7 +122,8 @@ if(CCPP)
                        )
     else()
         message("Calling CCPP code generator (ccpp_prebuild.py) ...")
-        execute_process(COMMAND FV3/ccpp/framework/scripts/ccpp_prebuild.py
+        execute_process(COMMAND ${Python_EXECUTABLE}
+                                "FV3/ccpp/framework/scripts/ccpp_prebuild.py"
                                 "--config=FV3/ccpp/config/ccpp_prebuild_config.py"
                                 "--builddir=${PROJECT_BINARY_DIR}/FV3"
                         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

diff --git a/FV3 b/FV3
diff --git a/NEMS b/NEMS
diff --git a/WW3 b/WW3
diff --git a/build.sh b/build.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 set -eu
 
-MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+if [[ $(uname -s) == Darwin ]]; then
+  readonly MYDIR=$(cd "$(dirname "$(greadlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+else
+  readonly MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+fi
 
 export CMAKE_C_COMPILER=${CMAKE_C_COMPILER:-mpicc}
 export CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER:-mpicxx}

diff --git a/cmake/FindESMF.cmake b/cmake/FindESMF.cmake
@@ -93,7 +93,7 @@ if (ESMF_FOUND)
     set(ESMF_INTERFACE_LINK_LIBRARIES "")
   else()
     # When linking the static library, also need the ESMF linker flags; strip any leading/trailing whitespaces
-    string(STRIP "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90LINKLIBS} ${ESMF_F90LINKOPTS}" ESMF_INTERFACE_LINK_LIBRARIES)
+    string(STRIP "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90LINKPATHS} ${ESMF_F90LINKLIBS} ${ESMF_F90LINKOPTS}" ESMF_INTERFACE_LINK_LIBRARIES)
     message(STATUS "Found ESMF library: ${esmf_lib}")
   endif()
 

diff --git a/cmake/FindNetCDF.cmake b/cmake/FindNetCDF.cmake
@@ -228,6 +228,9 @@ foreach( _comp IN LISTS _search_components )
         IMPORTED_LOCATION ${NetCDF_${_comp}_LIBRARY}
         INTERFACE_INCLUDE_DIRECTORIES "${NetCDF_${_comp}_INCLUDE_DIRS}"
         INTERFACE_LINK_LIBRARIES ${NetCDF_${_comp}_LIBRARIES} )
+      if( NOT _comp MATCHES "^(C)$" )
+        target_link_libraries(NetCDF::NetCDF_${_comp} INTERFACE NetCDF::NetCDF_C)
+      endif()
     endif()
   endif()
 endforeach()

diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake
@@ -40,6 +40,13 @@ if(REPRO)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -debug minimal")
 elseif(DEBUG)
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv")
+    if(DEBUG_LINKMPI)
+      if(OPENMP)
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -link_mpi=dbg_mt")
+      else()
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -link_mpi=dbg")
+      endif()
+    endif()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -ftrapuv -traceback")
 else()
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3")

diff --git a/cmake/configure_cheyenne.gnu.cmake b/cmake/configure_cheyenne.gnu.cmake
@@ -1 +1 @@
-set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
+set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
diff --git a/cmake/configure_cheyenne.intel.cmake b/cmake/configure_cheyenne.intel.cmake
@@ -1 +1,2 @@
 set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
+set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
diff --git a/cmake/configure_gaea.intel.cmake b/cmake/configure_gaea.intel.cmake
@@ -1 +1,2 @@
 set(INLINE_POST     ON CACHE BOOL "Enable inline post" FORCE)
+set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
diff --git a/cmake/configure_wcoss_cray.cmake b/cmake/configure_wcoss_cray.cmake
@@ -1,2 +1,3 @@
 set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
+set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
diff --git a/conf/configure.fv3.cheyenne.gnu b/conf/configure.fv3.cheyenne.gnu
@@ -63,7 +63,8 @@ include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)
 
 NEMSIOINC = -I$(NEMSIO_INC)
-NCEPLIBS = $(NEMSIO_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd)
+NCEPLIBS = $(POST_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) -lpng -ljasper -lz
+# $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
 
 ##############################################
 # Need to use at least GNU Make version 3.81 #
@@ -89,7 +90,7 @@ CFLAGS := $(INCLUDE)
 FFLAGS := $(INCLUDE) -fcray-pointer -ffree-line-length-none -fno-range-check -fbacktrace
 
 CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO  -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
-CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST
+CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
 
 ifeq ($(HYDRO),Y)
 CPPDEFS +=

diff --git a/conf/configure.fv3.cheyenne.intel b/conf/configure.fv3.cheyenne.intel
@@ -63,7 +63,8 @@ include       $(ESMFMKFILE)
 ESMF_INC    = $(ESMF_F90COMPILEPATHS)
 
 NEMSIOINC = -I$(NEMSIO_INC)
-NCEPLIBS = $(NEMSIO_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd)
+NCEPLIBS = $(POST_LIB) $(NEMSIO_LIB) $(G2_LIB4) $(G2TMPL_LIB) $(BACIO_LIB4) $(SP_LIBd) $(W3EMC_LIBd) $(W3NCO_LIBd) $(CRTM_LIB) -lpng -ljasper -lz
+# $(PNG_LIB) $(JASPER_LIB) $(Z_LIB)
 
 ##############################################
 # Need to use at least GNU Make version 3.81 #
@@ -89,7 +90,7 @@ CFLAGS := $(INCLUDE)
 FFLAGS := $(INCLUDE) -fno-alias -auto -safe-cray-ptr -save-temps -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_INLINE_POST
+CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
 
 ifeq ($(HYDRO),Y)
 CPPDEFS +=
@@ -131,7 +132,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

diff --git a/conf/configure.fv3.hera.gnu b/conf/configure.fv3.hera.gnu
@@ -64,7 +64,7 @@ CFLAGS := $(INCLUDE)
 FFLAGS := $(INCLUDE) -fcray-pointer -ffree-line-length-none -fno-range-check -fbacktrace
 
 CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO  -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
-CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST
+CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
 
 ifeq ($(HYDRO),Y)
 CPPDEFS +=

diff --git a/conf/configure.fv3.hera.intel b/conf/configure.fv3.hera.intel
@@ -111,7 +111,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
@@ -181,5 +181,5 @@ LDFLAGS += $(LIBS)
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)
 CPPFLAGS += -traditional
-EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS) $(NETCDF_LIB)
+EXTLIBS = $(NCEPLIBS) $(ESMF_F90LINKPATHS) $(ESMF_LIB) $(LDFLAGS) $(NETCDF_LIB)
 endif
diff --git a/conf/configure.fv3.orion.intel b/conf/configure.fv3.orion.intel
@@ -109,7 +109,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

diff --git a/conf/configure.fv3.wcoss_dell_p3 b/conf/configure.fv3.wcoss_dell_p3
@@ -91,7 +91,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 -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check -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

diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3
@@ -23,11 +23,11 @@ module load ncarcompilers/0.5.0
 ##
 ## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
 ##
-module use -a /glade/p/ral/jntp/GMTB/tools/ufs-stack-20200825/gnu-9.1.0/mpt-2.19/modules
+module use -a /glade/p/ral/jntp/GMTB/tools/ufs-stack-20200909/gnu-9.1.0/mpt-2.19/modules
 
 module load libpng/1.6.35
 module load netcdf/4.7.4
-module load esmf/8.1.0bs21
+module load esmf/8.1.0bs27
 
 module load bacio/2.4.0
 module load crtm/2.3.0

diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3
@@ -23,11 +23,11 @@ module load ncarcompilers/0.5.0
 ##
 ## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
 ##
-module use -a /glade/p/ral/jntp/GMTB/tools/ufs-stack-20200825/intel-19.1.1/mpt-2.19/modules
+module use -a /glade/p/ral/jntp/GMTB/tools/ufs-stack-20200909/intel-19.1.1/mpt-2.19/modules
 
 module load libpng/1.6.35
 module load netcdf/4.7.4
-module load esmf/8.1.0bs21
+module load esmf/8.1.0bs27
 
 module load bacio/2.4.0
 module load crtm/2.3.0

diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/gaea.intel/fv3
@@ -25,11 +25,11 @@ module load cray-mpich/7.7.11
 ##
 ## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
 ##
-module use -a /lustre/f2/pdata/esrl/gsd/ufs/ufs-stack-20200825/intel-18.0.6.288/cray-mpich-7.7.11/modules
+module use -a /lustre/f2/pdata/esrl/gsd/ufs/ufs-stack-20200909/intel-18.0.6.288/cray-mpich-7.7.11/modules
 
 module load libpng/1.6.35
 module load netcdf/4.7.4
-module load esmf/8.1.0bs21
+module load esmf/8.1.0bs27
 
 module load bacio/2.4.0
 module load crtm/2.3.0

diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/hera.gnu/fv3
@@ -26,11 +26,11 @@ module load mpich/3.3.2
 ##
 ## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
 ##
-module use -a /scratch1/BMC/gmtb/software/ufs-stack-20200825/gnu-9.2.0/mpich-3.3.2/modules
+module use -a /scratch1/BMC/gmtb/software/ufs-stack-20200909/gnu-9.2.0/mpich-3.3.2/modules
 
 module load libpng/1.6.35
 module load netcdf/4.7.4
-module load esmf/8.1.0bs21
+module load esmf/8.1.0bs27
 
 module load bacio/2.4.0
 module load crtm/2.3.0

diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
@@ -1,60 +1,41 @@
-#%Module######################################################################
-##
-##    NEMS FV3 Prerequisites: Hera/Intel
+#%Module
 
 proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on Hera/Intel"
+  puts stderr "\tcit - loads modules required for building and running UFS Model on Hera/Intel"
 }
 
-module-whatis "loads NEMS FV3 prerequisites for Hera/Intel"
+module-whatis "loads UFS Model prerequisites for Hera/Intel"
 
-##
-## load contrib environment
-## load slurm utils (arbitrary.pl  layout.pl)
-##
-module use -a /contrib/sutils/modulefiles
+module use /contrib/sutils/modulefiles
 module load sutils
 
-##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
-module load intel/18.0.5.274
-module load impi/2018.0.4
-
-##
-## NCEP libraries
-##
-module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/cmake/install/NCEPLIBS/modules
-module load bacio/2.4.0
-module load crtm_dev/2.3.0
-module load g2/3.4.0
-module load g2tmpl/1.9.0
-module load ip/3.3.0
-module load nceppost/dceca26
-module load nemsio/2.5.1
-module load sp/2.3.0
-module load w3emc/2.7.0
-module load w3nco/2.4.0
-
-module load gfsio/1.4.0
-module load sfcio/1.4.0
-module load sigio/2.3.0
-
-##
-## load ESMF library for above compiler / MPI combination
-## use pre-compiled ESMF library for above compiler / MPI combination
-##
-module use -a /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-module load netcdf_parallel/4.7.4.release
-module load esmf/8.1.0bs21_ParallelNetCDF.release
-module load hdf5_parallel/1.10.6.release
-
-##
-## load cmake
-##
 module load cmake/3.16.1
 setenv CMAKE_C_COMPILER mpiicc
 setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform hera.intel
+
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+
+module load hpc/1.0.0-beta1
+module load hpc-intel/18.0.5.274
+module load hpc-impi/2018.0.4
+
+module load jasper/2.0.15
+module load zlib/1.2.11
+module load png/1.6.35
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load esmf/8_1_0_beta_snapshot_27
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nceppost/dceca26
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/jet.intel/fv3
@@ -22,11 +22,11 @@ module load impi/2018.4.274
 ##
 ## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
 ##
-module use -a /lfs4/HFIP/hfv3gfs/software/ufs-stack-20200825/intel-18.0.5.274/impi-2018.4.274/modules
+module use -a /lfs4/HFIP/hfv3gfs/software/ufs-stack-20200909/intel-18.0.5.274/impi-2018.4.274/modules
 
 module load libpng/1.6.35
 module load netcdf/4.7.4
-module load esmf/8.1.0bs21
+module load esmf/8.1.0bs27
 
 module load bacio/2.4.0
 module load crtm/2.3.0

diff --git a/modulefiles/linux.gnu/fv3 b/modulefiles/linux.gnu/fv3
@@ -47,9 +47,4 @@ export ESMFMKFILE=${ESMFMKFILE:-/usr/local/lib/esmf.mk}
 ## NCEP libraries (need to download and build manually, see doc/README_{UBUNTU,CENTOS,...}.txt and https://github.com/NCAR/NCEPlibs)
 ##
 export NCEPLIBS_DIR=${NCEPLIBS_DIR:-/usr/local/NCEPlibs}
-export bacio_DIR=${NCEPLIBS_DIR}/bacio-2.4.0
-export nemsio_DIR=${NCEPLIBS_DIR}/nemsio-2.5.1
-export w3nco_DIR=${NCEPLIBS_DIR}/w3nco-2.4.0
-export sp_DIR=${NCEPLIBS_DIR}/sp-2.3.0
-export w3emc_DIR=${NCEPLIBS_DIR}/w3emc-2.7.0
-export sigio_DIR=${NCEPLIBS_DIR}/sigio-2.3.0
+export CMAKE_PREFIX_PATH=${NCEPLIBS_DIR}
+1 −1		atmos_cubed_sphere
+24 −14		atmos_model.F90
+7 −5		ccpp/CMakeLists.txt
+6 −6		ccpp/driver/CCPP_driver.F90
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+89 −0		ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml
+1 −1		ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst.xml
+2 −1		ccpp/suites/suite_FV3_RRFS_v1beta.xml
+103 −20		cpl/module_cap_cpl.F90
+3 −1		cpl/module_cplfields.F90
+35 −9		fv3_cap.F90
+5 −5		gfsphysics/GFS_layer/GFS_diagnostics.F90
+16 −2		gfsphysics/GFS_layer/GFS_typedefs.F90
+16 −21		gfsphysics/GFS_layer/GFS_typedefs.meta
+46 −27		io/FV3GFS_io.F90
+1 −1		src/incmake/component_CICE6.mk
+4 −4		src/incmake/component_MOM6.mk
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
		set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
		set(DEBUG_LINKMPI OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)