Skip to content

Commit

Permalink
Update from NCAR dtc/develop 2019/12/17 (#18)
Browse files Browse the repository at this point in the history
* update FMS to point to tag 2019.01 of NOAA-GFDL
* update stochastic_physics to point to hash 1745422af76d830757cd6035b6ea101e92b4cac1 @pjpegion
* update of path to CCPP physics library for CCPP regression tests
* add -Wall to compiler flags for GNU compilers
* remove warnings for non-existent include directories for GNU compiler
* update of regression testing scripts to detect errors in tests/run_test.sh
* new regression tests fv3_ccpp_gfs_v15p2, fv3_ccpp_gfs_v15p2_debug, fv3_ccpp_gfs_v16beta, fv3_ccpp_gfs_v16beta_debug
* update of rt.conf: remove Cheyenne.intel entries (so that rt.conf is an EMC-maintained regression test configuration; move Cheyenne Intel tests into a separate file that resides in the NCAR dtc/develop branch)
* make compile_cmake.sh work with Cheyenne Intel/GNU, and bugfixes for compile_cmake.sh
* allow environment variable NEMS_MACHINE to overwrite (or set) MACHINE_ID (see #20 for the corresponding PR for the ufs_public_release branch)
* new regression test fv3_ccpp_gsd_sar_25km_debug (but not exercised in default rt.conf)
* updates for jet and gaea (note: only supporting rt.sh, not NEMSCompsetRun)
  • Loading branch information
climbfuji authored and DusanJovic-NOAA committed Jan 10, 2020
1 parent d311672 commit b41e023
Show file tree
Hide file tree
Showing 103 changed files with 237,096 additions and 260,264 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
branch = develop
[submodule "FMS"]
path = FMS
url = https://github.com/NOAA-EMC/FMS
branch = GFS-FMS
url = https://github.com/NOAA-GFDL/FMS
branch = master
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ add_library(
FMS/mosaic/interp.c
FMS/mosaic/mosaic_util.c
FMS/mosaic/read_mosaic.c
FMS/mpp/affinity.c
FMS/affinity/affinity.c
FMS/mpp/nsclock.c
FMS/mpp/threadloc.c
)
Expand Down
2 changes: 1 addition & 1 deletion FMS
Submodule FMS updated 342 files
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 49 files
+1 −1 atmos_cubed_sphere
+28 −15 ccpp/CMakeLists.txt
+1 −1 ccpp/build_ccpp.sh
+20 −1 ccpp/config/ccpp_prebuild_config.py
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_CPT_v0.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017.xml
+88 −0 ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
+1 −0 ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+1 −2 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+1 −0 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_myj.xml
+1 −0 ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+93 −0 ccpp/suites/suite_FV3_GFS_2017_sas.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+89 −0 ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_stretched.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ysu.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15.xml
+1 −0 ccpp/suites/suite_FV3_GFS_v15_gf.xml
+1 −0 ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_mynn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15plus.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v16beta.xml
+83 −0 ccpp/suites/suite_FV3_GSD_SAR.xml
+1 −0 ccpp/suites/suite_FV3_GSD_noah.xml
+1 −0 ccpp/suites/suite_FV3_GSD_v0.xml
+2 −2 ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+87 −0 ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+13 −0 gfsphysics/GFS_layer/GFS_diagnostics.F90
+61 −9 gfsphysics/GFS_layer/GFS_driver.F90
+379 −111 gfsphysics/GFS_layer/GFS_physics_driver.F90
+25 −6 gfsphysics/GFS_layer/GFS_radiation_driver.F90
+5 −5 gfsphysics/GFS_layer/GFS_restart.F90
+252 −71 gfsphysics/GFS_layer/GFS_typedefs.F90
+290 −89 gfsphysics/GFS_layer/GFS_typedefs.meta
+3 −3 gfsphysics/physics/ugwp_driver_v0.f
+44 −11 io/FV3GFS_io.F90
+4 −4 makefile
35 changes: 35 additions & 0 deletions cmake/configure_cheyenne.gnu.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
message("")
message("Setting configuration for $ENV{CMAKE_Platform}")
message("")

get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME)
get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME)
get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})")
message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})")
message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})")
message("")

option(DEBUG "Enable DEBUG mode" OFF)
option(REPRO "Enable REPRO mode" OFF)
option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" OFF)

option(INLINE_POST "Enable inline post" OFF)

include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake )

set(NEMSIO_INC $ENV{NEMSIO_INC})
set(POST_INC $ENV{POST_INC})
set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB})

