Update regression tests from GFSv15+Thompson to GFSv16+Thompson, incl…

…ude "Add one regional regression test in DEBUG mode. (#419)" (#421) * Add one regional regression test in DEBUG mode. * Update .gitmodules and submodule pointer for fv3atm for code review and testing * Update regression tests from GFSv15+Thompson to GFSv16+Thompson * Combine several COMPILE lines in tests/rt.conf and tests/rt_gnu.conf * Regression test log for cheyenne.{gnu,intel},gaea.intel, hera.gnu, jet.intel,hera.intel,orion.intel;wcoss_cray and wcoss_dell_p3;
ufs-community · Feb 19, 2021 · 250c2c5 · 250c2c5
1 parent 8dabdb4
commit 250c2c5
Show file tree

Hide file tree

Showing 22 changed files with 3,442 additions and 2,724 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -343,6 +343,8 @@ export NA_INIT=1
 # Radiation
 export DO_RRTMGP=.F.
 export ICLOUD=0
+export IAER=111
+export ICLIQ_SW=1
 export IOVR=1
 
 # Microphysics

diff --git a/tests/fv3_conf/ccpp_gsd_run.IN b/tests/fv3_conf/ccpp_gsd_run.IN
@@ -39,8 +39,7 @@ if [ $IMP_PHYSICS = 8 ]; then
     fi
   else
     if [ $DO_MYNNEDMF = .T. ] || [ $SATMEDMF = .T. ]; then
-      echo "ERROR, no field table configured for Thompson MP without aerosols but with MYNN or SATMEDMF (need TKE)"
-      exit 1
+      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero_tke field_table
     else
       cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero field_table
     fi

diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN
@@ -134,7 +134,9 @@
        fhlwr          = 3600.
        ialb           = 1
        iems           = 1
-       iaer           = 111
+       iaer           = @[IAER]
+       icliq_sw       = @[ICLIQ_SW]
+       iovr           = @[IOVR]
        ico2           = 2
        isubc_sw       = 2
        isubc_lw       = 2
@@ -147,7 +149,8 @@
        redrag         = .true.
        dspheat        = .true.
        hybedmf        = @[HYBEDMF]
-       satmedmf       = .false.
+       satmedmf       = @[SATMEDMF]
+       isatmedmf      = 1
        lheatstrg      = @[LHEATSTRG]
        do_mynnedmf    = @[DO_MYNNEDMF]
        do_mynnsfclay  = @[DO_MYNNSFCLAY]
@@ -194,7 +197,10 @@
        bl_mynn_tkeadvect = .true.
        bl_mynn_edmf      = 1
        bl_mynn_edmf_mom  = 1
-       gwd_opt        = @[GWD_OPT]
+       gwd_opt              = @[GWD_OPT]
+       ldiag_ugwp           = @[LDIAG_UGWP]
+       do_ugwp              = @[DO_UGWP]
+       do_tofd              = @[DO_TOFD]
        do_ugwp_v0           = @[DO_UGWP_V0]
        do_ugwp_v0_orog_only = @[DO_UGWP_V0_OROG_ONLY]
        do_gsl_drag_ls_bl    = @[DO_GSL_DRAG_LS_BL]
@@ -300,27 +306,28 @@
        FSICS    = 99999,
 /
 &nam_stochy
-  lon_s=768,
-  lat_s=384,
-  ntrunc=382,
   SKEBNORM=1,
   SKEB_NPASS=30,
   SKEB_VDOF=5,
   SKEB=@[SKEB],
   SKEB_TAU=2.16E4,
   SKEB_LSCALE=1000.E3,
+  SKEBINT=1800,
   SHUM=@[SHUM],
   SHUM_TAU=21600,
   SHUM_LSCALE=500000,
+  SHUMINT=3600,
   SPPT=@[SPPT],
   SPPT_TAU=21600,
   SPPT_LSCALE=500000,
   SPPT_LOGIT=.TRUE.,
   SPPT_SFCLIMIT=.TRUE.,
+  SPPTINT=1800,
   ISEED_SHUM=1,
   ISEED_SKEB=2,
   ISEED_SPPT=3,
 /
+
 &nam_sfcperts
   lndp_type      = @[LNDP_TYPE]
   LNDP_TAU=21600,
@@ -344,3 +351,4 @@
        knob_ugwp_version = 0
        launch_level      = 25
 /
+
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -47,10 +47,6 @@ RUN     | fv3_ccpp_regional_quilt_netcdf_parallel
 #RUN     | fv3_ccpp_regional_c768                                                                                                 | jet.intel                               | fv3 |
 #RUN     | fv3_ccpp_regional_c768                                                                                                 | orion.intel                             | fv3 |
 
-COMPILE | SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y                                                              |                                         | fv3 |
-RUN     | fv3_ccpp_control_debug                                                                                                  |                                         | fv3 |
-RUN     | fv3_ccpp_stretched_nest_debug                                                                                           |                                         | fv3 |
-
 COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp                                                                   |                                         | fv3 |
 RUN     | fv3_ccpp_gfdlmp                                                                                                         |                                         | fv3 |
 RUN     | fv3_ccpp_gfdlmprad_gwd                                                                                                  |                                         | fv3 |
@@ -63,7 +59,7 @@ RUN     | fv3_ccpp_csawmg
 RUN     | fv3_ccpp_satmedmf                                                                                                       |                                         | fv3 |
 RUN     | fv3_ccpp_satmedmfq                                                                                                      |                                         | fv3 |
 
-COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y          |                                         | fv3 |
+COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y          |                                         | fv3 |
 RUN     | fv3_ccpp_gfdlmp_32bit                                                                                                   |                                         | fv3 |
 RUN     | fv3_ccpp_gfdlmprad_32bit_post                                                                                           |                                         | fv3 |
 RUN     | fv3_ccpp_cpt                                                                                                            |                                         | fv3 |
@@ -109,13 +105,16 @@ RUN     | fv3_ccpp_gfsv16_ugwpv1_warmstart
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
 # Note: weird bug on Cheyenne, compiling without SUITES=... works fine on the login nodes, but crashes on the compute nodes; same issues on wcoss_cray and wcoss_dell_p3
 COMPILE | DEBUG=Y                                                                                                    | - gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
-COMPILE | DEBUG=Y SUITES='FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP'                         | + gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
+COMPILE | DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP                           | + gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
 RUN     | fv3_ccpp_gfs_v15p2_debug                                                                                                |                                         | fv3 |
 RUN     | fv3_ccpp_gfs_v16_debug                                                                                                  |                                         | fv3 |
 RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                         |                                         | fv3 |
 RUN     | fv3_ccpp_gfs_v16_RRTMGP_debug                                                                                           |                                         | fv3 |
 
-COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y                                                  |                                         | fv3 |
+COMPILE | SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y |                            | fv3 |
+RUN     | fv3_ccpp_regional_control_debug                                                                                         |                                         | fv3 |
+RUN     | fv3_ccpp_control_debug                                                                                                  |                                         | fv3 |
+RUN     | fv3_ccpp_stretched_nest_debug                                                                                           |                                         | fv3 |
 RUN     | fv3_ccpp_gsd_debug                                                                                                      |                                         | fv3 |
 RUN     | fv3_ccpp_gsd_diag3d_debug                                                                                               |                                         | fv3 |
 RUN     | fv3_ccpp_thompson_debug                                                                                                 |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -415,9 +415,9 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210212/${RT_COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210217/${RT_COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210212}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210217}
 fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210212}

