From 1337d9b806a35db171e51f51a539ccab2f7e36b7 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Fri, 23 Apr 2021 02:12:46 +0000
Subject: [PATCH 1/6] Rename FV3_GFS_v16beta to FV3_GFS_v16

---
 scripts/exregional_make_ics.sh                       |  2 +-
 scripts/exregional_make_lbcs.sh                      |  2 +-
 .../config.grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS.sh |  2 +-
 .../config.grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS.sh  |  2 +-
 .../config.grid_RRFS_AK_13km_FV3GFS_FV3GFS.sh        |  2 +-
 .../config.grid_RRFS_AK_3km_FV3GFS_FV3GFS.sh         |  2 +-
 ...NUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} |  2 +-
 ...NUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} |  2 +-
 ...ONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} |  2 +-
 ...ONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} |  2 +-
 ...GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} |  2 +-
 ...V3_GFS_v16beta.sh => config.suite_FV3_GFS_v16.sh} |  2 +-
 tests/baselines_list.txt                             | 12 ++++++------
 ush/templates/FV3.input.yml                          |  2 +-
 ..._table.FV3_GFS_v16beta => diag_table.FV3_GFS_v16} |  0
 ...table.FV3_GFS_v16beta => field_table.FV3_GFS_v16} |  0
 ush/valid_param_vals.sh                              |  2 +-
 17 files changed, 20 insertions(+), 20 deletions(-)
 rename tests/baseline_configs/{config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh => config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} (90%)
 rename tests/baseline_configs/{config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh => config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} (90%)
 rename tests/baseline_configs/{config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh => config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} (90%)
 rename tests/baseline_configs/{config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh => config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} (90%)
 rename tests/baseline_configs/{config.nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh => config.nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh} (90%)
 rename tests/baseline_configs/{config.suite_FV3_GFS_v16beta.sh => config.suite_FV3_GFS_v16.sh} (90%)
 rename ush/templates/{diag_table.FV3_GFS_v16beta => diag_table.FV3_GFS_v16} (100%)
 rename ush/templates/{field_table.FV3_GFS_v16beta => field_table.FV3_GFS_v16} (100%)

diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
index 39ea2d90c..a2c035eae 100755
--- a/scripts/exregional_make_ics.sh
+++ b/scripts/exregional_make_ics.sh
@@ -162,7 +162,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_GFS_2017_gfdlmp" | \
   "FV3_GFS_2017_gfdlmp_regional" | \
-  "FV3_GFS_v16beta" | \
+  "FV3_GFS_v16" | \
   "FV3_GFS_v15p2" | "FV3_CPT_v0" )
     varmap_file="GFSphys_var_map.txt"
     ;;
diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
index bdbe28cce..de112f7e9 100755
--- a/scripts/exregional_make_lbcs.sh
+++ b/scripts/exregional_make_lbcs.sh
@@ -162,7 +162,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_GFS_2017_gfdlmp" | \
   "FV3_GFS_2017_gfdlmp_regional" | \
-  "FV3_GFS_v16beta" | \
+  "FV3_GFS_v16" | \
   "FV3_GFS_v15p2" | "FV3_CPT_v0" )
     varmap_file="GFSphys_var_map.txt"
     ;;
diff --git a/tests/baseline_configs/config.grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS.sh
index e929eac4a..4b79b6ce5 100644
--- a/tests/baseline_configs/config.grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS.sh
+++ b/tests/baseline_configs/config.grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"
 
diff --git a/tests/baseline_configs/config.grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS.sh
index 4f73ed3bf..bf1928ad8 100644
--- a/tests/baseline_configs/config.grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS.sh
+++ b/tests/baseline_configs/config.grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="CONUS_3km_GFDLgrid"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"
 
