Maximize RRFS_CONUS_[25,13,3]km grids so they span as much of HRRR CO…

…NUS domain as possible (#360) ## DESCRIPTION OF CHANGES: ### Main changes: * Change grid parameters for the RRFS_COUNS_25km, RRFS_CONUS_13km, and RRFS_CONUS_3km grids so that they span as much of the HRRR CONUS domain as possible. Note that this is done without regard to whether NX and NY are evenly divisible by LAYOUT_X and LAYOUT_Y because these restrictions were recently removed from the forecast model. * Remove several checks on the grid parameters. These are: (1) The check on whether NX and NY are evenly divisible by LAYOUT_X and LAYOUT_Y, respectively. This restriction has been removed from the forecast model. (2) The check on BLOCKSIZE, i.e. whether the quantity (NX/LAYOUT_X)*(NY/LAYOUT_Y) is evenly divisible by BLOCKSIZE. This already depends on restriction (1) being satisfied, so it cannot be satisfied if (1) is not satisfied. (3) The check on whether NY is evenly divisible by the number of write-component tasks per write-component group. Tests were run with parameters that violated this test, and the model did not crash, so we assume this is no longer a restriction. * Modify NCL plotting scripts to make them work with the latest version of the workflow. ### Bug fixes: * Fix bug in set_predef_grid_params.sh involving an extra space after the equal sign in the lines that set GRID_GEN_METHOD. * Remove the FV3_RRFS_v1alpha suite from the list of WE2E tests because that suite is not (yet?) supported by the version of ufs-weather-model this PR is using. * Fix bug in run_experiment.sh where the variable FV3GFS_FILE_FMT_ICS should be replaced with FV3GFS_FILE_FMT_LBCS. ### Improvements: * Forecast model executable: (1) Remove section of code that copies the FV3 executable from its location in the ufs-weather-model directory to the bin directory for all other executables. This is no longer necessary since the new build system already places this executable in the bin directory. (2) Change the name of the forecast model executable to the latest one that is being used in ufs-weather-model. * Remove commented-out code that was previously used to create module files for the various workflow tasks. * Change the default physics suite to GFS_v15p2 to be consistent with the release/public-v1 branch. * Alphabetize namelist variable entries in FV3.input.yml and input.nml.FV3. * Edit comments. ## TESTS CONDUCTED: Ran all 49 WE2E tests on Hera. All except 5 tests succeeded. The results are as follows: ``` (1) DOT_OR_USCORE SUCCESS (2) GST_release_public_v1 SUCCESS (3) community_ensemble_008mems SUCCESS (4) community_ensemble_2mems SUCCESS (5) get_extrn_files_from_hpss_FV3GFS_FV3GFS SUCCESS (6) get_extrn_files_from_hpss_GSMGFS_GSMGFS SUCCESS (7) get_extrn_files_from_hpss_HRRR_RAP SUCCESS (8) get_extrn_files_from_hpss_RAP_RAP SUCCESS (9) grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS SUCCESS (10) grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS SUCCESS (11) grid_GSD_HRRR_AK_50km SUCCESS (12) grid_GSD_RAP13km FAILURE (13) grid_RRFS_AK_13km_FV3GFS_FV3GFS SUCCESS (14) grid_RRFS_AK_13km_RAP_RAP FAILURE (15) grid_RRFS_AK_3km_FV3GFS_FV3GFS SUCCESS (16) grid_RRFS_AK_3km_RAP_RAP FAILURE (17) grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 SUCCESS (18) grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta SUCCESS (19) grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR SUCCESS (20) grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta SUCCESS (21) grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 SUCCESS (22) grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta SUCCESS (23) grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR SUCCESS (24) grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta SUCCESS (25) grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 SUCCESS (26) grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta SUCCESS (27) grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR SUCCESS (28) grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta SUCCESS (29) grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS SUCCESS (30) grid_RRFS_SUBCONUS_3km_HRRR_RAP FAILURE (31) nco_CONUS_25km_GFDLgrid SUCCESS (32) nco_RRFS_CONUS_25km_HRRR_RAP SUCCESS (33) nco_RRFS_CONUS_3km_FV3GFS_FV3GFS SUCCESS (34) nco_RRFS_CONUS_3km_HRRR_RAP SUCCESS (35) nco_RRFS_SUBCONUS_3km_HRRR_RAP SUCCESS (36) nco_ensemble SUCCESS (37) new_ESGgrid SUCCESS (38) new_GFDLgrid SUCCESS (39) new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE SUCCESS (40) new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE SUCCESS (41) pregen_grid_orog_sfc_climo SUCCESS (42) regional_001 SUCCESS (43) regional_002 SUCCESS (44) suite_FV3_CPT_v0 FAILURE (45) suite_FV3_GFS_v15p2 SUCCESS (46) suite_FV3_GFS_v16beta SUCCESS (47) suite_FV3_GSD_SAR SUCCESS (48) suite_FV3_GSD_v0 SUCCESS (49) suite_FV3_RRFS_v1beta SUCCESS ``` The 5 failed tests (with information on the failures) are as follows: ``` (12) grid_GSD_RAP13km Failed in most of the run_post tasks. (14) grid_RRFS_AK_13km_RAP_RAP Failed in the run_fcst task with "AVOST IN VILKA" messages. (16) grid_RRFS_AK_3km_RAP_RAP Failed in the run_fcst task with "AVOST IN VILKA" messages. (30) grid_RRFS_SUBCONUS_3km_HRRR_RAP Failed in the run_fcst task without a clear failure message. (44) suite_FV3_CPT_v0 Failed in the run_fcst task with the following namelist read error: forrtl: severe (19): invalid reference to variable in NAMELIST input, unit -5, file Internal Formatted NML Read, line -1, position 13 ``` Except for FV3_CPT_v0, the failed tests do not use the new RRFS_CONUS grids. Thus, these failures are not related to the CONUS grid modifications. The failure of FV3_CPT_v0 is likely due to a bad namelist variable specification and thus also unrelated to the CONUS grid modifications. Note that all tests using grids for which NX and NY are not evenly divisible by LAYOUT_X and LAYOUT_Y, respectively (which include all 3 new versions of the RRFS_CONUS grids), and thus the quantity (NX/LAYOUT_X)*(NY/LAYOUT_Y) is not evenly divisible by BLOCKSIZE gave warnings of this kind in the log file for the run_fcst task: `WARNING from PE 478: atmos_modeldefine_blocks_packed: domain ( 59 65) is not an even divisor with definition ( 32) - blocks will not be uniform with a remainder of 27 ` This warning should either be removed (since this restriction on BLOCKSIZE has been removed from the code) or, if having this remainder makes the model run less efficiently, be replaced by a different caution message.
ufs-community · Dec 14, 2020 · e952122 · e952122
1 parent 716f93c
commit e952122
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 319 deletions.
diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt
@@ -17,17 +17,14 @@ 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
@@ -49,5 +46,4 @@ suite_FV3_GFS_v15p2
 suite_FV3_GFS_v16beta
 suite_FV3_GSD_SAR
 suite_FV3_GSD_v0
-suite_FV3_RRFS_v1alpha
 suite_FV3_RRFS_v1beta
diff --git a/tests/run_experiments.sh b/tests/run_experiments.sh
@@ -748,10 +748,10 @@ boundary conditions specification interval (LBC_SPEC_INTVL_HRS):
     EXTRN_MDL_FILES_LBCS=( $( printf "%03d " "${lbc_spec_times_hrs[@]}" ) ) 
     if [ "${EXTRN_MDL_NAME_LBCS}" = "FV3GFS" ] || \
        [ "${EXTRN_MDL_NAME_LBCS}" = "GSMGFS" ]; then
-      if [ "${FV3GFS_FILE_FMT_ICS}" = "nemsio" ]; then
+      if [ "${FV3GFS_FILE_FMT_LBCS}" = "nemsio" ]; then
         EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/#/gfs.atmf}" )
         EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/%/.nemsio}" )