diff --git a/tests/rt_ccpp_dev.conf b/tests/rt_ccpp_dev.conf
@@ -20,7 +20,7 @@ COMPILE | REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc
 RUN     | fv3_ccpp_gsd_mynnsfc                                                                                              |                | fv3         |
 RUN     | fv3_ccpp_gsd_noah_mynnsfc                                                                                         |                | fv3         |
 
-COMPILE | REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR                                   |                | fv3         |
+COMPILE | REPRO=Y SUITES=FV3_GFS_v16_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR                                   |                | fv3         |
 
 RUN     | fv3_ccpp_thompson                                                                                                 |                | fv3         |
 RUN     | fv3_ccpp_thompson_no_aero                                                                                         |                | fv3         |
@@ -46,7 +46,7 @@ RUN     | fv3_ccpp_ntiedtke
 # CCPP DEBUG tests                                                                                                                                         #
 ############################################################################################################################################################
 
-COMPILE | DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson                            |                | fv3         |
+COMPILE | DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v16_thompson                            |                | fv3         |
 
 RUN     | fv3_ccpp_gsd_debug                                                                                                |                | fv3         |
 RUN     | fv3_ccpp_gsd_diag3d_debug                                                                                         |                | fv3         |

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -15,7 +15,7 @@ RUN     | fv3_ccpp_gfs_v16_flake
 RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                               |                | fv3         |
 RUN     | fv3_ccpp_gfs_v16_RRTMGP                                                                                                 |                | fv3         |
 
-COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y                                                          |                | fv3         |
+COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y                                                          |                | fv3         |
 
 RUN     | fv3_ccpp_gsd                                                                                                            |                | fv3         |
 RUN     | fv3_ccpp_thompson                                                                                                       |                | fv3         |
@@ -46,12 +46,12 @@ RUN     | fv3_ccpp_gfs_v16_RRTMGP_debug
 COMPILE | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y                                                                        |                | fv3         |
 RUN     | fv3_ccpp_multigases                                                                                                     |                | fv3         |
 
-COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y                                                  |                | fv3         |
-# FIX ME - THESE ARE ALL CRASHING ON HERA WITH GNU 9.2.0 / CHEYENNE WITH GNU 9.1.0
-#RUN     | fv3_ccpp_rrfs_v1beta_debug                                                                                              |                | fv3         |
-#RUN     | fv3_ccpp_gsd_debug                                                                                                      |                | fv3         |
-#RUN     | fv3_ccpp_thompson_debug                                                                                                 |                | fv3         |
-#RUN     | fv3_ccpp_thompson_no_aero_debug                                                                                         |                | fv3         |
+COMPILE | SUITES=FV3_GFS_v15_thompson_mynn,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y                        |                | fv3         |
+RUN     | fv3_ccpp_regional_control_debug                                                                                         |                | fv3         |
+RUN     | fv3_ccpp_rrfs_v1beta_debug                                                                                              |                | fv3         |
+RUN     | fv3_ccpp_gsd_debug                                                                                                      |                | fv3         |
+RUN     | fv3_ccpp_thompson_debug                                                                                                 |                | fv3         |
+RUN     | fv3_ccpp_thompson_no_aero_debug                                                                                         |                | fv3         |
 
 COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1 DEBUG=Y                                                   |                | fv3         |
 RUN     | fv3_ccpp_HAFS_v0_hwrf_thompson_debug                                                                                    |                | fv3         |

diff --git a/tests/tests/fv3_ccpp_regional_control_debug b/tests/tests/fv3_ccpp_regional_control_debug
@@ -0,0 +1,35 @@
+###############################################################################
+#
+#  FV3 CCPP regional control test
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 CCPP regional control results with previous trunk version"
+
+export CNTL_DIR=fv3_regional_control_debug
+
+export LIST_FILES="  atmos_4xdaily.nc \
+                     fv3_history2d.nc \
+                       fv3_history.nc \
+     RESTART/fv_core.res.tile1_new.nc \
+   RESTART/fv_tracer.res.tile1_new.nc"
+
+export_fv3
+
+export TASKS=40
+export FHMAX="01"
+
+export FV3_RUN=ccpp_regional_run.IN
+
+export OZ_PHYS_OLD=.F.
+export OZ_PHYS_NEW=.T.
+export H2O_PHYS=.T.
+export HYBEDMF=.F.
+
+export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
+export INPUT_NML=ccpp_regional.nml.IN
+
+export FDIAG=1
+export INPES=5
+export JNPES=8
+export WRITE_RESTART_WITH_BCS=.true.
diff --git a/tests/tests/fv3_ccpp_thompson b/tests/tests/fv3_ccpp_thompson
@@ -81,11 +81,19 @@ export LRADAR=.T.
 export LTAEROSOL=.T.
 
 export FV3_RUN=ccpp_gsd_run.IN
