Python 3 bugfix in ccpp-framework, ESMF 8.1.0bs27, cleanup rt_utils.s…

…h, fix RRTMGP regression tests (#201) * Enable inline post for gnumake builds on hera.gnu, cheyenne.intel, cheyenne.gnu; skip-ci * Update pull request template, use correct Python interpreter when calling ccpp_prebuild.py in CMakeLists.txt; skip-ci * tests/rt_utils.sh: remove machine-dependent configuration; skip-ci * Update ESMF from 8.1.0bs21 to 8.1.0bs27 on almost all machines; skip-ci * Update .gitmodules and submodule pointer for fv3atm for code review and testing; skip-ci * Fix RRTMGP regression test setups, temporarily disable RRTMGP tests in tests/rt.conf and tests/rt_gnu.conf * Updates for docker/ci * Add note about unit test availability to pull request template * Update rt.sh configuration for jet, remove tests/rt_rrtmgp.conf, add tests/fv3_conf/compile_slurm.IN_jet
ufs-community · Sep 15, 2020 · 60d3ae2 · 60d3ae2
1 parent 407df4e
commit 60d3ae2
Show file tree

Hide file tree

Showing 37 changed files with 3,405 additions and 4,817 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
@@ -108,7 +108,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 +120,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/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/conf/configure.fv3.cheyenne.gnu b/conf/configure.fv3.cheyenne.gnu
@@ -89,7 +89,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
@@ -89,7 +89,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 +=

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/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
@@ -47,7 +47,7 @@ module load sigio/2.3.0
 ##
 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 esmf/8.1.0bs27
 module load hdf5_parallel/1.10.6.release
 
 ##

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}
diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/orion.intel/fv3
@@ -51,7 +51,7 @@ module load z/1.2.6
 ##
 module use /apps/contrib/NCEPLIBS/lib/modulefiles
 module load netcdfp/4.7.4.release
-module load esmflocal/8.1.0.21bs.release
+module load esmflocal/8.1.0.27bs.release
 
 ###
 ### load Python 3

diff --git a/modulefiles/stampede.intel/fv3 b/modulefiles/stampede.intel/fv3
@@ -18,17 +18,17 @@ module-whatis "loads NEMS FV3 prerequisites for Stampede/Intel"
 module load intel/18.0.2
 module load impi/18.0.2
 module load python3/3.7.0
-module load netcdf/4.6.2
-setenv NETCDF /opt/apps/intel18/netcdf/4.6.2/x86_64
 
 ##
 ## use pre-compiled ESMF and NCEP libraries for above compiler / MPI combination
 ##
 # DH* todo - shared directory
-module use -a /work/06146/tg854455/stampede2/ufs-stack-20200728/intel-18.0.2/impi-18.0.2/modules
+module use -a /work/06146/tg854455/stampede2/ufs-stack-20200909/intel-18.0.2/impi-18.0.2/modules
 # *DH
 
-module load esmf/8.0.0
+module load libpng/1.6.35
+module load netcdf/4.7.4
+module load esmf/8.1.0bs27
 
 module load bacio/2.4.0
 module load crtm/2.3.0

diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -64,7 +64,7 @@ module load udreg
 module load ugni
 
 module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
-module load esmf/8.1.0bs21
+module load esmf/8.1.0bs27
 
 module swap pmi pmi/5.0.11
 

diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
@@ -48,7 +48,7 @@ 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 esmf/8.1.0bs21
+module load esmf/8.1.0bs27
 
 ##
 ## load cmake

diff --git a/parm/ccpp_v15p2_c96_rrtmgp.nml.IN b/parm/ccpp_v15p2_c96_rrtmgp.nml.IN
@@ -16,7 +16,7 @@
   fhout = 3
   fhmaxhf = 120
   fhouthf = 1
-  ccpp_suite = 'FV3_GFS_v15p2_RRTMGP'
+  ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml

diff --git a/parm/ccpp_v16beta_c96_rrtmgp.nml.IN b/parm/ccpp_v16beta_c96_rrtmgp.nml.IN
@@ -16,7 +16,7 @@
   fhout = 3
   fhmaxhf = 120
   fhouthf = 1
-  ccpp_suite = 'FV3_GFS_v16beta_RRTMGP'
+  ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml
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)