Remove RRFS_v1alpha suite (ufs-community#809)

* Remove RRFS_v1alpha suite
michelleharrold · Jul 12, 2022 · 05bf03f · 05bf03f
1 parent e328595
commit 05bf03f
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 523 deletions.
diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -142,7 +142,6 @@ case "${CCPP_PHYS_SUITE}" in
     varmap_file="GFSphys_var_map.txt"
     ;;
 #
-  "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" | \
   "FV3_GFS_v15_thompson_mynn_lam3km" | \
   "FV3_HRRR" )

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -140,7 +140,6 @@ case "${CCPP_PHYS_SUITE}" in
     varmap_file="GFSphys_var_map.txt"
     ;;
 #
-  "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" | \
   "FV3_GFS_v15_thompson_mynn_lam3km" | \
   "FV3_HRRR" )

diff --git a/tests/WE2E/machine_suites/hera.txt b/tests/WE2E/machine_suites/hera.txt
@@ -5,6 +5,5 @@ grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
diff --git a/tests/WE2E/machine_suites/jet.txt b/tests/WE2E/machine_suites/jet.txt
@@ -5,6 +5,5 @@ grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
diff --git a/...ites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh b/...ites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
diff --git a/...ites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh b/...ites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
diff --git a/...uites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh b/...uites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
diff --git a/..._FV3GFS_lbcs_FV3GFS_suite_RRFS_v1alpha.sh → ...s_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.sh b/..._FV3GFS_lbcs_FV3GFS_suite_RRFS_v1alpha.sh → ...s_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.sh
@@ -3,7 +3,7 @@
 # ------------------------
 #
 # This test is to ensure that the workflow running in community mode 
-# completes successfully on the RRFS_NA_3km grid using the RRFS_v1alpha
+# completes successfully on the RRFS_NA_3km grid using the RRFS_v1beta
 # physics suite with ICs and LBCs derived from the FV3GFS.
 #
 # Note that this test also sets various resource parameters for several
@@ -15,7 +15,7 @@ RUN_ENVIR="community"
 PREEXISTING_DIR_METHOD="rename"
 
 PREDEF_GRID_NAME="RRFS_NA_3km"
-CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+CCPP_PHYS_SUITE="FV3_RRFS_v1beta"
 
 EXTRN_MDL_NAME_ICS="FV3GFS"
 EXTRN_MDL_NAME_LBCS="FV3GFS"

diff --git a/ush/templates/FV3.input.yml b/ush/templates/FV3.input.yml
@@ -12,10 +12,10 @@
 # and provide this file and the desired section via the -c option.
 
 
-FV3_RRFS_v1alpha:
-  gfs_physics_nml: &RRFS_v1alpha_phys
+FV3_RRFS_v1beta:
+  gfs_physics_nml: &RRFS_v1beta_phys
     do_deep: False
-    do_mynnsfclay: False
+    do_mynnsfclay: True
     imfdeepcnv: -1
     imfshalcnv: -1
     iopt_alb: 2
@@ -34,11 +34,6 @@ FV3_RRFS_v1alpha:
     lsm: 2
     lsoil_lsm: 4
 
-FV3_RRFS_v1beta:
-  gfs_physics_nml:
-    <<: *RRFS_v1alpha_phys
-    do_mynnsfclay: True
-
 FV3_HRRR:
   fv_core_nml:
     hord_dp: -5
@@ -52,7 +47,7 @@ FV3_HRRR:
     nord_tr: 2
     nrows_blend: 10
   gfs_physics_nml:
-    <<: *RRFS_v1alpha_phys
+    <<: *RRFS_v1beta_phys
     cdmbgwd: [3.5, 1.0]
     do_mynnsfclay: True
     do_sfcperts: !!python/none
@@ -282,19 +277,19 @@ FV3_GFS_v15_thompson_mynn_lam3km:
   atmos_model_nml:
     avg_max_length: 3600.0
   fv_core_nml:
-    agrid_vel_rst: true
+    agrid_vel_rst: True
     full_zs_filter: !!python/none
     n_sponge: 9
     npz_type: ''
-    rf_fast: false
+    rf_fast: False
     sg_cutoff: 10000.0
     vtdm4: 0.02
   gfs_physics_nml:
     avg_max_length: 3600.0
     cdmbgwd: [0.88, 0.04]
-    do_deep: false
-    do_mynnsfclay: true
-    do_ugwp: false
+    do_deep: False
+    do_mynnsfclay: True
+    do_ugwp: False
     fhswr: 900.0
     fhlwr: 900.0
     iaer: 1011
@@ -316,11 +311,11 @@ FV3_GFS_v15_thompson_mynn_lam3km:
     iopt_tbot: 2
     iopt_trs: 2
     iovr: 3
-    ldiag_ugwp: false
-    lgfdlmprad: false
+    ldiag_ugwp: False
+    lgfdlmprad: False
     lsm: 1
     lsoil_lsm: !!python/none
-    ltaerosol: false    
+    ltaerosol: False    
     xkzminv: 0.3
     xkzm_m: 1.0
     xkzm_h: 1.0
@@ -330,7 +325,7 @@ FV3_GFS_v16:
     launch_level: 27
   fv_core_nml:
     <<: *gfs_v15_fv_core
-    agrid_vel_rst: false
+    agrid_vel_rst: False
     d2_bg_k1: 0.2
     d2_bg_k2: 0.0
     fv_sg_adj: 450
@@ -339,7 +334,7 @@ FV3_GFS_v16:
     hord_tm: 5
     hord_vt: 5
     k_split: 6
-    make_nh: false
+    make_nh: False
     n_split: 6
     n_sponge: 10
     na_init: 0