Remove workflow variable EMC_GRID_NAME (#333)

## DESCRIPTION OF CHANGES: * Remove the workflow variable EMC_GRID_NAME. Henceforth, PREDEF_GRID_NAME is the only variable that can be used to set the name of the predefined grid to use. * Make appropriate change of variable name (EMC_GRID_NAME --> PREDEF_GRID_NAME) in the WE2E test configuration files. * Change anywhere the "conus" and "conus_c96" grids are specified to "EMC_CONUS_3km" and "EMC_CONUS_coarse", respectively. * Rename WE2E test configuration files with names containing the strings "conus" and "conus_c96" by replacing these strings with "EMC_CONUS_3km" and "EMC_CONUS_coarse", respectively. * Update the list of WE2E test names (tests/baselines_list.txt). * Bug fixes not directly related to grids: * In config.nco.sh, remove settings of QUEUE_DEFAULT, QUEUE_HPSS, and QUEUE_FCST since these are now set automatically (due to another PR). * In the template file FV3LAM_wflow.xml, add the ensemble member name after RUN_FCST_TN in the dependency of the run_post metatask. ## TESTS CONDUCTED: Since this change only affects runs in NCO mode, the following NCO-mode WE2E tests were rerun on hera, all successfully: ``` nco_EMC_CONUS_3km SUCCESS nco_EMC_CONUS_coarse SUCCESS nco_EMC_CONUS_coarse__suite_FV3_GFS_2017_gfdlmp SUCCESS nco_RRFS_CONUS_25km_HRRRX_RAPX SUCCESS nco_RRFS_CONUS_3km_FV3GFS_FV3GFS SUCCESS nco_RRFS_CONUS_3km_HRRRX_RAPX SUCCESS nco_ensemble SUCCESS ```
ufs-community · Oct 23, 2020 · 3c644e6 · 3c644e6
1 parent 2bcf073
commit 3c644e6
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 88 deletions.
diff --git a/tests/baseline_configs/config.nco_conus.sh → ...eline_configs/config.nco_EMC_CONUS_3km.sh b/tests/baseline_configs/config.nco_conus.sh → ...eline_configs/config.nco_EMC_CONUS_3km.sh
@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="conus"  # This maps to PREDEF_GRID_NAME="EMC_CONUS_3km".
+PREDEF_GRID_NAME="EMC_CONUS_3km"
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 

diff --git a/.../baseline_configs/config.nco_conus_c96.sh → ...ne_configs/config.nco_EMC_CONUS_coarse.sh b/.../baseline_configs/config.nco_conus_c96.sh → ...ne_configs/config.nco_EMC_CONUS_coarse.sh
@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="conus_c96"  # This maps to PREDEF_GRID_NAME="EMC_CONUS_coarse".
+PREDEF_GRID_NAME="EMC_CONUS_coarse"
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 

diff --git a/...o_conus_c96__suite_FV3_GFS_2017_gfdlmp.sh → ...ONUS_coarse__suite_FV3_GFS_2017_gfdlmp.sh b/...o_conus_c96__suite_FV3_GFS_2017_gfdlmp.sh → ...ONUS_coarse__suite_FV3_GFS_2017_gfdlmp.sh
@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="conus_c96"  # This maps to PREDEF_GRID_NAME="EMC_CONUS_coarse".
+PREDEF_GRID_NAME="EMC_CONUS_coarse"
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 

diff --git a/tests/baseline_configs/config.nco_RRFS_CONUS_25km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_RRFS_CONUS_25km_HRRRX_RAPX.sh
@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="RRFS_CONUS_25km"
+PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 

diff --git a/tests/baseline_configs/config.nco_RRFS_CONUS_3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.nco_RRFS_CONUS_3km_FV3GFS_FV3GFS.sh
@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="RRFS_CONUS_3km"
+PREDEF_GRID_NAME="RRFS_CONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 

diff --git a/tests/baseline_configs/config.nco_RRFS_CONUS_3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_RRFS_CONUS_3km_HRRRX_RAPX.sh
@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="RRFS_CONUS_3km"
+PREDEF_GRID_NAME="RRFS_CONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 

diff --git a/tests/baseline_configs/config.nco_RRFS_SUBCONUS_3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_RRFS_SUBCONUS_3km_HRRRX_RAPX.sh
@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="RRFS_SUBCONUS_3km"
+PREDEF_GRID_NAME="RRFS_SUBCONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 

diff --git a/tests/baseline_configs/config.nco_ensemble.sh b/tests/baseline_configs/config.nco_ensemble.sh
@@ -1,7 +1,7 @@
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="conus_c96"  # This maps to PREDEF_GRID_NAME="EMC_CONUS_coarse".
+PREDEF_GRID_NAME="EMC_CONUS_coarse"
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 

diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt
@@ -27,13 +27,13 @@ grid_RRFS_CONUS_3km_ics_HRRRX_lbcs_RAPX_suite_GSD_SAR
 grid_RRFS_CONUS_3km_ics_HRRRX_lbcs_RAPX_suite_RRFS_v1beta
 grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS
 grid_RRFS_SUBCONUS_3km_HRRRX_RAPX
+nco_EMC_CONUS_3km
+nco_EMC_CONUS_coarse
+nco_EMC_CONUS_coarse__suite_FV3_GFS_2017_gfdlmp
 nco_RRFS_CONUS_25km_HRRRX_RAPX
 nco_RRFS_CONUS_3km_FV3GFS_FV3GFS
 nco_RRFS_CONUS_3km_HRRRX_RAPX
 nco_RRFS_SUBCONUS_3km_HRRRX_RAPX
-nco_conus
-nco_conus_c96
-nco_conus_c96__suite_FV3_GFS_2017_gfdlmp
 nco_ensemble
 new_ESGgrid
 new_GFDLgrid

diff --git a/tests/run_experiments.sh b/tests/run_experiments.sh
@@ -639,9 +639,9 @@ envir=\"\${EXPT_SUBDIR}\"
 #
 # The experiment generation script will then set FIXsar to
 #
-#   FIXsar=\"\${FIXrrfs}/fix_sar/\${EMC_GRID_NAME}\"
+#   FIXsar=\"\${FIXrrfs}/fix_sar/\${PREDEF_GRID_NAME}\"
 #
-# where EMC_GRID_NAME has the value set above.
+# where PREDEF_GRID_NAME has the value set above.
 #"
 #
 # Set COMINgfs.

diff --git a/ush/config.nco.sh b/ush/config.nco.sh
@@ -2,16 +2,12 @@ MACHINE="hera"
 ACCOUNT="an_account"
 EXPT_SUBDIR="test_nco"
 
-QUEUE_DEFAULT="batch"
-QUEUE_HPSS="service"
-QUEUE_FCST="batch"
-
 VERBOSE="TRUE"
 
 RUN_ENVIR="nco"
 PREEXISTING_DIR_METHOD="rename"
 
-EMC_GRID_NAME="conus_c96"  # For now (20200130), this is maps to PREDEF_GRID_NAME="EMC_CONUS_coarse".
+PREDEF_GRID_NAME="EMC_CONUS_coarse"
 GRID_GEN_METHOD="GFDLgrid"
 
 QUILTING="TRUE"
@@ -50,8 +46,8 @@ PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp"  # Path to direct
 #
 # The experiment generation script will then set FIXLAM to 
 #
-#   FIXLAM="${FIXrrfs}/fix_lam/${EMC_GRID_NAME}"
+#   FIXLAM="${FIXrrfs}/fix_lam/${PREDEF_GRID_NAME}"
 #
-# where EMC_GRID_NAME has the value set above.
+# where PREDEF_GRID_NAME has the value set above.
 #
 
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
@@ -814,17 +814,6 @@ PREDEF_GRID_NAME=""
 #
 #-----------------------------------------------------------------------
 #
-# Set EMC_GRID_NAME.  This is a convenience parameter to allow EMC to use
-# its original grid names.  It is simply used to determine a value for 
-# PREDEF_GRID_NAME.  Once EMC starts using PREDEF_GRID_NAME, this variable
-# can be eliminated.
-#
-#-----------------------------------------------------------------------
-#
-EMC_GRID_NAME=""
-#
-#-----------------------------------------------------------------------
-#
 # Set PREEXISTING_DIR_METHOD.  This variable determines the method to use
 # use to deal with preexisting directories [e.g ones generated by previous
 # calls to the experiment generation script using the same experiment name

diff --git a/ush/setup.sh b/ush/setup.sh
@@ -474,47 +474,6 @@ check_var_valid_value "GTYPE" "valid_vals_GTYPE"
 #
 #-----------------------------------------------------------------------
 #
-# If running in NCO mode, a valid EMC grid must be specified.  Make sure 
-# EMC_GRID_NAME is set to a valid value.
-#
-# Note: It is probably best to eventually eliminate EMC_GRID_NAME as a
-# user-specified variable and just go with PREDEF_GRID_NAME.
-#
-#-----------------------------------------------------------------------
-#
-if [ "${RUN_ENVIR}" = "nco" ]; then
-  err_msg="\
-The EMC grid specified in EMC_GRID_NAME is not supported:
-  EMC_GRID_NAME = \"${EMC_GRID_NAME}\""
-  check_var_valid_value \
-    "EMC_GRID_NAME" "valid_vals_EMC_GRID_NAME" "${err_msg}"
-fi
-#
-# Map the specified EMC grid to one of the predefined grids.
-#
-case "${EMC_GRID_NAME}" in
-  "ak")
-    PREDEF_GRID_NAME="EMC_AK"
-    ;;
-  "conus")
-    PREDEF_GRID_NAME="EMC_CONUS_3km"
-    ;;
-  "conus_c96")
-    PREDEF_GRID_NAME="EMC_CONUS_coarse"
-    ;;
-  "RRFS_CONUS_25km" | "RRFS_CONUS_13km" | "RRFS_CONUS_3km" | "RRFS_SUBCONUS_3km")
-    PREDEF_GRID_NAME="${EMC_GRID_NAME}"
-    ;;
-  "conus_orig" | "guam" | "hi" | "pr")
-    print_err_msg_exit "\
-A predefined grid (PREDEF_GRID_NAME) has not yet been defined for this
-EMC grid (EMC_GRID_NAME):
-  EMC_GRID_NAME = \"${EMC_GRID_NAME}\""
-    ;;
-esac
-#
-#-----------------------------------------------------------------------
-#
 # Make sure PREDEF_GRID_NAME is set to a valid value.
 #
 #-----------------------------------------------------------------------