diff --git a/tests/baseline_configs/config.grid_RRFS_AK_13km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_RRFS_AK_13km_FV3GFS_FV3GFS.sh
index 43abfd21f..31259cbeb 100644
--- a/tests/baseline_configs/config.grid_RRFS_AK_13km_FV3GFS_FV3GFS.sh
+++ b/tests/baseline_configs/config.grid_RRFS_AK_13km_FV3GFS_FV3GFS.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="RRFS_AK_13km"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="6"
diff --git a/tests/baseline_configs/config.grid_RRFS_AK_3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_RRFS_AK_3km_FV3GFS_FV3GFS.sh
index cfe703474..6745aa5e5 100644
--- a/tests/baseline_configs/config.grid_RRFS_AK_3km_FV3GFS_FV3GFS.sh
+++ b/tests/baseline_configs/config.grid_RRFS_AK_3km_FV3GFS_FV3GFS.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="RRFS_AK_3km"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="6"
diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
similarity index 90%
rename from tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
rename to tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
index a816fbf6d..0df2dd894 100644
--- a/tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
+++ b/tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="RRFS_CONUS_13km"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"
 
diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
similarity index 90%
rename from tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
rename to tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
index f6ac73ab5..2314a79f7 100644
--- a/tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
+++ b/tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="RRFS_CONUS_25km"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"
 
diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
similarity index 90%
rename from tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
rename to tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
index b64795d4e..68f24be25 100644
--- a/tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
+++ b/tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="RRFS_CONUS_3km"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"
 
diff --git a/tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh b/tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
similarity index 90%
rename from tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
rename to tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
index 427a9b84f..e74826bf4 100644
--- a/tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
+++ b/tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="RRFS_SUBCONUS_3km"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"
 
diff --git a/tests/baseline_configs/config.nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh b/tests/baseline_configs/config.nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
similarity index 90%
rename from tests/baseline_configs/config.nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
rename to tests/baseline_configs/config.nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
index b90347e04..e83617b61 100644
--- a/tests/baseline_configs/config.nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta.sh
+++ b/tests/baseline_configs/config.nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"
diff --git a/tests/baseline_configs/config.suite_FV3_GFS_v16beta.sh b/tests/baseline_configs/config.suite_FV3_GFS_v16.sh
similarity index 90%
rename from tests/baseline_configs/config.suite_FV3_GFS_v16beta.sh
rename to tests/baseline_configs/config.suite_FV3_GFS_v16.sh
index 539f8819c..23bc117c3 100644
--- a/tests/baseline_configs/config.suite_FV3_GFS_v16beta.sh
+++ b/tests/baseline_configs/config.suite_FV3_GFS_v16.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="RRFS_CONUS_25km"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GFS_v16beta"
+CCPP_PHYS_SUITE="FV3_GFS_v16"
 
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="6"
diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt
index 01eae66ad..3d9736148 100644
--- a/tests/baselines_list.txt
+++ b/tests/baselines_list.txt
@@ -24,12 +24,12 @@ grid_RRFS_AK_13km_RAP_RAP
 grid_RRFS_AK_3km_FV3GFS_FV3GFS
 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_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
 grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_HRRR
 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_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GSD_SAR
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR
 grid_RRFS_CONUS_25km_ics_HRRR_lbcs_HRRR_suite_GSD_SAR
@@ -43,17 +43,17 @@ grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR
 grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta
 grid_RRFS_CONUS_25km_modify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE
 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_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_HRRR
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_NA_13km
-grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
+grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2
 grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
 nco_ensemble
-nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
+nco_grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 nco_grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
 nco_grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_HRRR
 nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional
@@ -72,7 +72,7 @@ subhourly_post
 subhourly_post_ensemble_2mems
 suite_FV3_CPT_v0
 suite_FV3_GFS_v15p2
-suite_FV3_GFS_v16beta
+suite_FV3_GFS_v16
 suite_FV3_GSD_SAR
 suite_FV3_GSD_v0
 suite_FV3_RRFS_v1beta
diff --git a/ush/templates/FV3.input.yml b/ush/templates/FV3.input.yml
index 09e52ca6c..1eaebcd6d 100644
--- a/ush/templates/FV3.input.yml
+++ b/ush/templates/FV3.input.yml
@@ -303,7 +303,7 @@ FV3_GFS_v15p2:
     ldebug: False
   surf_map_nml:
 
