[develop] Rename variables related to GFDLgrid-type grids

scripts/exregional_make_grid.sh

@@ -246,7 +246,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
 # Set local variables needed in the call to the executable that generates
 # a GFDLgrid-type grid.
 #
-  nx_t6sg=$(( 2*GFDLgrid_RES ))
+  nx_t6sg=$(( 2*GFDLgrid_NUM_CELLS ))
   grid_name="${GRID_GEN_METHOD}"
 #
 # Call the executable that generates the grid file.  Note that this call
@@ -402,8 +402,8 @@ res_equiv=${res_equiv//$'\n'/}
 #-----------------------------------------------------------------------
 #
 if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
-  if [ "${GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES}" = "TRUE" ]; then
-    CRES="C${GFDLgrid_RES}"
+  if [ "${GFDLgrid_USE_NUM_CELLS_IN_FILENAMES}" = "TRUE" ]; then
+    CRES="C${GFDLgrid_NUM_CELLS}"
   else
     CRES="C${res_equiv}"
   fi

scripts/exregional_make_orog.sh

@@ -373,7 +373,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
 #
 # Really depends on what EMC wants to do.
 
-  res="${GFDLgrid_RES}"
+  res="${GFDLgrid_NUM_CELLS}"
 #  stretch_fac="${GFDLgrid_STRETCH_FAC}"
   refine_ratio="${GFDLgrid_REFINE_RATIO}"
 

scripts/exregional_run_fcst.sh

@@ -167,8 +167,8 @@ create_symlink_to_file target="$target" symlink="$symlink" \
 #target="${FIXLAM}/${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH3}.nc"
 #if [ "${RUN_TASK_MAKE_SFC_CLIMO}" = "TRUE" ] && \
 #   [ "${GRID_GEN_METHOD}" = "GFDLgrid" ] && \
-#   [ "${GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES}" = "FALSE" ]; then
-#  symlink="C${GFDLgrid_RES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
+#   [ "${GFDLgrid_USE_NUM_CELLS_IN_FILENAMES}" = "FALSE" ]; then
+#  symlink="C${GFDLgrid_NUM_CELLS}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
 #else
 #  symlink="${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
 #fi

tests/WE2E/get_WE2Etest_names_subdirs_descs.sh

@@ -409,7 +409,7 @@ function get_WE2Etest_names_subdirs_descs() {
         \
         gfdlgrid_lon_t6_ctr \
         gfdlgrid_lat_t6_ctr \
-        gfdlgrid_res \
+        gfdlgrid_num_cells \
         gfdlgrid_stretch_fac \
         gfdlgrid_refine_ratio \
         gfdlgrid_istart_of_rgnl_dom_on_t6g \
@@ -1245,7 +1245,7 @@ ${test_desc}${stripped_line} "
           outvarname_gfdlgrid_lon_t6_ctr="gfdlgrid_lon_t6_ctr" \
           outvarname_gfdlgrid_lat_t6_ctr="gfdlgrid_lat_t6_ctr" \
           outvarname_gfdlgrid_stretch_fac="gfdlgrid_stretch_fac" \
-          outvarname_gfdlgrid_res="gfdlgrid_res" \
+          outvarname_gfdlgrid_num_cells="gfdlgrid_num_cells" \
           outvarname_gfdlgrid_refine_ratio="gfdlgrid_refine_ratio" \
           outvarname_gfdlgrid_istart_of_rgnl_dom_on_t6g="gfdlgrid_istart_of_rgnl_dom_on_t6g" \
           outvarname_gfdlgrid_iend_of_rgnl_dom_on_t6g="gfdlgrid_iend_of_rgnl_dom_on_t6g" \
@@ -1264,7 +1264,7 @@ ${test_desc}${stripped_line} "
         if [ "${grid_gen_method}" = "GFDLgrid" ]; then
           gfdlgrid_lon_t6_ctr="${GFDLgrid_LON_T6_CTR}"
           gfdlgrid_lat_t6_ctr="${GFDLgrid_LAT_T6_CTR}"
-          gfdlgrid_res="${GFDLgrid_RES}"
+          gfdlgrid_num_cells="${GFDLgrid_NUM_CELLS}"
           gfdlgrid_stretch_fac="${GFDLgrid_STRETCH_FAC}"
           gfdlgrid_refine_ratio="${GFDLgrid_REFINE_RATIO}"
           gfdlgrid_istart_of_rgnl_dom_on_t6g="${GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G}"
@@ -1305,7 +1305,7 @@ ${test_desc}${stripped_line} "
         set_gridparams_GFDLgrid \
           lon_of_t6_ctr="${gfdlgrid_lon_t6_ctr}" \
           lat_of_t6_ctr="${gfdlgrid_lat_t6_ctr}" \
-          res_of_t6g="${gfdlgrid_res}" \
+          res_of_t6g="${gfdlgrid_num_cells}" \
           stretch_factor="${gfdlgrid_stretch_fac}" \
           refine_ratio_t6g_to_t7g="${gfdlgrid_refine_ratio}" \
           istart_of_t7_on_t6g="${gfdlgrid_istart_of_rgnl_dom_on_t6g}" \
@@ -1353,7 +1353,7 @@ ${test_desc}${stripped_line} "
 #
       unset gfdlgrid_lon_t6_ctr \
             gfdlgrid_lat_t6_ctr \
-            gfdlgrid_res \
+            gfdlgrid_num_cells \
             gfdlgrid_stretch_fac \
             gfdlgrid_refine_ratio \
             gfdlgrid_istart_of_rgnl_dom_on_t6g \

tests/WE2E/test_configs/wflow_features/config.custom_ESGgrid.sh

@@ -25,6 +25,7 @@ LBC_SPEC_INTVL_HRS="3"
 #
 # Define custom grid.
 #
+POST_OUTPUT_DOMAIN_NAME="custom_ESGgrid"
 GRID_GEN_METHOD="ESGgrid"
 
 ESGgrid_LON_CTR="-97.5"
@@ -46,8 +47,6 @@ LAYOUT_X="8"
 LAYOUT_Y="12"
 BLOCKSIZE="13"
 
-POST_OUTPUT_DOMAIN_NAME="custom_ESGgrid"
-
 QUILTING="TRUE"
 if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_write_groups="1"

tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.sh

@@ -7,14 +7,14 @@
 # workflow) of GFDLgrid type.  Note that this test sets the workflow 
 # variable 
 #
-#   GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES 
+#   GFDLgrid_USE_NUM_CELLS_IN_FILENAMES 
 #
-# to "TRUE" (which is its default value); see the UFS SRW User's Guide 
-# for a description of this variable. 
+# to "TRUE" (which is its default value); see the UFS SRW App's User's 
+# Guide for a description of this variable. 
 #
 # The difference between this test and the one named
 #
-#   new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE
+#   new_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE
 #
 # is that this one uses almost no stretching by setting the workflow
 # variable GFDLgrid_STRETCH_FAC very close to 1.  Setting it exactly to
@@ -42,20 +42,21 @@ LBC_SPEC_INTVL_HRS="3"
 #
 # Define custom grid.
 #
+POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
 GRID_GEN_METHOD="GFDLgrid"
 
 GFDLgrid_LON_T6_CTR="-97.5"
 GFDLgrid_LAT_T6_CTR="38.5"
 GFDLgrid_STRETCH_FAC="1.0001"  # Cannot be exactly 1.0 because then FV3 thinnks it's a global grid.  This needs to be fixed in the ufs_weather_model repo.
-GFDLgrid_RES="96"
+GFDLgrid_NUM_CELLS="96"
 GFDLgrid_REFINE_RATIO="2"
 
 #num_margin_cells_T6_left="9"
 #GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_left + 1 ))
 GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G="10"
 
 #num_margin_cells_T6_right="9"
-#GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_right ))
+#GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_NUM_CELLS - num_margin_cells_T6_right ))
 GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G="87"
 
 #num_margin_cells_T6_bottom="9"
@@ -64,20 +65,18 @@ GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G="87"
 GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G="19"
 
 #num_margin_cells_T6_top="9"
-#GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_top ))
+#GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_NUM_CELLS - num_margin_cells_T6_top ))
 #GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G="87"
 GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G="78"
 
-GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES="TRUE"
+GFDLgrid_USE_NUM_CELLS_IN_FILENAMES="TRUE"
 
 DT_ATMOS="100"
 
 LAYOUT_X="6"
 LAYOUT_Y="6"
 BLOCKSIZE="26"
 
-POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
-
 QUILTING="TRUE"
 if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_write_groups="1"

tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh → tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE.sh

@@ -7,10 +7,10 @@
 # workflow) of GFDLgrid type.  Note that this test sets the workflow 
 # variable 
 #
-#   GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES 
+#   GFDLgrid_USE_NUM_CELLS_IN_FILENAMES 
 #
-# to "FALSE"; see the UFS SRW User's Guide for a description of this 
-# variable. 
+# to "FALSE"; see the UFS SRW App's User's Guide for a description of 
+# this variable. 
 #
 
 RUN_ENVIR="community"
@@ -31,40 +31,39 @@ LBC_SPEC_INTVL_HRS="3"
 #
 # Define custom grid.
 #
+POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
 GRID_GEN_METHOD="GFDLgrid"
 
 GFDLgrid_LON_T6_CTR="-97.5"
 GFDLgrid_LAT_T6_CTR="38.5"
 GFDLgrid_STRETCH_FAC="1.5"
-GFDLgrid_RES="96"
+GFDLgrid_NUM_CELLS="96"
 GFDLgrid_REFINE_RATIO="2"
 
 #num_margin_cells_T6_left="9"
 #GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_left + 1 ))
 GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G="10"
 
 #num_margin_cells_T6_right="9"
-#GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_right ))
+#GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_NUM_CELLS - num_margin_cells_T6_right ))
 GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G="87"
 
 #num_margin_cells_T6_bottom="9"
 #GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_bottom + 1 ))
 GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G="10"
 
 #num_margin_cells_T6_top="9"
-#GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_top ))
+#GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_NUM_CELLS - num_margin_cells_T6_top ))
 GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G="87"
 
-GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES="FALSE"
+GFDLgrid_USE_NUM_CELLS_IN_FILENAMES="FALSE"
 
 DT_ATMOS="100"
 
 LAYOUT_X="6"
 LAYOUT_Y="6"
 BLOCKSIZE="26"
 
-POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
-
 QUILTING="TRUE"
 if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_write_groups="1"

tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh → tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE.sh

@@ -7,10 +7,10 @@
 # workflow) of GFDLgrid type.  Note that this test sets the workflow 
 # variable 
 #
-#   GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES 
+#   GFDLgrid_USE_NUM_CELLS_IN_FILENAMES 
 #
-# to "TRUE" (which is its default value); see the UFS SRW User's Guide 
-# for a description of this variable. 
+# to "TRUE" (which is its default value); see the UFS SRW App's User's 
+# Guide for a description of this variable. 
 #
 
 RUN_ENVIR="community"
@@ -31,40 +31,39 @@ LBC_SPEC_INTVL_HRS="3"
 #
 # Define custom grid.
 #
+POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
 GRID_GEN_METHOD="GFDLgrid"
 
 GFDLgrid_LON_T6_CTR="-97.5"
 GFDLgrid_LAT_T6_CTR="38.5"
 GFDLgrid_STRETCH_FAC="1.5"
-GFDLgrid_RES="96"
+GFDLgrid_NUM_CELLS="96"
 GFDLgrid_REFINE_RATIO="2"
 
 #num_margin_cells_T6_left="9"
 #GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_left + 1 ))
 GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G="10"
 
 #num_margin_cells_T6_right="9"
-#GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_right ))
+#GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_NUM_CELLS - num_margin_cells_T6_right ))
 GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G="87"
 
 #num_margin_cells_T6_bottom="9"
 #GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G=$(( num_margin_cells_T6_bottom + 1 ))
 GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G="10"
 
 #num_margin_cells_T6_top="9"
-#GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_RES - num_margin_cells_T6_top ))
+#GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G=$(( GFDLgrid_NUM_CELLS - num_margin_cells_T6_top ))
 GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G="87"
 
-GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES="TRUE"
+GFDLgrid_USE_NUM_CELLS_IN_FILENAMES="TRUE"
 
 DT_ATMOS="100"
 
 LAYOUT_X="6"
 LAYOUT_Y="6"
 BLOCKSIZE="26"
 
-POST_OUTPUT_DOMAIN_NAME="custom_GFDLgrid"
-
 QUILTING="TRUE"
 if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_write_groups="1"

ush/Python/plot_allvars.py

@@ -9,7 +9,7 @@
 #           David Wright 	Org: University of Michigan
 #
 # Instructions:		Make sure all the necessary modules can be imported.
-#                       Six command line arguments are needed:
+#                       The following command line arguments are needed:
 #                       1. Cycle date/time in YYYYMMDDHH format
 #                       2. Starting forecast hour
 #                       3. Ending forecast hour

ush/Python/plot_allvars_diff.py

@@ -9,7 +9,7 @@
 #           David Wright 	Org: University of Michigan
 #
 # Instructions:		Make sure all the necessary modules can be imported.
-#                       Seven command line arguments are needed:
+#                       The following command line arguments are needed:
 #                       1. Cycle date/time in YYYYMMDDHH format
 #                       2. Starting forecast hour
 #                       3. Ending forecast hour