* Add the RRFS_v1alpha suite to the set of valid suites that can be u…

…sed in the workflow. This entails: (ufs-community#361)

This PR should be merged at the same time as PR #[51](ufs-community/ufs-srweather-app#51) into ufs-srweather-app:release/public-v1 branch.

## DESCRIPTION OF CHANGES:
* Add the RRFS_v1alpha suite to the set of valid suites that can be used in the workflow.  This entails:
  * Adding this suite to the list of valid values for CCPP_PHYS_SUITE in ush/valid_param_vals.sh.
  * Adding this suite to the various if-statements in the ex-scripts for the make_ics and make_lbcs tasks.
  * Adding a stanza for this suite in ush/templates/FV3.input.yml.
  * Adding a diag_table for this suite.
  * Adding a field_table for this suite.

  Note that the RRFS_v1alpha suite should be identical to RRFS_v1beta except that the MYNN surface layer parameterization is replaced with the GFS one.  However, currently in the ufs-weather-model, RRFS_v1alpha differs from RRFS_v1beta not only in the surface parameterization but also in the use of the Noah MP land surface model (instead of the Noah LSM).  Eventually, a PR should go into ufs-weather-model (and fv3atm) to set the LSM in RRFS_v1alpha to Noah (without MP).
* Add WE2E tests for the RRFS_v1alpha suite.
* Change the list of WE2E tests that must be run for the release branch (for testing PRs) to use the RRFS_v1alpha suite instead of RRFS_v1beta.
* Remove the RRFS_v1beta suite from the list of valid values for CCPP_PHYS_SUITE in ush/valid_param_vals.sh.  This disables the use of RRFS_v1beta in the release branch.  This must be done because the RRFS_V1beta suite has been removed from the release/public-v2 branch of ufs-weather-model.
* Remove from the yaml configuration file for the FV3 namelist (FV3.input.yml) those suites that are neither in the develop branch nor the release/public-v2 branch of ufs-weather-model (or, really of its fv3atm submodule).  These suites are FV3_GSD_SAR_v1 and FV3_RRFS_v0.
* Modify the yaml configuration file for the FV3 namelist (FV3.input.yml) so that those suites that use Thompson micorphysics set the variable effr_in to False.  Note that we make this change not only for the suites that can be used with the release/public-v1 branch (of regional_workflow) but also the ones that can be sued with the develop branch in order to keep differences between these two branches to a minimum.

## TESTS CONDUCTED: 
The following WE2E tests were run on Hera:
* GST_release_public_v1
* grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
* grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
* grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
* grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
* grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
* grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha

All were successful.  Note that the tests involving RRFS_v1alpha are using the Noah MP LSM.  This will be changed in the future (in the fv3atm repo), at which point the tests should be rerun.

## CONTRIBUTORS (optional): 
@climbfuji @JacobCarley-NOAA

scripts/exregional_make_ics.sh

@@ -159,6 +159,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_GSD_v0" | \
   "FV3_GSD_SAR" | \
+  "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" )
     if [ "${EXTRN_MDL_NAME_ICS}" = "RAP" ] || \
        [ "${EXTRN_MDL_NAME_ICS}" = "HRRR" ]; then
@@ -325,8 +326,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
       thomp_mp_climo_file=""
     elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-         [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-         [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+         [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+         [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+         [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
       thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
     else
       print_err_msg_exit "\
@@ -357,8 +359,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
     thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   else
     print_err_msg_exit "\
@@ -410,11 +413,11 @@ case "${EXTRN_MDL_NAME_ICS}" in
 #
   if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
+     [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     nsoill_out="4"
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
@@ -450,9 +453,10 @@ case "${EXTRN_MDL_NAME_ICS}" in
   if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
+     [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     nsoill_out="4"
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
@@ -491,8 +495,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
     thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   fi
 

scripts/exregional_make_lbcs.sh

@@ -159,6 +159,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_GSD_v0" | \
   "FV3_GSD_SAR" | \
+  "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" )
     if [ "${EXTRN_MDL_NAME_LBCS}" = "RAP" ] || \
        [ "${EXTRN_MDL_NAME_LBCS}" = "HRRR" ]; then
@@ -294,8 +295,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
      thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
      thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   else
     print_err_msg_exit "\
@@ -319,8 +321,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
      thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
      thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   else
     print_err_msg_exit "\
@@ -378,8 +381,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
      thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
      thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   else
     print_err_msg_exit "\

tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh

@@ -0,0 +1,18 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_13km"
+GRID_GEN_METHOD="ESGgrid"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="3"
+
+DATE_FIRST_CYCL="20200801"
+DATE_LAST_CYCL="20200801"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="HRRR"
+EXTRN_MDL_NAME_LBCS="RAP"
+USE_USER_STAGED_EXTRN_FILES="TRUE"

tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh

@@ -0,0 +1,18 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_25km"
+GRID_GEN_METHOD="ESGgrid"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="3"
+
+DATE_FIRST_CYCL="20200801"
+DATE_LAST_CYCL="20200801"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="HRRR"
+EXTRN_MDL_NAME_LBCS="RAP"
+USE_USER_STAGED_EXTRN_FILES="TRUE"

tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh

@@ -0,0 +1,18 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_3km"
+GRID_GEN_METHOD="ESGgrid"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="3"
+
+DATE_FIRST_CYCL="20200801"
+DATE_LAST_CYCL="20200801"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="HRRR"
+EXTRN_MDL_NAME_LBCS="RAP"
+USE_USER_STAGED_EXTRN_FILES="TRUE"

tests/baseline_configs/config.suite_FV3_RRFS_v1alpha.sh

@@ -0,0 +1,19 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_25km"
+GRID_GEN_METHOD="ESGgrid"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="6"
+
+DATE_FIRST_CYCL="20190520"
+DATE_LAST_CYCL="20190520"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="HRRR"
+EXTRN_MDL_NAME_LBCS="RAP"
+USE_USER_STAGED_EXTRN_FILES="TRUE"

tests/baselines_list.txt

@@ -17,14 +17,17 @@ grid_RRFS_AK_3km_RAP_RAP
 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
 grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
+grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
 grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
+grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
+grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS
 grid_RRFS_SUBCONUS_3km_HRRR_RAP
@@ -46,4 +49,5 @@ suite_FV3_GFS_v15p2
 suite_FV3_GFS_v16beta
 suite_FV3_GSD_SAR
 suite_FV3_GSD_v0
+suite_FV3_RRFS_v1alpha
 suite_FV3_RRFS_v1beta

tests/testlist.release_public_v1.txt

@@ -1,7 +1,7 @@
 GST_release_public_v1
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
+grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
+grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
+grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha

ush/templates/FV3.input.yml

@@ -11,11 +11,14 @@
 
 
 FV3_GSD_v0:
+  gfs_physics_nml:
+    effr_in: True
 
 FV3_GSD_SAR: 
   gfs_physics_nml: &gsd_sar_phys
     cnvcld: false
     cnvgwd: false
+    effr_in: True
     imfdeepcnv: 0
     imfshalcnv: 0
     iopt_alb: 2
@@ -33,28 +36,29 @@ FV3_GSD_SAR:
     shal_cnv: false
     do_deep: False
 
-FV3_GSD_SAR_v1:
-  gfs_physics_nml:
-    <<: *gsd_sar_phys
-    lsm: 1
-    lsoil_lsm: 4
-
-FV3_RRFS_v0:
+FV3_RRFS_v1alpha:
   gfs_physics_nml:
     <<: *gsd_sar_phys
+    do_deep: False
+    do_mynnsfclay: False
+    effr_in: True
+    imfdeepcnv: -1
+    imfshalcnv: -1
     lsm: 2
     lsoil_lsm: 4
-    do_deep: False
+  atmos_model_nml:
+    fdiag: 3
 
 FV3_RRFS_v1beta:
   gfs_physics_nml:
     <<: *gsd_sar_phys
+    do_deep: False
+    do_mynnsfclay: True
+    effr_in: True
+    imfdeepcnv: -1
+    imfshalcnv: -1
     lsm: 2
     lsoil_lsm: 4
-    imfshalcnv: -1
-    IMFDEEPCNV: -1
-    DO_MYNNSFCLAY: true
-    do_deep: False
   atmos_model_nml:
     fdiag: 3