-FV3_GFS_v16beta:
+FV3_GFS_v16:
   atmos_model_nml:
     ccpp_suite: FV3_GFS_v16
     fhmax: 240
diff --git a/ush/templates/diag_table.FV3_GFS_v16beta b/ush/templates/diag_table.FV3_GFS_v16
similarity index 100%
rename from ush/templates/diag_table.FV3_GFS_v16beta
rename to ush/templates/diag_table.FV3_GFS_v16
diff --git a/ush/templates/field_table.FV3_GFS_v16beta b/ush/templates/field_table.FV3_GFS_v16
similarity index 100%
rename from ush/templates/field_table.FV3_GFS_v16beta
rename to ush/templates/field_table.FV3_GFS_v16
diff --git a/ush/valid_param_vals.sh b/ush/valid_param_vals.sh
index b27ecafa6..b3ace2fa5 100644
--- a/ush/valid_param_vals.sh
+++ b/ush/valid_param_vals.sh
@@ -28,7 +28,7 @@ valid_vals_CCPP_PHYS_SUITE=( \
 "FV3_GSD_SAR" \
 "FV3_GSD_v0" \
 "FV3_GFS_v15p2" \
-"FV3_GFS_v16beta" \
+"FV3_GFS_v16" \
 "FV3_RRFS_v1beta" \
 "FV3_RRFS_v1alpha" \
 "FV3_HRRR" \

From 597c40a7634e031b52fa98ee360835d3d12a9bfc Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Tue, 11 May 2021 23:32:53 +0000
Subject: [PATCH 2/6] Add Jeffs changes for new NA domain, plus an RRFS v1alpha
 suite test

---
 .../config.grid_RRFS_NA_3km.sh                | 49 +++++++++++++++++++
 ...fig.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh | 49 +++++++++++++++++++
 ush/config_defaults.sh                        |  2 +-
 ush/set_predef_grid_params.sh                 | 42 ++++++++++++++++
 ush/templates/input.nml.FV3                   |  4 +-
 ush/valid_param_vals.sh                       |  1 +
 6 files changed, 144 insertions(+), 3 deletions(-)
 create mode 100644 tests/baseline_configs/config.grid_RRFS_NA_3km.sh
 create mode 100644 tests/baseline_configs/config.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh

diff --git a/tests/baseline_configs/config.grid_RRFS_NA_3km.sh b/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
new file mode 100644
index 000000000..f9ef409ac
--- /dev/null
+++ b/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
@@ -0,0 +1,49 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_NA_3km"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_GSD_SAR"
+
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="6"
+
+DATE_FIRST_CYCL="20190701"
+DATE_LAST_CYCL="20190701"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="FV3GFS"
+EXTRN_MDL_NAME_LBCS="FV3GFS"
+USE_USER_STAGED_EXTRN_FILES="TRUE"
+
+#########################################################################
+# The following code/namelist/workflow setting changes are necessary to #
+# run/optimize end-to-end experiments using the 3-km NA grid            #
+#########################################################################
+
+# The model should be built in 32-bit mode (64-bit will result in much
+# longer run times.
+
+# Use k_split=5 and n_split=2, the previous namelist values (k_split=4
+# and n_split=5) will result in significantly longer run times.
+
+# For Hera:
+# 1) With 64-bit build and k_split=4/n_split=5, each time step takes ~21 seconds
+# 2) 1) with k_split=5/n_split=2, each time step takes ~15 seconds
+# 3) 2) with 32-bit build, each time step takes ~6 seconds
+
+NNODES_MAKE_ICS="12"
+NNODES_MAKE_LBCS="12"
+PPN_MAKE_ICS="4"
+PPN_MAKE_LBCS="4"
+WTIME_MAKE_LBCS="01:00:00"
+
+PPN_RUN_FCST="24"
+
+NNODES_RUN_POST="6"
+PPN_RUN_POST="12"
+
+OMP_STACKSIZE_RUN_FCST="2048m"
+
+###############################################################################
diff --git a/tests/baseline_configs/config.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh b/tests/baseline_configs/config.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh
new file mode 100644
index 000000000..02172db73
--- /dev/null
+++ b/tests/baseline_configs/config.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh
@@ -0,0 +1,49 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_NA_3km"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="6"
+
+DATE_FIRST_CYCL="20190701"
+DATE_LAST_CYCL="20190701"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="FV3GFS"
+EXTRN_MDL_NAME_LBCS="FV3GFS"
+USE_USER_STAGED_EXTRN_FILES="TRUE"
+
+#########################################################################
+# The following code/namelist/workflow setting changes are necessary to #
+# run/optimize end-to-end experiments using the 3-km NA grid            #
+#########################################################################
+
+# The model should be built in 32-bit mode (64-bit will result in much
+# longer run times.
+
+# Use k_split=5 and n_split=2, the previous namelist values (k_split=4
+# and n_split=5) will result in significantly longer run times.
+
+# For Hera:
+# 1) With 64-bit build and k_split=4/n_split=5, each time step takes ~21 seconds
+# 2) 1) with k_split=5/n_split=2, each time step takes ~15 seconds
+# 3) 2) with 32-bit build, each time step takes ~6 seconds
+
+NNODES_MAKE_ICS="12"
+NNODES_MAKE_LBCS="12"
+PPN_MAKE_ICS="4"
+PPN_MAKE_LBCS="4"
+WTIME_MAKE_LBCS="01:00:00"
+
+PPN_RUN_FCST="24"
+
+NNODES_RUN_POST="6"
+PPN_RUN_POST="12"
+
+OMP_STACKSIZE_RUN_FCST="2048m"
+
+###############################################################################
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index fe485325c..9f899baef 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -1641,7 +1641,7 @@ KMP_AFFINITY_RUN_FCST="scatter"
 OMP_NUM_THREADS_RUN_FCST="4"
 OMP_STACKSIZE_RUN_FCST="1024m"
 
-CPUS_PER_TASK_RUN_FCST="4"
+CPUS_PER_TASK_RUN_FCST="2"
 
 KMP_AFFINITY_RUN_POST="scatter"
 OMP_NUM_THREADS_RUN_POST="1"
diff --git a/ush/set_predef_grid_params.sh b/ush/set_predef_grid_params.sh
index cfb4136ba..2084617ec 100644
--- a/ush/set_predef_grid_params.sh
+++ b/ush/set_predef_grid_params.sh
@@ -1167,6 +1167,48 @@ case ${PREDEF_GRID_NAME} in
   fi
   ;;
 
+#
+#-----------------------------------------------------------------------
+#
+# Future operational RRFS domain with ~3km cell size.
+#
+#-----------------------------------------------------------------------
+#
+"RRFS_NA_3km")
+
+  GRID_GEN_METHOD="ESGgrid"
+
+  ESGgrid_LON_CTR=-107.5
+  ESGgrid_LAT_CTR=51.5
+
+  ESGgrid_DELX="3000.0"
+  ESGgrid_DELY="3000.0"
+
+  ESGgrid_NX=3640
+  ESGgrid_NY=2520
+
+  ESGgrid_WIDE_HALO_WIDTH=6
+
+  DT_ATMOS="${DT_ATMOS:-36}"
+
+  LAYOUT_X="${LAYOUT_X:-18}"
+  LAYOUT_Y="${LAYOUT_Y:-36}"
+  BLOCKSIZE="${BLOCKSIZE:-28}"
+
+  if [ "$QUILTING" = "TRUE" ]; then
+    WRTCMP_write_groups="1"
+    WRTCMP_write_tasks_per_group="144"
+    WRTCMP_output_grid="rotated_latlon"
+    WRTCMP_cen_lon="-112.0" #${ESGgrid_LON_CTR}"
+    WRTCMP_cen_lat="48.0" #${ESGgrid_LAT_CTR}"
+    WRTCMP_lon_lwr_left="-51.0"
+    WRTCMP_lat_lwr_left="-33.0"
+    WRTCMP_lon_upr_rght="51.0"
+    WRTCMP_lat_upr_rght="33.0"
+    WRTCMP_dlon="0.025" #$( printf "%.9f" $( bc -l <<< "(${ESGgrid_DELX}/${radius_Earth})*${degs_per_radian}" ) )
+    WRTCMP_dlat="0.025" #$( printf "%.9f" $( bc -l <<< "(${ESGgrid_DELY}/${radius_Earth})*${degs_per_radian}" ) )
+  fi
+  ;;
 esac
 #
 #-----------------------------------------------------------------------