set(ESMF_MOD ${ESMF_F90COMPILEPATHS})
set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}")

set(NETCDF_INC_DIR $ENV{NETCDF}/include)
set(NETCDF_LIBDIR $ENV{NETCDF}/lib)
set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf)

message("")
35 changes: 35 additions & 0 deletions cmake/configure_cheyenne.intel-impi.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
message("")
message("Setting configuration for $ENV{CMAKE_Platform}")
message("")

get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME)
get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME)
get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})")
message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})")
message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})")
message("")

option(DEBUG "Enable DEBUG mode" OFF)
option(REPRO "Enable REPRO mode" OFF)
option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)

option(INLINE_POST "Enable inline post" OFF)

include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake )

set(NEMSIO_INC $ENV{NEMSIO_INC})
set(POST_INC $ENV{POST_INC})
set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB})

set(ESMF_MOD ${ESMF_F90COMPILEPATHS})
set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}")

set(NETCDF_INC_DIR $ENV{NETCDF}/include)
set(NETCDF_LIBDIR $ENV{NETCDF}/lib)
set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf)

message("")
35 changes: 35 additions & 0 deletions cmake/configure_cheyenne.intel.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
message("")
message("Setting configuration for $ENV{CMAKE_Platform}")
message("")

get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME)
get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME)
get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})")
message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})")
message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})")
message("")

option(DEBUG "Enable DEBUG mode" OFF)
option(REPRO "Enable REPRO mode" OFF)
option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)

option(INLINE_POST "Enable inline post" OFF)

include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake )

set(NEMSIO_INC $ENV{NEMSIO_INC})
set(POST_INC $ENV{POST_INC})
set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB})

set(ESMF_MOD ${ESMF_F90COMPILEPATHS})
set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}")

set(NETCDF_INC_DIR $ENV{NETCDF}/include)
set(NETCDF_LIBDIR $ENV{NETCDF}/lib)
set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf)

message("")
3 changes: 3 additions & 0 deletions compsets/fv3.input
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,10 @@ fv3_defaults = {
MAKE_NH='.T.'
MOUNTAIN='.F.'
SATMEDMF='.F.'
ISATMEDMF='0'
HYBEDMF='.T.'
IMFSHALCNV='2'
IMFDEEPCNV='2'
LHEATSTRG='.F.'
LGFDLMPRAD='.F.'
EFFR_IN='.F.'
Expand Down
4 changes: 2 additions & 2 deletions compsets/hera.input
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ platform hera.intel {
# INPUTS is the input directory, which should contain fix and parm
# files, plus any restarts or other inputs.

BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
INPUTS="@[BASELINE]"

default_resources={
Expand Down
16 changes: 8 additions & 8 deletions compsets/wcoss.input
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ platform wcoss.phase2 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'
MACHINE_ID='wcoss.phase2'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"

default_resources={
TASKS=156
Expand Down Expand Up @@ -121,8 +121,8 @@ platform wcoss.phase1 {
cores_per_node=16
cpus_per_core=2
MACHINE_ID='wcoss.phase1'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"

# WCOSS Phase 2 has been slow of late.
DEFAULT_TEST_WALLTIME=2700
Expand Down Expand Up @@ -206,8 +206,8 @@ platform wcoss_dell_p3 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'

BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"

default_resources={
TASKS=156
Expand Down Expand Up @@ -304,8 +304,8 @@ platform wcoss.cray {
BUILD_WALLTIME="3600"
DEFAULT_TEST_WALLTIME=1800

BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191217"
BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20191230"

execution_time_modules=[[[
module load alps
Expand Down
4 changes: 2 additions & 2 deletions conf/configure.fv3.macosx.gnu
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ CPPDEFS += -DMULTI_GASES
endif

FFLAGS_OPT = -O2 -g -fno-range-check
FFLAGS_REPRO = -O2 -g -fbacktrace -fno-range-check
FFLAGS_DEBUG = -g -O0 -ggdb -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans -Wuninitialized -ffpe-trap=invalid,zero,overflow -fbounds-check -fbacktrace -fno-range-check -Wall
FFLAGS_REPRO = -O0 -g -fbacktrace -fno-range-check
FFLAGS_DEBUG = -g -O0 -ggdb -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans -ffpe-trap=invalid,zero,overflow -fbounds-check -fbacktrace -fno-range-check -Wall

TRANSCENDENTALS :=
FFLAGS_OPENMP = -fopenmp
Expand Down
Loading

0 comments on commit b41e023

Please sign in to comment.