-export CCPP_SUITE=FV3_GFS_v15_thompson
+export CCPP_SUITE=FV3_GFS_v16_thompson
 export INPUT_NML=ccpp_gsd.nml.IN
 
-export HYBEDMF=.T.
+export HYBEDMF=.F.
+export SATMEDMF=.T.
 export DO_MYNNEDMF=.F.
+
 export IMFSHALCNV=2
 export IMFDEEPCNV=2
 
+export IAER=5111
+export ICLIQ_SW=2
+export IOVR=3
+
+export LHEATSTRG=.T.
+export DO_TOFD=.T.
diff --git a/tests/tests/fv3_ccpp_thompson_debug b/tests/tests/fv3_ccpp_thompson_debug
@@ -84,11 +84,19 @@ export LRADAR=.T.
 export LTAEROSOL=.T.
 
 export FV3_RUN=ccpp_gsd_run.IN
-export CCPP_SUITE=FV3_GFS_v15_thompson
+export CCPP_SUITE=FV3_GFS_v16_thompson
 export INPUT_NML=ccpp_gsd.nml.IN
 
-export HYBEDMF=.T.
+export HYBEDMF=.F.
+export SATMEDMF=.T.
 export DO_MYNNEDMF=.F.
+
 export IMFSHALCNV=2
 export IMFDEEPCNV=2
 
+export IAER=5111
+export ICLIQ_SW=2
+export IOVR=3
+
+export LHEATSTRG=.T.
+export DO_TOFD=.T.
diff --git a/tests/tests/fv3_ccpp_thompson_no_aero b/tests/tests/fv3_ccpp_thompson_no_aero
@@ -82,11 +82,19 @@ export NSRADAR_RESET=3600.0
 export LTAEROSOL=.F.
 
 export FV3_RUN=ccpp_gsd_run.IN
-export CCPP_SUITE=FV3_GFS_v15_thompson
+export CCPP_SUITE=FV3_GFS_v16_thompson
 export INPUT_NML=ccpp_gsd.nml.IN
 
-export HYBEDMF=.T.
+export HYBEDMF=.F.
+export SATMEDMF=.T.
 export DO_MYNNEDMF=.F.
+
 export IMFSHALCNV=2
 export IMFDEEPCNV=2
 
+export IAER=5111
+export ICLIQ_SW=2
+export IOVR=3
+
+export LHEATSTRG=.T.
+export DO_TOFD=.T.
diff --git a/tests/tests/fv3_ccpp_thompson_no_aero_debug b/tests/tests/fv3_ccpp_thompson_no_aero_debug
@@ -85,11 +85,19 @@ export NSRADAR_RESET=3600.0
 export LTAEROSOL=.F.
 
 export FV3_RUN=ccpp_gsd_run.IN
-export CCPP_SUITE=FV3_GFS_v15_thompson
+export CCPP_SUITE=FV3_GFS_v16_thompson
 export INPUT_NML=ccpp_gsd.nml.IN
 
-export HYBEDMF=.T.
+export HYBEDMF=.F.
+export SATMEDMF=.T.
 export DO_MYNNEDMF=.F.
+
 export IMFSHALCNV=2
 export IMFDEEPCNV=2
 
+export IAER=5111
+export ICLIQ_SW=2
+export IOVR=3
+
+export LHEATSTRG=.T.
+export DO_TOFD=.T.
+1 −1		ccpp/physics
+91 −0		ccpp/suites/suite_FV3_GFS_v16_thompson.xml