From 81101283c8096cf72338b264be7b55201072d986 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 17 Mar 2020 14:18:14 -0600 Subject: [PATCH 1/9] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 409c6ee5a5..93ac91ba7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-GSD/fv3atm - branch = gsd/develop + #url = https://github.com/NOAA-GSD/fv3atm + #branch = gsd/develop + url = https://github.com/climbfuji/fv3atm + branch = mynnsfclay_from_joe_in_latest_code [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 2a05c537f0..934cf14ad1 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 2a05c537f0cc2d9525109d80b4a16126758ce13f +Subproject commit 934cf14ad1574a860839c93476e8c5224df96747 From 3be9c9ee76f3df2262e512daa3b5f1362e551008 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 20 Mar 2020 09:37:08 -0600 Subject: [PATCH 2/9] Add regression tests for GSD suite with MYNN surface layer scheme --- FV3 | 2 +- parm/ccpp_gsd.nml.IN | 2 +- tests/default_vars.sh | 1 + tests/rt.sh | 4 +- tests/rt_ccpp_gsd.conf | 15 +-- tests/tests/fv3_ccpp_gsd_mynnsfc | 128 +++++++++++++++++++++++++ tests/tests/fv3_ccpp_gsd_mynnsfc_debug | 103 ++++++++++++++++++++ 7 files changed, 245 insertions(+), 10 deletions(-) create mode 100644 tests/tests/fv3_ccpp_gsd_mynnsfc create mode 100644 tests/tests/fv3_ccpp_gsd_mynnsfc_debug diff --git a/FV3 b/FV3 index 934cf14ad1..001d24f1e8 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 934cf14ad1574a860839c93476e8c5224df96747 +Subproject commit 001d24f1e83588f469e2bf9449c57ca579d7a338 diff --git a/parm/ccpp_gsd.nml.IN b/parm/ccpp_gsd.nml.IN index c930d645f6..e986c22b9c 100644 --- a/parm/ccpp_gsd.nml.IN +++ b/parm/ccpp_gsd.nml.IN @@ -148,7 +148,7 @@ satmedmf = .false. lheatstrg = @[LHEATSTRG] do_mynnedmf = @[DO_MYNNEDMF] - do_mynnsfclay = .false. + do_mynnsfclay = @[DO_MYNNSFCLAY] random_clds = .false. trans_trac = .true. cnvcld = .true. diff --git a/tests/default_vars.sh b/tests/default_vars.sh index a8dc0f2f36..c4a1c0a4a6 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -148,6 +148,7 @@ export IMFDEEPCNV=2 # SFC export DO_MYJSFC=.F. +export DO_MYNNSFCLAY=.F. # LSM export LSM=1 diff --git a/tests/rt.sh b/tests/rt.sh index 4e0ade8cf5..1828753ec7 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -382,9 +382,9 @@ while getopts ":cfsl:mkreh" opt; do done if [[ $MACHINE_ID = cheyenne.* ]]; then - RTPWD=${RTPWD:-$DISKNM/develop-20200115/${COMPILER^^}} + RTPWD=${RTPWD:-$DISKNM/develop-20200320/${COMPILER^^}} else - RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200115} + RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200320} fi shift $((OPTIND-1)) diff --git a/tests/rt_ccpp_gsd.conf b/tests/rt_ccpp_gsd.conf index ce376811e1..26d038d311 100644 --- a/tests/rt_ccpp_gsd.conf +++ b/tests/rt_ccpp_gsd.conf @@ -2,9 +2,9 @@ # CCPP STATIC tests # ############################################################################################################################################################################# # Compile with CCPP - static mode -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | hera.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.gnu | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | hera.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | cheyenne.gnu | fv3 | # Run tests RUN | fv3_ccpp_thompson_mynn | standard | | fv3 | RUN | fv3_ccpp_gf_thompson | standard | | fv3 | @@ -12,6 +12,7 @@ RUN | fv3_ccpp_gsd RUN | fv3_ccpp_gsd_coldstart | standard | | | RUN | fv3_ccpp_gsd_warmstart | standard | | | RUN | fv3_ccpp_gsd_noah | standard | | fv3 | +RUN | fv3_ccpp_gsd_mynnsfc | standard | | fv3 | # Compile with CCPP - static mode COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | hera.intel | fv3 | COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | cheyenne.intel | fv3 | @@ -25,11 +26,12 @@ RUN | fv3_ccpp_mynn RUN | fv3_ccpp_gsd_drag_suite | standard | | fv3 | RUN | fv3_ccpp_gsd_sar | standard | | fv3 | # Compile with CCPP - static mode, debug -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson | standard | hera.intel | fv3 | -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 | +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | hera.intel | fv3 | +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 | # Run tests RUN | fv3_ccpp_gsd_debug | standard | | fv3 | +RUN | fv3_ccpp_gsd_mynnsfc_debug | standard | | fv3 | # Non-aerosol field_table staged only on hera for the moment RUN | fv3_ccpp_thompson_no_aero_debug | standard | hera.intel | fv3 | # Compile with CCPP - static mode, debug, 32bit dynamics @@ -53,6 +55,7 @@ RUN | fv3_ccpp_gsd RUN | fv3_ccpp_gsd_coldstart | standard | | | RUN | fv3_ccpp_gsd_warmstart | standard | | | RUN | fv3_ccpp_gsd_noah | standard | | | +RUN | fv3_ccpp_gsd_mynnsfc | standard | | | RUN | fv3_ccpp_thompson | standard | | | RUN | fv3_ccpp_gf | standard | | | RUN | fv3_ccpp_mynn | standard | | | diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc b/tests/tests/fv3_ccpp_gsd_mynnsfc new file mode 100644 index 0000000000..189b2b2282 --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_mynnsfc @@ -0,0 +1,128 @@ +############################################################################### +# +# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM + MYNN SFC) full (0-48h) test +# +############################################################################### + +export TEST_DESCR="Compare FV3 CCPP GSD + MYNN SFC results with previous trunk version" + +export CNTL_DIR=fv3_gsd_mynnsfc + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf024.tile1.nc \ + phyf024.tile2.nc \ + phyf024.tile3.nc \ + phyf024.tile4.nc \ + phyf024.tile5.nc \ + phyf024.tile6.nc \ + phyf027.tile1.nc \ + phyf027.tile2.nc \ + phyf027.tile3.nc \ + phyf027.tile4.nc \ + phyf027.tile5.nc \ + phyf027.tile6.nc \ + phyf048.tile1.nc \ + phyf048.tile2.nc \ + phyf048.tile3.nc \ + phyf048.tile4.nc \ + phyf048.tile5.nc \ + phyf048.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf024.tile1.nc \ + dynf024.tile2.nc \ + dynf024.tile3.nc \ + dynf024.tile4.nc \ + dynf024.tile5.nc \ + dynf024.tile6.nc \ + dynf027.tile1.nc \ + dynf027.tile2.nc \ + dynf027.tile3.nc \ + dynf027.tile4.nc \ + dynf027.tile5.nc \ + dynf027.tile6.nc \ + dynf048.tile1.nc \ + dynf048.tile2.nc \ + dynf048.tile3.nc \ + dynf048.tile4.nc \ + dynf048.tile5.nc \ + dynf048.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export FHMAX=48 +export FDIAG=3 + +export DT_ATMOS="600" +export IMP_PHYSICS=8 +export DNATS=0 +export DO_SAT_ADJ=.F. +export LRADAR=.T. +export LTAEROSOL=.T. + +export FV3_RUN=ccpp_gsd_run.IN +export CCPP_SUITE=FV3_GSD_v0 +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd.nml.IN + +export HYBEDMF=.F. +export DO_MYNNEDMF=.T. +export DO_MYNNSFCLAY=.T. +export IMFSHALCNV=3 +export IMFDEEPCNV=3 +export FHCYC=0 +export LSM=3 +export LSOIL_LSM=9 + +RUN_SCRIPT=rt_fv3.sh + +export WLCLK=30 + diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug new file mode 100644 index 0000000000..212dcd24e4 --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug @@ -0,0 +1,103 @@ +########################################################################################## +# +# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM + MYNN SFC) 24h test in DEBUG mode +# +########################################################################################## + +export TEST_DESCR="Compare FV3 CCPP GSD + MYNN SFC DEBUG results with previous trunk version" + +export CNTL_DIR=fv3_gsd_mynnsfc_debug + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf024.tile1.nc \ + phyf024.tile2.nc \ + phyf024.tile3.nc \ + phyf024.tile4.nc \ + phyf024.tile5.nc \ + phyf024.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf024.tile1.nc \ + dynf024.tile2.nc \ + dynf024.tile3.nc \ + dynf024.tile4.nc \ + dynf024.tile5.nc \ + dynf024.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export FHMAX=24 +export FDIAG=3 + +export DT_ATMOS="600" +export IMP_PHYSICS=8 +export DNATS=0 +export DO_SAT_ADJ=.F. +export LRADAR=.T. +export LTAEROSOL=.T. + +export FV3_RUN=ccpp_gsd_run.IN +export CCPP_SUITE=FV3_GSD_v0 +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd.nml.IN + +export HYBEDMF=.F. +export DO_MYNNEDMF=.T. +export DO_MYNNSFCLAY=.T. +export IMFSHALCNV=3 +export IMFDEEPCNV=3 +export FHCYC=0 +export LSM=3 +export LSOIL_LSM=9 + +RUN_SCRIPT=rt_fv3.sh + +export WLCLK=30 From b138db0ca8004df1026488a0d864a87a3f3f1925 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 23 Mar 2020 16:53:38 -0600 Subject: [PATCH 3/9] Correct name of suite in MYNN SFCLAY regression tests --- FV3 | 2 +- tests/tests/fv3_ccpp_gsd_mynnsfc | 2 +- tests/tests/fv3_ccpp_gsd_mynnsfc_debug | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FV3 b/FV3 index 001d24f1e8..859cdd23fe 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 001d24f1e83588f469e2bf9449c57ca579d7a338 +Subproject commit 859cdd23fe222b72698d3a98429ebddb99eafb9a diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc b/tests/tests/fv3_ccpp_gsd_mynnsfc index 189b2b2282..f3cb4d0103 100644 --- a/tests/tests/fv3_ccpp_gsd_mynnsfc +++ b/tests/tests/fv3_ccpp_gsd_mynnsfc @@ -109,7 +109,7 @@ export LRADAR=.T. export LTAEROSOL=.T. export FV3_RUN=ccpp_gsd_run.IN -export CCPP_SUITE=FV3_GSD_v0 +export CCPP_SUITE=FV3_GSD_v0_mynnsfc export CCPP_LIB_DIR=ccpp/lib export INPUT_NML=ccpp_gsd.nml.IN diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug index 212dcd24e4..03e1da2bc1 100644 --- a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug +++ b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug @@ -85,7 +85,7 @@ export LRADAR=.T. export LTAEROSOL=.T. export FV3_RUN=ccpp_gsd_run.IN -export CCPP_SUITE=FV3_GSD_v0 +export CCPP_SUITE=FV3_GSD_v0_mynnsfc export CCPP_LIB_DIR=ccpp/lib export INPUT_NML=ccpp_gsd.nml.IN From 3bfe7c961c97020af8544bd0ff2bdae7cb16a4c7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 26 Mar 2020 13:08:35 -0600 Subject: [PATCH 4/9] Temporary regression test config rt_ccpp_gsd_mynnsfclayonly.conf --- FV3 | 2 +- tests/rt_ccpp_gsd_mynnsfclayonly.conf | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tests/rt_ccpp_gsd_mynnsfclayonly.conf diff --git a/FV3 b/FV3 index 859cdd23fe..58670cc109 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 859cdd23fe222b72698d3a98429ebddb99eafb9a +Subproject commit 58670cc109c4fc8fabfe0e4a99bd4a479473d5f3 diff --git a/tests/rt_ccpp_gsd_mynnsfclayonly.conf b/tests/rt_ccpp_gsd_mynnsfclayonly.conf new file mode 100644 index 0000000000..6d103cf88e --- /dev/null +++ b/tests/rt_ccpp_gsd_mynnsfclayonly.conf @@ -0,0 +1,25 @@ +############################################################################################################################################################################# +# CCPP STATIC tests # +############################################################################################################################################################################# +# Compile with CCPP - static mode +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | hera.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | cheyenne.gnu | fv3 | +# Run tests +RUN | fv3_ccpp_gsd_mynnsfc | standard | | fv3 | +# Compile with CCPP - static mode, debug +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | hera.intel | fv3 | +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 | +# Run tests +RUN | fv3_ccpp_gsd_mynnsfc_debug | standard | | fv3 | + +############################################################################################################################################################################# +# CCPP DYNAMIC tests # +############################################################################################################################################################################# +# Compile with CCPP - dynamic mode +COMPILE | CCPP=Y REPRO=Y | standard | hera.intel | | +COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.intel | | +COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.gnu | | +# Run tests +RUN | fv3_ccpp_gsd_mynnsfc | standard | | | From ec8a71c1ddbdaaa34d01bd0e4ff1667c1f645aca Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 1 Apr 2020 15:27:59 -0600 Subject: [PATCH 5/9] Add regression tests for GSD + NOAH LSM + MYNN SFC, shorten debug regression tests --- FV3 | 2 +- tests/rt_ccpp_gsd.conf | 19 ++- tests/rt_ccpp_gsd_mynnsfclayonly.conf | 25 ---- tests/tests/fv3_ccpp_gsd_debug | 26 ++-- tests/tests/fv3_ccpp_gsd_mynnsfc_debug | 26 ++-- tests/tests/fv3_ccpp_gsd_noah_mynnsfc | 125 ++++++++++++++++++++ tests/tests/fv3_ccpp_gsd_noah_mynnsfc_debug | 100 ++++++++++++++++ tests/tests/fv3_ccpp_gsd_sar_25km_debug | 7 +- 8 files changed, 270 insertions(+), 60 deletions(-) delete mode 100644 tests/rt_ccpp_gsd_mynnsfclayonly.conf create mode 100644 tests/tests/fv3_ccpp_gsd_noah_mynnsfc create mode 100644 tests/tests/fv3_ccpp_gsd_noah_mynnsfc_debug diff --git a/FV3 b/FV3 index 58670cc109..c6e032ebab 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 58670cc109c4fc8fabfe0e4a99bd4a479473d5f3 +Subproject commit c6e032ebab239398906df2f56a45b05515d4f54b diff --git a/tests/rt_ccpp_gsd.conf b/tests/rt_ccpp_gsd.conf index 26d038d311..ea5ab94cd2 100644 --- a/tests/rt_ccpp_gsd.conf +++ b/tests/rt_ccpp_gsd.conf @@ -2,9 +2,9 @@ # CCPP STATIC tests # ############################################################################################################################################################################# # Compile with CCPP - static mode -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | hera.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | cheyenne.gnu | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | hera.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.gnu | fv3 | # Run tests RUN | fv3_ccpp_thompson_mynn | standard | | fv3 | RUN | fv3_ccpp_gf_thompson | standard | | fv3 | @@ -12,7 +12,13 @@ RUN | fv3_ccpp_gsd RUN | fv3_ccpp_gsd_coldstart | standard | | | RUN | fv3_ccpp_gsd_warmstart | standard | | | RUN | fv3_ccpp_gsd_noah | standard | | fv3 | +# Compile with CCPP - static mode +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | hera.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.gnu | fv3 | +# Run tests RUN | fv3_ccpp_gsd_mynnsfc | standard | | fv3 | +RUN | fv3_ccpp_gsd_noah_mynnsfc | standard | | fv3 | # Compile with CCPP - static mode COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | hera.intel | fv3 | COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | cheyenne.intel | fv3 | @@ -26,12 +32,13 @@ RUN | fv3_ccpp_mynn RUN | fv3_ccpp_gsd_drag_suite | standard | | fv3 | RUN | fv3_ccpp_gsd_sar | standard | | fv3 | # Compile with CCPP - static mode, debug -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | hera.intel | fv3 | -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 | +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | hera.intel | fv3 | +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 | +COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 | # Run tests RUN | fv3_ccpp_gsd_debug | standard | | fv3 | RUN | fv3_ccpp_gsd_mynnsfc_debug | standard | | fv3 | +RUN | fv3_ccpp_gsd_noah_mynnsfc_debug | standard | | fv3 | # Non-aerosol field_table staged only on hera for the moment RUN | fv3_ccpp_thompson_no_aero_debug | standard | hera.intel | fv3 | # Compile with CCPP - static mode, debug, 32bit dynamics diff --git a/tests/rt_ccpp_gsd_mynnsfclayonly.conf b/tests/rt_ccpp_gsd_mynnsfclayonly.conf deleted file mode 100644 index 6d103cf88e..0000000000 --- a/tests/rt_ccpp_gsd_mynnsfclayonly.conf +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################################################################################################################# -# CCPP STATIC tests # -############################################################################################################################################################################# -# Compile with CCPP - static mode -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | hera.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_v0_mynnsfc | standard | cheyenne.gnu | fv3 | -# Run tests -RUN | fv3_ccpp_gsd_mynnsfc | standard | | fv3 | -# Compile with CCPP - static mode, debug -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | hera.intel | fv3 | -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 | -# Run tests -RUN | fv3_ccpp_gsd_mynnsfc_debug | standard | | fv3 | - -############################################################################################################################################################################# -# CCPP DYNAMIC tests # -############################################################################################################################################################################# -# Compile with CCPP - dynamic mode -COMPILE | CCPP=Y REPRO=Y | standard | hera.intel | | -COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.intel | | -COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.gnu | | -# Run tests -RUN | fv3_ccpp_gsd_mynnsfc | standard | | | diff --git a/tests/tests/fv3_ccpp_gsd_debug b/tests/tests/fv3_ccpp_gsd_debug index 995b35698b..67f83ba6d4 100644 --- a/tests/tests/fv3_ccpp_gsd_debug +++ b/tests/tests/fv3_ccpp_gsd_debug @@ -20,24 +20,24 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ phyf000.tile4.nc \ phyf000.tile5.nc \ phyf000.tile6.nc \ - phyf024.tile1.nc \ - phyf024.tile2.nc \ - phyf024.tile3.nc \ - phyf024.tile4.nc \ - phyf024.tile5.nc \ - phyf024.tile6.nc \ + phyf006.tile1.nc \ + phyf006.tile2.nc \ + phyf006.tile3.nc \ + phyf006.tile4.nc \ + phyf006.tile5.nc \ + phyf006.tile6.nc \ dynf000.tile1.nc \ dynf000.tile2.nc \ dynf000.tile3.nc \ dynf000.tile4.nc \ dynf000.tile5.nc \ dynf000.tile6.nc \ - dynf024.tile1.nc \ - dynf024.tile2.nc \ - dynf024.tile3.nc \ - dynf024.tile4.nc \ - dynf024.tile5.nc \ - dynf024.tile6.nc \ + dynf006.tile1.nc \ + dynf006.tile2.nc \ + dynf006.tile3.nc \ + dynf006.tile4.nc \ + dynf006.tile5.nc \ + dynf006.tile6.nc \ RESTART/coupler.res \ RESTART/fv_core.res.nc \ RESTART/fv_core.res.tile1.nc \ @@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ export_fv3 export NODES=$(expr $TASKS / $TPN + 1) -export FHMAX=24 +export FHMAX=6 export FDIAG=3 export DT_ATMOS="600" diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug index 03e1da2bc1..4f1f3e9e2c 100644 --- a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug +++ b/tests/tests/fv3_ccpp_gsd_mynnsfc_debug @@ -20,24 +20,24 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ phyf000.tile4.nc \ phyf000.tile5.nc \ phyf000.tile6.nc \ - phyf024.tile1.nc \ - phyf024.tile2.nc \ - phyf024.tile3.nc \ - phyf024.tile4.nc \ - phyf024.tile5.nc \ - phyf024.tile6.nc \ + phyf006.tile1.nc \ + phyf006.tile2.nc \ + phyf006.tile3.nc \ + phyf006.tile4.nc \ + phyf006.tile5.nc \ + phyf006.tile6.nc \ dynf000.tile1.nc \ dynf000.tile2.nc \ dynf000.tile3.nc \ dynf000.tile4.nc \ dynf000.tile5.nc \ dynf000.tile6.nc \ - dynf024.tile1.nc \ - dynf024.tile2.nc \ - dynf024.tile3.nc \ - dynf024.tile4.nc \ - dynf024.tile5.nc \ - dynf024.tile6.nc \ + dynf006.tile1.nc \ + dynf006.tile2.nc \ + dynf006.tile3.nc \ + dynf006.tile4.nc \ + dynf006.tile5.nc \ + dynf006.tile6.nc \ RESTART/coupler.res \ RESTART/fv_core.res.nc \ RESTART/fv_core.res.tile1.nc \ @@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \ export_fv3 export NODES=$(expr $TASKS / $TPN + 1) -export FHMAX=24 +export FHMAX=6 export FDIAG=3 export DT_ATMOS="600" diff --git a/tests/tests/fv3_ccpp_gsd_noah_mynnsfc b/tests/tests/fv3_ccpp_gsd_noah_mynnsfc new file mode 100644 index 0000000000..513ada1dc9 --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_noah_mynnsfc @@ -0,0 +1,125 @@ +############################################################################### +# +# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + NOAH LSM + MYNN SFC) full (0-48h) test +# +############################################################################### + +export TEST_DESCR="Compare FV3 CCPP GSD + NOAH LSM + MYNN SFC results with previous trunk version" + +export CNTL_DIR=fv3_gsd_noah_mynnsfc + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf024.tile1.nc \ + phyf024.tile2.nc \ + phyf024.tile3.nc \ + phyf024.tile4.nc \ + phyf024.tile5.nc \ + phyf024.tile6.nc \ + phyf027.tile1.nc \ + phyf027.tile2.nc \ + phyf027.tile3.nc \ + phyf027.tile4.nc \ + phyf027.tile5.nc \ + phyf027.tile6.nc \ + phyf048.tile1.nc \ + phyf048.tile2.nc \ + phyf048.tile3.nc \ + phyf048.tile4.nc \ + phyf048.tile5.nc \ + phyf048.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf024.tile1.nc \ + dynf024.tile2.nc \ + dynf024.tile3.nc \ + dynf024.tile4.nc \ + dynf024.tile5.nc \ + dynf024.tile6.nc \ + dynf027.tile1.nc \ + dynf027.tile2.nc \ + dynf027.tile3.nc \ + dynf027.tile4.nc \ + dynf027.tile5.nc \ + dynf027.tile6.nc \ + dynf048.tile1.nc \ + dynf048.tile2.nc \ + dynf048.tile3.nc \ + dynf048.tile4.nc \ + dynf048.tile5.nc \ + dynf048.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export FHMAX=48 +export FDIAG=3 + +export DT_ATMOS="600" +export IMP_PHYSICS=8 +export DNATS=0 +export DO_SAT_ADJ=.F. +export LRADAR=.T. +export LTAEROSOL=.T. + +export FV3_RUN=ccpp_gsd_run.IN +export CCPP_SUITE=FV3_GSD_noah_mynnsfc +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd.nml.IN + +export HYBEDMF=.F. +export DO_MYNNEDMF=.T. +export DO_MYNNSFCLAY=.T. +export IMFSHALCNV=3 +export IMFDEEPCNV=3 + +RUN_SCRIPT=rt_fv3.sh + +export WLCLK=30 + diff --git a/tests/tests/fv3_ccpp_gsd_noah_mynnsfc_debug b/tests/tests/fv3_ccpp_gsd_noah_mynnsfc_debug new file mode 100644 index 0000000000..e5a4b3cb13 --- /dev/null +++ b/tests/tests/fv3_ccpp_gsd_noah_mynnsfc_debug @@ -0,0 +1,100 @@ +########################################################################################## +# +# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + NOAH LSM + MYNN SFC) 24h test in DEBUG mode +# +########################################################################################## + +export TEST_DESCR="Compare FV3 CCPP GSD + NOAH LSM + MYNN SFC DEBUG results with previous trunk version" + +export CNTL_DIR=fv3_gsd_noah_mynnsfc_debug + +export LIST_FILES="atmos_4xdaily.tile1.nc \ + atmos_4xdaily.tile2.nc \ + atmos_4xdaily.tile3.nc \ + atmos_4xdaily.tile4.nc \ + atmos_4xdaily.tile5.nc \ + atmos_4xdaily.tile6.nc \ + phyf000.tile1.nc \ + phyf000.tile2.nc \ + phyf000.tile3.nc \ + phyf000.tile4.nc \ + phyf000.tile5.nc \ + phyf000.tile6.nc \ + phyf006.tile1.nc \ + phyf006.tile2.nc \ + phyf006.tile3.nc \ + phyf006.tile4.nc \ + phyf006.tile5.nc \ + phyf006.tile6.nc \ + dynf000.tile1.nc \ + dynf000.tile2.nc \ + dynf000.tile3.nc \ + dynf000.tile4.nc \ + dynf000.tile5.nc \ + dynf000.tile6.nc \ + dynf006.tile1.nc \ + dynf006.tile2.nc \ + dynf006.tile3.nc \ + dynf006.tile4.nc \ + dynf006.tile5.nc \ + dynf006.tile6.nc \ + RESTART/coupler.res \ + RESTART/fv_core.res.nc \ + RESTART/fv_core.res.tile1.nc \ + RESTART/fv_core.res.tile2.nc \ + RESTART/fv_core.res.tile3.nc \ + RESTART/fv_core.res.tile4.nc \ + RESTART/fv_core.res.tile5.nc \ + RESTART/fv_core.res.tile6.nc \ + RESTART/fv_srf_wnd.res.tile1.nc \ + RESTART/fv_srf_wnd.res.tile2.nc \ + RESTART/fv_srf_wnd.res.tile3.nc \ + RESTART/fv_srf_wnd.res.tile4.nc \ + RESTART/fv_srf_wnd.res.tile5.nc \ + RESTART/fv_srf_wnd.res.tile6.nc \ + RESTART/fv_tracer.res.tile1.nc \ + RESTART/fv_tracer.res.tile2.nc \ + RESTART/fv_tracer.res.tile3.nc \ + RESTART/fv_tracer.res.tile4.nc \ + RESTART/fv_tracer.res.tile5.nc \ + RESTART/fv_tracer.res.tile6.nc \ + RESTART/phy_data.tile1.nc \ + RESTART/phy_data.tile2.nc \ + RESTART/phy_data.tile3.nc \ + RESTART/phy_data.tile4.nc \ + RESTART/phy_data.tile5.nc \ + RESTART/phy_data.tile6.nc \ + RESTART/sfc_data.tile1.nc \ + RESTART/sfc_data.tile2.nc \ + RESTART/sfc_data.tile3.nc \ + RESTART/sfc_data.tile4.nc \ + RESTART/sfc_data.tile5.nc \ + RESTART/sfc_data.tile6.nc" + +export_fv3 +export NODES=$(expr $TASKS / $TPN + 1) + +export FHMAX=6 +export FDIAG=3 + +export DT_ATMOS="600" +export IMP_PHYSICS=8 +export DNATS=0 +export DO_SAT_ADJ=.F. +export LRADAR=.T. +export LTAEROSOL=.T. + +export FV3_RUN=ccpp_gsd_run.IN +export CCPP_SUITE=FV3_GSD_noah_mynnsfc +export CCPP_LIB_DIR=ccpp/lib +export INPUT_NML=ccpp_gsd.nml.IN + +export HYBEDMF=.F. +export DO_MYNNEDMF=.T. +export DO_MYNNSFCLAY=.T. +export IMFSHALCNV=3 +export IMFDEEPCNV=3 + +RUN_SCRIPT=rt_fv3.sh + +export WLCLK=30 diff --git a/tests/tests/fv3_ccpp_gsd_sar_25km_debug b/tests/tests/fv3_ccpp_gsd_sar_25km_debug index 8edcdab4f8..891f9f088f 100644 --- a/tests/tests/fv3_ccpp_gsd_sar_25km_debug +++ b/tests/tests/fv3_ccpp_gsd_sar_25km_debug @@ -9,9 +9,9 @@ export TEST_DESCR="Compare FV3 CCPP GSD SAR results with previous trunk version" export CNTL_DIR=fv3_gsd_sar_25km_debug export LIST_FILES="dynf000.nc \ - dynf001.nc \ + dynf003.nc \ phyf000.nc \ - phyf001.nc \ + phyf003.nc \ RESTART/coupler.res \ RESTART/fv_core.res.nc \ RESTART/fv_core.res.tile1.nc \ @@ -20,6 +20,9 @@ export LIST_FILES="dynf000.nc \ RESTART/phy_data.nc \ RESTART/sfc_data.nc" +export FHMAX=3 +export FDIAG=3 + export_fv3 export TASKS=24 export NODES=$(expr $TASKS / $TPN + 1) From c60b1b76d51981c0f9c446f1f2a720a1beed24e9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 1 Apr 2020 19:50:42 -0600 Subject: [PATCH 6/9] Remove dynamic CCPP tests --- tests/rt_ccpp_gsd.conf | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/tests/rt_ccpp_gsd.conf b/tests/rt_ccpp_gsd.conf index ea5ab94cd2..2fb66a09ee 100644 --- a/tests/rt_ccpp_gsd.conf +++ b/tests/rt_ccpp_gsd.conf @@ -47,30 +47,3 @@ COMPILE | 32BIT=Y CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_SAR COMPILE | 32BIT=Y CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_SAR | standard | cheyenne.gnu | fv3 | # Run tests RUN | fv3_ccpp_gsd_sar_25km_debug | standard | | fv3 | - -############################################################################################################################################################################# -# CCPP DYNAMIC tests # -############################################################################################################################################################################# -# Compile with CCPP - dynamic mode -COMPILE | CCPP=Y REPRO=Y | standard | hera.intel | | -COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.intel | | -COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.gnu | | -# Run tests -RUN | fv3_ccpp_thompson_mynn | standard | | | -RUN | fv3_ccpp_gf_thompson | standard | | | -RUN | fv3_ccpp_gsd | standard | | | -RUN | fv3_ccpp_gsd_coldstart | standard | | | -RUN | fv3_ccpp_gsd_warmstart | standard | | | -RUN | fv3_ccpp_gsd_noah | standard | | | -RUN | fv3_ccpp_gsd_mynnsfc | standard | | | -RUN | fv3_ccpp_thompson | standard | | | -RUN | fv3_ccpp_gf | standard | | | -RUN | fv3_ccpp_mynn | standard | | | -RUN | fv3_ccpp_gsd_drag_suite | standard | | | -RUN | fv3_ccpp_gsd_sar | standard | | | -# Do not run debug tests in dynamic mode, these time out because of excessive log statements -## Compile with CCPP - dynamic mode, debug -#COMPILE | CCPP=Y DEBUG=Y | standard | hera.intel | fv3 | -#COMPILE | CCPP=Y DEBUG=Y | standard | cheyenne.intel | fv3 | -#COMPILE | CCPP=Y DEBUG=Y | standard | cheyenne.gnu | fv3 | -#RUN | fv3_ccpp_gsd_debug | standard | | | From cedc34a06e787f9cb7dcd70f54f01dca0c8905c7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 2 Apr 2020 14:31:58 -0600 Subject: [PATCH 7/9] Revert increase of forecast hours from 1 to 3 for fv3_ccpp_gsd_sar_25km_debug test --- tests/tests/fv3_ccpp_gsd_sar_25km_debug | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/tests/fv3_ccpp_gsd_sar_25km_debug b/tests/tests/fv3_ccpp_gsd_sar_25km_debug index 891f9f088f..15dd738051 100644 --- a/tests/tests/fv3_ccpp_gsd_sar_25km_debug +++ b/tests/tests/fv3_ccpp_gsd_sar_25km_debug @@ -9,9 +9,9 @@ export TEST_DESCR="Compare FV3 CCPP GSD SAR results with previous trunk version" export CNTL_DIR=fv3_gsd_sar_25km_debug export LIST_FILES="dynf000.nc \ - dynf003.nc \ + dynf001.nc \ phyf000.nc \ - phyf003.nc \ + phyf001.nc \ RESTART/coupler.res \ RESTART/fv_core.res.nc \ RESTART/fv_core.res.tile1.nc \ @@ -20,8 +20,8 @@ export LIST_FILES="dynf000.nc \ RESTART/phy_data.nc \ RESTART/sfc_data.nc" -export FHMAX=3 -export FDIAG=3 +export FHMAX=1 +export FDIAG=1 export_fv3 export TASKS=24 From 2a3996d8048fa2fca516bd98a993cbded5f7167d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 3 Apr 2020 10:27:50 -0600 Subject: [PATCH 8/9] Add dependency of fv3_ccpp_gsd_warmstart test on fv3_ccpp_gsd_coldstart for rocoto/ecflow --- tests/rt_ccpp_gsd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rt_ccpp_gsd.conf b/tests/rt_ccpp_gsd.conf index 2fb66a09ee..6631908938 100644 --- a/tests/rt_ccpp_gsd.conf +++ b/tests/rt_ccpp_gsd.conf @@ -10,7 +10,7 @@ RUN | fv3_ccpp_thompson_mynn RUN | fv3_ccpp_gf_thompson | standard | | fv3 | RUN | fv3_ccpp_gsd | standard | | fv3 | RUN | fv3_ccpp_gsd_coldstart | standard | | | -RUN | fv3_ccpp_gsd_warmstart | standard | | | +RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart RUN | fv3_ccpp_gsd_noah | standard | | fv3 | # Compile with CCPP - static mode COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | hera.intel | fv3 | From c1ab433b38dc377dda1f49b9fc92120f1d522aeb Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 3 Apr 2020 10:32:08 -0600 Subject: [PATCH 9/9] Revert change to .gitmodules and update submodule pointer for fv3atm --- .gitmodules | 6 ++---- FV3 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 93ac91ba7c..409c6ee5a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NOAA-GSD/fv3atm - #branch = gsd/develop - url = https://github.com/climbfuji/fv3atm - branch = mynnsfclay_from_joe_in_latest_code + url = https://github.com/NOAA-GSD/fv3atm + branch = gsd/develop [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index c6e032ebab..5b6a22d909 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit c6e032ebab239398906df2f56a45b05515d4f54b +Subproject commit 5b6a22d90953ea7cbd76c205711dcb18d9f59a49