diff --git a/ush/templates/input.nml.FV3 b/ush/templates/input.nml.FV3
index 64f9f4d05..392689266 100644
--- a/ush/templates/input.nml.FV3
+++ b/ush/templates/input.nml.FV3
@@ -85,7 +85,7 @@
     hord_vt = 6
     hydrostatic = .false.
     io_layout = 1,1
-    k_split = 4
+    k_split = 5
     ke_bg = 0.0
     kord_mt = 9
     kord_tm = -9
@@ -93,7 +93,7 @@
     kord_wz = 9
     make_nh = .true.
     mountain = .false.
-    n_split = 5
+    n_split = 2
     n_sponge = 24
     n_zs_filter = 0
     na_init = 1
diff --git a/ush/valid_param_vals.sh b/ush/valid_param_vals.sh
index b3ace2fa5..752fbf3f9 100644
--- a/ush/valid_param_vals.sh
+++ b/ush/valid_param_vals.sh
@@ -20,6 +20,7 @@ valid_vals_PREDEF_GRID_NAME=( \
 "GSL_HAFSV0.A_3km" \
 "GSD_HRRR_AK_50km" \
 "RRFS_NA_13km" \
+"RRFS_NA_3km" \
 )
 valid_vals_CCPP_PHYS_SUITE=( \
 "FV3_CPT_v0" \

From 008bf3d164cc35421fe0986c657126e45092da59 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Wed, 12 May 2021 16:03:51 -0600
Subject: [PATCH 3/6] Make grid_RRFS_NA_3km test use RRFS_v1alpha suite, add to
 test list, remove redundant test

---
 .../config.grid_RRFS_NA_3km.sh                |  2 +-
 ...fig.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh | 49 -------------------
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 tests/baseline_configs/config.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh

diff --git a/tests/baseline_configs/config.grid_RRFS_NA_3km.sh b/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
index f9ef409ac..02172db73 100644
--- a/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
+++ b/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
@@ -4,7 +4,7 @@ PREEXISTING_DIR_METHOD="rename"
 PREDEF_GRID_NAME="RRFS_NA_3km"
 QUILTING="TRUE"
 
-CCPP_PHYS_SUITE="FV3_GSD_SAR"
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
 
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="6"
diff --git a/tests/baseline_configs/config.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh b/tests/baseline_configs/config.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh
deleted file mode 100644
index 02172db73..000000000
--- a/tests/baseline_configs/config.grid_RRFS_NA_3km_suite_RRFS_v1alpha.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-RUN_ENVIR="community"
-PREEXISTING_DIR_METHOD="rename"
-
-PREDEF_GRID_NAME="RRFS_NA_3km"
-QUILTING="TRUE"
-
-CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
-
-FCST_LEN_HRS="06"
-LBC_SPEC_INTVL_HRS="6"
-
-DATE_FIRST_CYCL="20190701"
-DATE_LAST_CYCL="20190701"
-CYCL_HRS=( "00" )
-
-EXTRN_MDL_NAME_ICS="FV3GFS"
-EXTRN_MDL_NAME_LBCS="FV3GFS"
-USE_USER_STAGED_EXTRN_FILES="TRUE"
-
-#########################################################################
-# The following code/namelist/workflow setting changes are necessary to #
-# run/optimize end-to-end experiments using the 3-km NA grid            #
-#########################################################################
-
-# The model should be built in 32-bit mode (64-bit will result in much
-# longer run times.
-
-# Use k_split=5 and n_split=2, the previous namelist values (k_split=4
-# and n_split=5) will result in significantly longer run times.
-
-# For Hera:
-# 1) With 64-bit build and k_split=4/n_split=5, each time step takes ~21 seconds
-# 2) 1) with k_split=5/n_split=2, each time step takes ~15 seconds
-# 3) 2) with 32-bit build, each time step takes ~6 seconds
-
-NNODES_MAKE_ICS="12"
-NNODES_MAKE_LBCS="12"
-PPN_MAKE_ICS="4"
-PPN_MAKE_LBCS="4"
-WTIME_MAKE_LBCS="01:00:00"
-
-PPN_RUN_FCST="24"
-
-NNODES_RUN_POST="6"
-PPN_RUN_POST="12"
-
-OMP_STACKSIZE_RUN_FCST="2048m"
-
-###############################################################################

From e3ef798535e7a9335d3af02021cc93c6d03332b1 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Wed, 12 May 2021 20:26:17 -0600
Subject: [PATCH 4/6] Forgot to add new test to baselines_list.txt

---
 tests/baselines_list.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt
index 3d9736148..21f08ad4f 100644
--- a/tests/baselines_list.txt
+++ b/tests/baselines_list.txt
@@ -49,6 +49,7 @@ grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_HRRR
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_NA_13km
+grid_RRFS_NA_3km
 grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2
 grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR

From 63783c9c9d6aebeca160a7d1d84f1e4ef9da4764 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 24 May 2021 17:51:37 +0000
Subject: [PATCH 5/6] Remove old runtime notes

---
 tests/baseline_configs/config.grid_RRFS_NA_3km.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/baseline_configs/config.grid_RRFS_NA_3km.sh b/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
index 02172db73..cfb327c28 100644
--- a/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
+++ b/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
@@ -28,11 +28,6 @@ USE_USER_STAGED_EXTRN_FILES="TRUE"
 # Use k_split=5 and n_split=2, the previous namelist values (k_split=4
 # and n_split=5) will result in significantly longer run times.
 
-# For Hera:
-# 1) With 64-bit build and k_split=4/n_split=5, each time step takes ~21 seconds
-# 2) 1) with k_split=5/n_split=2, each time step takes ~15 seconds
-# 3) 2) with 32-bit build, each time step takes ~6 seconds
-
 NNODES_MAKE_ICS="12"
 NNODES_MAKE_LBCS="12"
 PPN_MAKE_ICS="4"

From c3dfbb961b4d5ca6a311e53289c392fedb8a5086 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 24 May 2021 17:53:59 +0000
Subject: [PATCH 6/6] Fix incorrect settings; k_split and n_split should be
 switched

---
 tests/baseline_configs/config.grid_RRFS_NA_3km.sh | 2 +-
 ush/templates/input.nml.FV3                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/baseline_configs/config.grid_RRFS_NA_3km.sh b/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
index cfb327c28..fb4d009a5 100644
--- a/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
+++ b/tests/baseline_configs/config.grid_RRFS_NA_3km.sh
@@ -25,7 +25,7 @@ USE_USER_STAGED_EXTRN_FILES="TRUE"
 # The model should be built in 32-bit mode (64-bit will result in much
 # longer run times.
 
-# Use k_split=5 and n_split=2, the previous namelist values (k_split=4
+# Use k_split=2 and n_split=5, the previous namelist values (k_split=4
 # and n_split=5) will result in significantly longer run times.
 
 NNODES_MAKE_ICS="12"
diff --git a/ush/templates/input.nml.FV3 b/ush/templates/input.nml.FV3
index 392689266..0b1d8c426 100644
--- a/ush/templates/input.nml.FV3
+++ b/ush/templates/input.nml.FV3
@@ -85,7 +85,7 @@
     hord_vt = 6
     hydrostatic = .false.
     io_layout = 1,1
-    k_split = 5
+    k_split = 2
     ke_bg = 0.0
     kord_mt = 9
     kord_tm = -9
@@ -93,7 +93,7 @@
     kord_wz = 9
     make_nh = .true.
     mountain = .false.
-    n_split = 2
+    n_split = 5
     n_sponge = 24
     n_zs_filter = 0
     na_init = 1