@@ -1045,7 +1004,7 @@ Please ensure that path_resolved is an existing directory and then rerun
 the experiment generation script."
   fi
 
-  FIXLAM="${FIXrrfs}/fix_lam/${EMC_GRID_NAME}"
+  FIXLAM="${FIXrrfs}/fix_lam/${PREDEF_GRID_NAME}"
 #
 # In NCO mode (i.e. if RUN_ENVIR set to "nco"), it is assumed that before
 # running the experiment generation script, the path specified in FIXLAM 

diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
@@ -397,7 +397,7 @@ MODULES_RUN_TASK_FP script.
 
       <dependency>
         <or>
-          <taskdep task="&RUN_FCST_TN;"/>
+          <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
           <and>
             <datadep age="05:00"><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H{{ slash_ensmem_subdir }}/dynf#fhr#.nc</cyclestr></datadep>
             <datadep age="05:00"><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H{{ slash_ensmem_subdir }}/phyf#fhr#.nc</cyclestr></datadep>

diff --git a/ush/valid_param_vals.sh b/ush/valid_param_vals.sh
@@ -23,20 +23,6 @@ valid_vals_PREDEF_GRID_NAME=( \
 "CONUS_3km_GFDLgrid" \
 "GSD_RAP13km" \
 )
-valid_vals_EMC_GRID_NAME=( \
-"ak" \
-"conus" \
-"conus_c96" \
-"conus_orig" \
-"guam" \
-"hi" \
-"pr" \
-"RRFS_CONUS_25km" \
-"RRFS_CONUS_13km" \
-"RRFS_CONUS_3km" \
-"RRFS_SUBCONUS_3km" \
-"GSD_RAP13km" \
-)
 valid_vals_CCPP_PHYS_SUITE=( \
 "FV3_CPT_v0" \
 "FV3_GFS_2017_gfdlmp" \