-      elif [ "${FV3GFS_FILE_FMT_ICS}" = "grib2" ]; then
+      elif [ "${FV3GFS_FILE_FMT_LBCS}" = "grib2" ]; then
         EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/#/gfs.pgrb2.0p25.f}" )
       fi
     elif [ "${EXTRN_MDL_NAME_LBCS}" = "HRRR" ] || \

diff --git a/ush/NCL/calc_wrtcmp_grid_params_lambert_cnfrml.ncl b/ush/NCL/calc_wrtcmp_grid_params_lambert_cnfrml.ncl
@@ -16,7 +16,7 @@ loadscript(lib_location + "convert_lambert_cnfrml_coords_to_sphr.ncl")
 undef("calc_wrtcmp_grid_params_lambert_cnfrml")
 
 function calc_wrtcmp_grid_params_lambert_cnfrml( \
-         wrtcmp_config_fn:string, \
+         model_config_tmpl_fp:string, \
          lon_ctr_native:snumeric, lat_ctr_native:snumeric, \
          lon_tile_corners_face_midpts_native[8]:snumeric, \
          lat_tile_corners_face_midpts_native[8]:snumeric, \
@@ -244,16 +244,16 @@ begin
   param_value := char_sq + "lambert_conformal" + char_sq
   param_value_str := tostring(param_value)
 
-  regex_search = "^(\s*" + param_name + ":\s+)(<" + param_name + ">)(\s*)(.*)"
+  regex_search = "^(\s*" + param_name + ":\s+)('\{\{ " + param_name + " \}\}')(\s*)(.*)"
 
   regex_print = "\1" + param_value_str
   sed_cmd = "sed -n -r -e " + char_dq + "s|" + regex_search + "|" \
-          + regex_print + "|p" + char_dq + " " + wrtcmp_config_fn
+          + regex_print + "|p" + char_dq + " " + model_config_tmpl_fp
   param_names_and_vals(np) = systemfunc(sed_cmd)
 
   regex_print = "\4"
   sed_cmd = "sed -n -r -e " + char_dq + "s|" + regex_search + "|" \
-          + regex_print + "|p" + char_dq + " " + wrtcmp_config_fn
+          + regex_print + "|p" + char_dq + " " + model_config_tmpl_fp
   trailing_comments(np) = systemfunc(sed_cmd)
 ;
 ; **********************************************************************
@@ -326,22 +326,24 @@ begin
 ;
 ; Set the regular expression to search for.
 ;
-    regex_search = "^(\s*" + param_name + ":\s+)(<" + param_name + ">)(\s*)(.*)"
+    regex_search = "^(\s*" + param_name + ":\s+)(\{\{ " + param_name + " \}\})(\s*)(.*)"
 ;
 ; Get the parameter name and value without the trailing comment (if any).
 ;
     regex_print = "\1" + param_value_str
     sed_cmd = "sed -n -r -e " + char_dq + "s|" + regex_search + "|" \
-            + regex_print + "|p" + char_dq + " " + wrtcmp_config_fn
-    param_names_and_vals(np) = systemfunc(sed_cmd)
+            + regex_print + "|p" + char_dq + " " + model_config_tmpl_fp
+    tmp := systemfunc(sed_cmd)
+    param_names_and_vals(np) = tmp(0)
 ;
 ; Get the trailing name and comment.
 ;
     regex_print = "\4"
     sed_cmd = "sed -n -r -e " + char_dq + "s|" + regex_search + "|" \
-            + regex_print + "|p" + char_dq + " " + wrtcmp_config_fn
-    trailing_comments(np) = systemfunc(sed_cmd)
-
+            + regex_print + "|p" + char_dq + " " + model_config_tmpl_fp
+    tmp := systemfunc(sed_cmd)
+    trailing_comments(np) = tmp(0)
+
   end do
 ;
 ; **********************************************************************

diff --git a/ush/NCL/find_wrtcmp_grid_params.ncl b/ush/NCL/find_wrtcmp_grid_params.ncl
@@ -22,8 +22,13 @@ expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_predef_grids/ex
 expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_bugfix_adjust_CONUS_grids/expt_dirs/try01/grid_RRFS_CONUS_13km_HRRRX_RAPX"
 expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_bugfix_adjust_CONUS_grids/expt_dirs/try01/grid_RRFS_CONUS_3km_FV3GFS_FV3GFS"
 expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_bugfix_adjust_CONUS_grids/expt_dirs/try03/grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
-expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_bugfix_adjust_CONUS_grids/expt_dirs/try03/grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
+expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_bugfix_adjust_CONUS_grids/expt_dirs/try03/grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
+
+expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_maximize_CONUS_grids/expt_dirs/try01/grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
+
+;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_maximize_CONUS_grids/expt_dirs/try01/grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
 
+expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_maximize_CONUS_grids/expt_dirs/try01/grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
 
 ;
 ; **********************************************************************
@@ -100,7 +105,7 @@ begin
   var_defns_fp = expt_dir + "/var_defns.sh"
 
   param_names = (/ \
-"WRTCMP_PARAMS_TMPL_FP", \
+"MODEL_CONFIG_TMPL_FP", \
 "WRTCMP_output_grid", \
 "GTYPE", \
 "CRES", \
@@ -125,8 +130,8 @@ print("sed_output = " + sed_output)
 ; Convert the output from the sed command (which will be a string) to 
 ; the appropriate NCL data type.
 ;
-    if (strcmp_exact(param_name, "WRTCMP_PARAMS_TMPL_FP")) then
-      WRTCMP_PARAMS_TMPL_FP = tostring(sed_output)
+    if (strcmp_exact(param_name, "MODEL_CONFIG_TMPL_FP")) then
+      MODEL_CONFIG_TMPL_FP = tostring(sed_output)
     else if (strcmp_exact(param_name, "WRTCMP_output_grid")) then
       WRTCMP_output_grid = tostring(sed_output)
     else if (strcmp_exact(param_name, "GTYPE")) then
@@ -226,18 +231,6 @@ print("BBBBBBBBBBBBBBBBBBBBBBBBBBB")
 ;
 ; **********************************************************************
 ;
-; Set the full path to the file that will contain a copy of the write-
-; component template file with placeholders replaced with actual values.  
-; Then copy the template file to that file.
-;
-; **********************************************************************
-;
-  wrtcmp_config_fp = expt_dir + "/aaaa"
-  sys_output = systemfunc("cp " + WRTCMP_PARAMS_TMPL_FP + \
-                          " " + wrtcmp_config_fp) 
-;
-; **********************************************************************
-;
 ; Extract and save into new, appropriately dimensioned variables the 
 ; output from the grid-read operation above.  Then call the function 
 ; that calculates the write-component grid parameters for a lambert-
@@ -267,7 +260,7 @@ print("BBBBBBBBBBBBBBBBBBBBBBBBBBB")
     if (strcmp_exact(WRTCMP_output_grid, "rotated_latlon")) then
 
       out := calc_wrtcmp_grid_params_rotated_latlon( \
-             wrtcmp_config_fp, \
+             MODEL_CONFIG_TMPL_FP, \
              lon_grid_cntr_native, lat_grid_cntr_native, \
              lon_tile_corners_face_midpts_native, \
              lat_tile_corners_face_midpts_native, \
@@ -277,7 +270,7 @@ print("BBBBBBBBBBBBBBBBBBBBBBBBBBB")
     else if (strcmp_exact(WRTCMP_output_grid, "lambert_conformal")) then
 
       out := calc_wrtcmp_grid_params_lambert_cnfrml( \
-             wrtcmp_config_fp, \
+             MODEL_CONFIG_TMPL_FP, \
              lon_grid_cntr_native, lat_grid_cntr_native, \
              lon_tile_corners_face_midpts_native, \
              lat_tile_corners_face_midpts_native, \

diff --git a/ush/NCL/plot_grid.ncl b/ush/NCL/plot_grid.ncl
@@ -77,20 +77,26 @@ CDATE="2019070100"
 ;CDATE="2019070100"
 
 ;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_predef_grids/expt_dirs/try01/grid_CONUS_3km_GFDLgrid"
-;CDATE="2019070100"
+expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_maximize_CONUS_grids/expt_dirs/try02/grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
+CDATE="2019070100"
 
 ;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_predef_grids/expt_dirs/try01/grid_CONUS_25km_GFDLgrid"
-expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_bugfix_adjust_CONUS_grids/expt_dirs/try03/grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
-CDATE="2019070100"
+;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_bugfix_adjust_CONUS_grids/expt_dirs/try03/grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
+;expt_dir = "/work/noaa/gsd-fv3-dev/gsketefia/UFS/PR_release_branch/expt_dirs/try02/grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
+;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_maximize_CONUS_grids/expt_dirs/try02/grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
+;CDATE="2019070100"
 
 ;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_predef_grids/expt_dirs/try01/suite_FV3_GSD_SAR"
 ;CDATE="2019052000"
 
 ;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_predef_grids/expt_dirs/try01/grid_RRFS_AK_3km"
+;expt_dir = "/work/noaa/gsd-fv3-dev/gsketefia/UFS/PR_release_branch/expt_dirs/try01/grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
+;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_maximize_CONUS_grids/expt_dirs/try02/grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
 ;CDATE="2019052000"
 
 ;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_predef_grids/expt_dirs/try01/grid_RRFS_AK_13km"
 ;expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/PR_feature_predef_grids/expt_dirs/try01/grid_RRFS_AK_13km_old001"
+;expt_dir = "/work/noaa/gsd-fv3-dev/gsketefia/UFS/PR_release_branch/expt_dirs/try02/grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2"
 ;CDATE="2019052000"
 
 
@@ -136,6 +142,7 @@ RAP_bdy_color = "red"
 
 RAP_dir = "/scratch3/BMC/fim/Gerard.Ketefian/regional_FV3_EMC_visit_20180509"
 RAP_dir = "/scratch1/BMC/gsd-fv3-dev/Gerard.Ketefian/regional_FV3_EMC_visit_20180509"
+;RAP_dir = "/work/noaa/gsd-fv3-dev/gsketefia/UFS" ; This is on Orion.
 ;RAP_grid_fn = "/home/Gerard/fv3_regional/fv3sar_workflow/ush/NCL/plot_grid.ncl"
 ;RAP_grid_fn = "/scratch3/BMC/fim/Gerard.Ketefian/regional_FV3_EMC_visit_20180509/geo_em.d01.RAP.nc"
 RAP_grid_fn = RAP_dir + "/geo_em.d01.RAP.nc"
@@ -217,21 +224,21 @@ subreg_limits := (/ -135, -60, 20, 55 /) ; HRRR domain if using "cyln" map proje
 ;subreg_limits := (/ -122.85, -122.83, 21.49, 21.51 /) ; 0.02deg x 0.02deg
 
 ; Zoom in on southeast corner of CONUS domain.
-;subreg_limits := (/ -68, -88, 22, 42 /) ; 20deg x 20deg
-;subreg_limits := (/ -70, -80, 20, 30 /) ; 10deg x 10deg
-;subreg_limits := (/ -71, -76, 21, 26 /) ; 5deg x 5deg
-;subreg_limits := (/ -71.9, -73.9, 21.4, 23.4 /) ; 2deg x 2deg
-;subreg_limits := (/ -72, -73, 21.2, 22.2 /) ; 1deg x 1deg
-;subreg_limits := (/ -72.0, -72.5, 21.45, 21.95 /) ; 0.5deg x 0.5deg
-;subreg_limits := (/ -72.1, -72.2, 21.45, 21.55 /) ; 0.1deg x 0.1deg
-;subreg_limits := (/ -72.15, -72.17, 21.49, 21.51 /) ; 0.02deg x 0.02deg
+;subreg_limits := (/ -88, -68, 18, 38 /) ; 20deg x 20deg
+;subreg_limits := (/ -80, -70, 20, 30 /) ; 10deg x 10deg
+;subreg_limits := (/ -76, -71, 21, 26 /) ; 5deg x 5deg
+;subreg_limits := (/ -73.9, -71.9, 21.0, 23.0 /) ; 2deg x 2deg
+;subreg_limits := (/ -73, -72, 21.2, 22.2 /) ; 1deg x 1deg
+;subreg_limits := (/ -72.5, -72.0, 21.45, 21.95 /) ; 0.5deg x 0.5deg
+;subreg_limits := (/ -72.25, -72.15, 21.45, 21.55 /) ; 0.1deg x 0.1deg
+;subreg_limits := (/ -72.17, -72.15, 21.49, 21.51 /) ; 0.02deg x 0.02deg
 
 ; Zoom in on northeast corner of CONUS domain.
-;subreg_limits := (/ -66, -86, 32, 52 /) ; 20deg x 20deg
-;subreg_limits := (/ -64, -74, 40, 50 /) ; 10deg x 10deg.
-;subreg_limits := (/ -62, -67, 44, 49 /) ; 5deg x 5deg.
-;subreg_limits := (/ -61.5, -63.5, 46.2, 48.2 /) ; 2deg x 2deg.
-;subreg_limits := (/ -61.2, -62.2, 47, 48 /) ; 1deg x 1deg.
+;subreg_limits := (/ -78, -58, 32, 52 /) ; 20deg x 20deg
+;subreg_limits := (/ -70, -60, 40, 50 /) ; 10deg x 10deg.
+;subreg_limits := (/ -65.5, -60.5, 44, 49 /) ; 5deg x 5deg.
+;subreg_limits := (/ -63.0, -61.0, 46.2, 48.2 /) ; 2deg x 2deg.
+;subreg_limits := (/ -62.2, -61.2, 47, 48 /) ; 1deg x 1deg.
 
 
 

diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
@@ -330,7 +330,7 @@ FV3_NML_YAML_CONFIG_FN="FV3.input.yml"
 FV3_NML_BASE_ENS_FN="input.nml.base_ens"
 MODEL_CONFIG_FN="model_configure"
 NEMS_CONFIG_FN="nems.configure"
-FV3_EXEC_FN="fv3_gfs.x"
+FV3_EXEC_FN="ufs_model"
 
 WFLOW_XML_FN="FV3LAM_wflow.xml"
 GLOBAL_VAR_DEFNS_FN="var_defns.sh"
@@ -476,7 +476,7 @@ EXTRN_MDL_FILES_LBCS=( "LBCS_file1" "LBCS_file2" "..." )
 #
 #-----------------------------------------------------------------------
 #
-CCPP_PHYS_SUITE="FV3_GSD_v0"
+CCPP_PHYS_SUITE="FV3_GFS_v15p2"
 #
 #-----------------------------------------------------------------------
 #
@@ -720,6 +720,14 @@ ESGgrid_WIDE_HALO_WIDTH="6"
 # the frequency with which the top level routine in the dynamics is called
 # as well as the frequency with which the physics is called."
 #
+# Note that if using one of the predefined grids (i.e. if PREDEF_GRID_NAME
+# is not set to a null string, either below or in the custom workflow
+# configuration file specified by EXPT_CONFIG_FN), then DT_ATMOS is 
+# overwritten by the value for that predefined grid.  The predefined
+# grid parameters are specified in the script 
+#
+#   $HOMErrfs/ush/set_predef_grid_params.sh
+#
 #-----------------------------------------------------------------------
 #
 DT_ATMOS="18"