Updated settings for NoahMP, Thompson and RRTMGP in RTs (ufs-communit…

…y#1196) * add NoahMP opt_trs to namelist * Updated namelist settings related to NoahMP scheme, Thompson scheme and RRTMGP (issue ufs-community#1173 and ufs-community#1185) * Updated some namelist settings and add/remove some RTs related to RRTMGP
NOAA-GSL · SamuelTrahanNOAA · Jun 27, 2022 · Dec 16, 2021 · Dec 17, 2021 · Dec 20, 2021
commit 0ee3448609bac7da3fa2ec57292103eabbda6835
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_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
@@ -856,8 +856,8 @@ export EFFR_IN=.false.
 export LRADAR=.true.
 export LTAEROSOL=.true.
 export EXT_DIAG_THOMPSON=.false.
-export sedi_semi=.false.
-export decfl=8
+export SEDI_SEMI=.true.
+export DECFL=10
 # NSSL MP
 export NSSL_CCCN=0.6e9
 export NSSL_ALPHAH=0.0
@@ -1158,6 +1158,7 @@ export IOPT_ALB=1
 export IOPT_STC=3
 # P8
 export IOPT_SFC=3
+export IOPT_TRS=2
 
 # FV3 P7 settings
 export D2_BG_K1=0.20
@@ -1190,7 +1191,7 @@ export LDIAG_UGWP=.false.
 export CDMBWD=${CDMBWD_c96}
 
 # P8 RRTMGP
-export DO_RRTMGP=.true.
+export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true
 export DOGP_SGS_CNV=.true.

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -164,6 +164,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 1
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN
@@ -162,6 +162,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 1
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/control_csawmg.nml.IN b/tests/parm/control_csawmg.nml.IN
@@ -158,6 +158,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 1
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/control_flake.nml.IN b/tests/parm/control_flake.nml.IN
@@ -160,6 +160,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 1
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/control_gdas.nml.IN b/tests/parm/control_gdas.nml.IN
@@ -182,6 +182,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 1
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/control_noahmp.nml.IN b/tests/parm/control_noahmp.nml.IN
@@ -160,6 +160,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 3
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/control_thompson.nml.IN b/tests/parm/control_thompson.nml.IN
@@ -116,8 +116,8 @@ deflate_level=1
   ltaerosol    = @[LTAEROSOL]
   lradar       = @[LRADAR]
   ttendlim     = 0.004
-  sedi_semi    = @[sedi_semi]
-  decfl        = @[decfl]
+  sedi_semi    = @[SEDI_SEMI]
+  decfl        = @[DECFL]
   ext_diag_thompson = @[EXT_DIAG_THOMPSON]
   pdfcld       = .false.
   fhswr        = 3600.
@@ -167,6 +167,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 1
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/control_ugwpv1.nml.IN b/tests/parm/control_ugwpv1.nml.IN
@@ -160,6 +160,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 1
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/cpld_control.nml.IN
@@ -124,6 +124,8 @@ deflate_level=1
   lradar       = .false.
   ttendlim     = -999
   dt_inner     = @[DT_INNER]
+  sedi_semi    = @[SEDI_SEMI]
+  decfl        = @[DECFL]
   oz_phys      = .false.
   oz_phys_2015 = .true.
   lsoil_lsm    = 4
@@ -187,6 +189,7 @@ deflate_level=1
   iopt_btr     = 1
   iopt_run     = 1
   iopt_sfc     = @[IOPT_SFC]
+  iopt_trs     = @[IOPT_TRS]
   iopt_frz     = 1
   iopt_inf     = 1
   iopt_rad     = @[IOPT_RAD]

diff --git a/tests/parm/cpt.nml.IN b/tests/parm/cpt.nml.IN
@@ -167,6 +167,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs     = 2
        oz_phys        = .false.
        oz_phys_2015   = .true.
        debug          = .false.

diff --git a/tests/parm/csawmg3shoc127.nml.IN b/tests/parm/csawmg3shoc127.nml.IN
@@ -168,6 +168,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
 
        ras            = .false.

diff --git a/tests/parm/csawmgshoc.nml.IN b/tests/parm/csawmgshoc.nml.IN
@@ -167,6 +167,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
 
        ras            = .false.

diff --git a/tests/parm/input_global_hafs.nml.IN b/tests/parm/input_global_hafs.nml.IN
@@ -212,6 +212,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        oz_phys        = .false.
        oz_phys_2015   = .true.

diff --git a/tests/parm/input_nest02.nml.IN b/tests/parm/input_nest02.nml.IN
@@ -159,6 +159,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        nstf_name      = @[NSTF_NAME]
        xkzminv        = 0.3

diff --git a/tests/parm/input_nest_hafs.nml.IN b/tests/parm/input_nest_hafs.nml.IN
@@ -192,6 +192,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        oz_phys        = .false.
        oz_phys_2015   = .true.

diff --git a/tests/parm/input_regional_hafs.nml.IN b/tests/parm/input_regional_hafs.nml.IN
@@ -168,10 +168,12 @@
        use_ufo        = .true.
        pre_rad        = .false.
        imp_physics    = @[IMP_PHYSICS]
-       ltaerosol      = .false.
-       lradar         = .true.
-       ttendlim       = 0.004
-       sedi_semi      = .false.
+       ltaerosol    = .false.
+       lradar       = .true.
+       ttendlim     = -999
+       dt_inner     = @[DT_INNER]
+       sedi_semi    = @[SEDI_SEMI]
+       decfl        = @[DECFL]
        ext_diag_thompson = .false.
        pdfcld         = .false.
        fhswr          = @[FHSWR]
@@ -221,6 +223,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        oz_phys        = .false.
        oz_phys_2015   = .true.

diff --git a/tests/parm/rap.nml.IN b/tests/parm/rap.nml.IN
@@ -118,6 +118,8 @@ deflate_level=1
   imp_physics  = @[IMP_PHYSICS]
   ltaerosol    = @[LTAEROSOL]
   lradar       = @[LRADAR]
+  sedi_semi    = @[SEDI_SEMI]
+  decfl        = @[DECFL]
   nssl_cccn    = @[NSSL_CCCN]
   nssl_alphah  = @[NSSL_ALPHAH]
   nssl_alphahl = @[NSSL_ALPHAHL]
@@ -180,6 +182,7 @@ deflate_level=1
   iopt_snf     = 4
   iopt_tbot    = 2
   iopt_stc     = 3
+  iopt_trs     = 2
   debug        = .false.
   oz_phys      = .false.
   oz_phys_2015 = .true.

diff --git a/tests/parm/regional.nml.IN b/tests/parm/regional.nml.IN
@@ -131,6 +131,8 @@
        imp_physics    = 8
        ltaerosol      = .false.
        ttendlim       = -999.0
+       sedi_semi   = @[SEDI_SEMI]
+       decfl       = @[DECFL]
        pdfcld         = .false.
        fhswr          = 900.
        fhlwr          = 900.
@@ -179,6 +181,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        oz_phys        = @[OZ_PHYS_OLD]
        oz_phys_2015   = @[OZ_PHYS_NEW]

diff --git a/tests/parm/regional_3km.nml.IN b/tests/parm/regional_3km.nml.IN
@@ -173,6 +173,8 @@
     imfdeepcnv = 2
     imfshalcnv = 2
     imp_physics = 8
+    sedi_semi   = @[SEDI_SEMI]
+    decfl       = @[DECFL]
     iopt_alb = 2
     iopt_btr = 1
     iopt_crs = 1
@@ -184,6 +186,7 @@
     iopt_sfc = 1
     iopt_snf = 4
     iopt_stc = 1
+    iopt_trs = 2
     iopt_tbot = 2
     iovr = 3
     isol = 2

diff --git a/tests/parm/regional_c768.nml.IN b/tests/parm/regional_c768.nml.IN
@@ -162,6 +162,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        oz_phys        = @[OZ_PHYS_OLD]
        oz_phys_2015   = @[OZ_PHYS_NEW]

diff --git a/tests/parm/regional_stoch.nml.IN b/tests/parm/regional_stoch.nml.IN
@@ -180,6 +180,8 @@
     imfdeepcnv = -1
     imfshalcnv = -1
     imp_physics = 8
+    sedi_semi   = @[SEDI_SEMI]
+    decfl       = @[DECFL]
     iopt_alb = 2
     iopt_btr = 1
     iopt_crs = 1
@@ -191,6 +193,7 @@
     iopt_sfc = 1
     iopt_snf = 4
     iopt_stc = 1
+    iopt_trs = 2
     iopt_tbot = 2
     iovr = 3
     isol = 2

diff --git a/tests/parm/rrfs_conus13km_hrrr.nml.IN b/tests/parm/rrfs_conus13km_hrrr.nml.IN
@@ -186,6 +186,8 @@
     imfdeepcnv = @[IMFDEEPCNV]
     imfshalcnv = @[IMFSHALCNV]
     imp_physics = @[IMP_PHYSICS]
+    sedi_semi   = @[SEDI_SEMI]
+    decfl       = @[DECFL]
     iopt_dveg = 4
     iopt_crs  = 2
     iopt_btr  = 1
@@ -198,6 +200,7 @@
     iopt_snf  = 4
     iopt_tbot = 2
     iopt_stc  = 3
+    iopt_trs  = 2
     iovr = @[IOVR]
     isol = 2
     isot = 1

diff --git a/tests/parm/stretched-input.nml.IN b/tests/parm/stretched-input.nml.IN
@@ -160,6 +160,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        nstf_name      = @[NSTF_NAME]
        xkzminv        = 0.3

diff --git a/tests/parm/stretched-nest-input.nml.IN b/tests/parm/stretched-nest-input.nml.IN
@@ -169,6 +169,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        nstf_name      = @[NSTF_NAME]
        xkzminv        = 0.3

diff --git a/tests/parm/wam.nml.IN b/tests/parm/wam.nml.IN
@@ -170,6 +170,7 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       iopt_trs       = 2
        debug          = .false.
        levr           = 90
        h2o_phys       = @[H2O_PHYS]

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -28,7 +28,7 @@ RUN     | cpld_debug_p8
 # PROD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON |    | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON |    | fv3 |
 RUN     | control                                                                                                                 |                                         | fv3 |
 RUN     | control_decomp                                                                                                          |                                         |     |
 RUN     | control_2dwrtdecomp                                                                                                     |                                         |     |
@@ -55,13 +55,14 @@ RUN     | control_restart_p8
 RUN     | control_decomp_p8                                                                                                       |                                         |     |
 RUN     | control_2threads_p8                                                                                                     | - wcoss_cray                            |     |
 
+RUN     | control_p8_rrtmgp                                                                                                       |                                         | fv3 |
+
 RUN     | regional_control                                                                                                        |                                         | fv3 |
 RUN     | regional_restart                                                                                                        |                                         |     | regional_control
 RUN     | regional_control_2dwrtdecomp                                                                                            |                                         |     |
 RUN     | regional_noquilt                                                                                                        |                                         | fv3 |
 RUN     | regional_2threads                                                                                                       | - wcoss_cray jet.intel                  |     |
 RUN     | regional_netcdf_parallel                                                                                                | - wcoss2                                | fv3 |
-RUN     | regional_RRTMGP                                                                                                         |                                         | fv3 |
 RUN     | regional_3km                                                                                                            |                                         | fv3 |
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON      |                                         | fv3 |
@@ -85,11 +86,7 @@ RUN     | rrfs_v1nssl_nohailnoccn
 RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                                         | fv3 |
 RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                                         | fv3 |
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp | | fv3 |
-# fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
-RUN     | control_rrtmgp                                                                                                          |                                         | fv3 |
-#RUN     | control_rrtmgp_2threads                                                                                                 |                                         |     |
-RUN     | control_rrtmgp_c192                                                                                                     |                                         | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp | | fv3 |
 RUN     | control_csawmg                                                                                                          | - gaea.intel                            | fv3 |
 RUN     | control_csawmgt                                                                                                         |                                         | fv3 |
 RUN     | control_flake                                                                                                           |                                         | fv3 |
@@ -106,15 +103,14 @@ RUN     | control_wam
 # DEBUG tests                                                                                                                                                                     #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8  -D32BIT=ON | | fv3 |
+COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8  -D32BIT=ON | | fv3 |
 
 RUN     | control_debug                                                                                                           |                                         | fv3 |
 RUN     | control_2threads_debug                                                                                                  | - wcoss_cray                            |     |
 RUN     | control_CubedSphereGrid_debug                                                                                           |                                         | fv3 |
 RUN     | control_wrtGauss_netcdf_parallel_debug                                                                                  |                                         | fv3 |
 RUN     | control_stochy_debug                                                                                                    |                                         | fv3 |
 RUN     | control_lndp_debug                                                                                                      |                                         | fv3 |
-RUN     | control_rrtmgp_debug                                                                                                    |                                         | fv3 |
 RUN     | control_csawmg_debug                                                                                                    |                                         | fv3 |
 RUN     | control_csawmgt_debug                                                                                                   |                                         | fv3 |
 RUN     | control_ras_debug                                                                                                       |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220503
+BL_DATE=20220508
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
+0 −100		ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml
+0 −103		ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
+0 −103		ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
+0 −104		ccpp/suites/suite_FV3_GFS_v16_coupled_p7_rrtmgp.xml
+8 −17		ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+8 −17		ccpp/suites/suite_FV3_GFS_v17_p8.xml
+14 −13		ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+0 −104		ccpp/suites/suite_FV3_GFSv17alp_cpldnsstrasugwprrtmgp.xml
+0 −4		ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf.xml