[develop] Deprecate the CYCL_HRS configuration setting.

docs/UsersGuide/source/BuildRunSRW.rst

@@ -534,7 +534,7 @@ settings. There is usually no need for a user to modify the default configuratio
    |                      | EXTRN_MDL_ICS_VAR_DEFNS_FN, EXTRN_MDL_LBCS_VAR_DEFNS_FN,     |
    |                      | WFLOW_LAUNCH_SCRIPT_FN, WFLOW_LAUNCH_LOG_FN                  |
    +----------------------+--------------------------------------------------------------+
-   | Forecast             | DATE_FIRST_CYCL, DATE_LAST_CYCL, CYCL_HRS, INCR_CYCL_FREQ,   |
+   | Forecast             | DATE_FIRST_CYCL, DATE_LAST_CYCL, INCR_CYCL_FREQ,             |
    |                      | FCST_LEN_HRS                                                 |
    +----------------------+--------------------------------------------------------------+
    | IC/LBC               | EXTRN_MDL_NAME_ICS, EXTRN_MDL_NAME_LBCS,                     |
@@ -724,11 +724,9 @@ The user must specify certain basic information about the experiment in a ``conf
    +--------------------------------+-------------------+----------------------------------------------------------------------------------+
    | LBC_SPEC_INTVL_HRS             | "6"               | "6"                                                                              |
    +--------------------------------+-------------------+----------------------------------------------------------------------------------+
-   | DATE_FIRST_CYCL                | "YYYYMMDD"        | "20190615"                                                                       |
+   | DATE_FIRST_CYCL                | "YYYYMMDDHH"      | "2019061518"                                                                     |
    +--------------------------------+-------------------+----------------------------------------------------------------------------------+
-   | DATE_LAST_CYCL                 | "YYYYMMDD"        | "20190615"                                                                       |
-   +--------------------------------+-------------------+----------------------------------------------------------------------------------+
-   | CYCL_HRS                       | ("HH1" "HH2")     | "18"                                                                             |
+   | DATE_LAST_CYCL                 | "YYYYMMDDHH"      | "2019061518"                                                                     |
    +--------------------------------+-------------------+----------------------------------------------------------------------------------+
    | EXTRN_MDL_NAME_ICS             | "FV3GFS"          | "FV3GFS"                                                                         |
    +--------------------------------+-------------------+----------------------------------------------------------------------------------+

docs/UsersGuide/source/ConfigWorkflow.rst

@@ -248,14 +248,11 @@ File Name Parameters
 
 Forecast Parameters
 ===================
-``DATE_FIRST_CYCL``: (Default: "YYYYMMDD")
-   Starting date of the first forecast in the set of forecasts to run. Format is "YYYYMMDD". Note that this does not include the hour of the day.
+``DATE_FIRST_CYCL``: (Default: "YYYYMMDDHH")
+   Starting date of the first forecast in the set of forecasts to run. Format is "YYYYMMDDHH".
 
-``DATE_LAST_CYCL``: (Default: "YYYYMMDD")
-   Starting date of the last forecast in the set of forecasts to run. Format is "YYYYMMDD". Note that this does not include the hour of the day.
-
-``CYCL_HRS``: (Default: ( "HH1" "HH2" ))
-   An array containing the hours of the day at which to launch forecasts. Forecasts are launched at these hours on each day from ``DATE_FIRST_CYCL`` to ``DATE_LAST_CYCL``, inclusive. Each element of this array must be a two-digit string representing an integer that is less than or equal to 23 (e.g., "00", "03", "12", "23").
+``DATE_LAST_CYCL``: (Default: "YYYYMMDDHH")
+   Starting date of the last forecast in the set of forecasts to run. Format is "YYYYMMDDHH".
 
 ``INCR_CYCL_FREQ``: (Default: "24")
    Increment in hours for cycle frequency (cycl_freq). The default is "24", which means cycl_freq=24:00:00.

docs/UsersGuide/source/Graphics.rst

@@ -235,7 +235,7 @@ in the batch scripts:
 
 .. code-block:: console
 
-   export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS}
+   export CDATE=${DATE_FIRST_CYCL}
 
 This sets ``CDATE`` to the first cycle in the set of cycles that the experiment has run. If the
 experiment contains multiple cycles and the user wants to plot output from a cycle other than 

docs/UsersGuide/source/InputOutputFiles.rst

@@ -313,7 +313,7 @@ from 20190615 at 18 UTC. FV3GFS GRIB2 files are the default model and file forma
 
 Running the App for Different Dates
 -----------------------------------
-If users want to run the SRW Application for dates other than June 15-16, 2019, they will need to modify the ``config.sh`` settings, including the ``DATE_FIRST_CYCL``, ``DATE_LAST_CYCL``, and ``CYCL_HRS`` variables. The forecast length can be modified by changing the ``FCST_LEN_HRS``. In addition, the lateral boundary interval can be specified using the ``LBC_SPEC_INTVL_HRS`` variable.
+If users want to run the SRW Application for dates other than June 15-16, 2019, they will need to modify the ``config.sh`` settings, including the ``DATE_FIRST_CYCL`` and ``DATE_LAST_CYCL`` variables. The forecast length can be modified by changing the ``FCST_LEN_HRS``. In addition, the lateral boundary interval can be specified using the ``LBC_SPEC_INTVL_HRS`` variable.
 
 Users will need to ensure that the initial and lateral boundary condition files are available
 in the specified path for their new date, cycle, and forecast length.

docs/UsersGuide/source/Introduction.rst

@@ -378,9 +378,8 @@ Once the Rocoto workflow is launched, several files and directories are generate
    |                           | simultaneously for each cycle in the experiment. Cycle directories |
    |                           | are created to contain cycle-specific files for each cycle that    |
    |                           | the experiment runs. If ``DATE_FIRST_CYCL`` and ``DATE_LAST_CYCL`` |
-   |                           | are different, and/or if ``CYCL_HRS`` contains more than one       |
-   |                           | element in the ``config.sh`` file, more than one cycle directory   |
-   |                           | will be created under the experiment directory.                    |
+   |                           | are different in the ``config.sh`` file, more than one cycle       |
+   |                           | directory will be created under the experiment directory.          |
    +---------------------------+--------------------------------------------------------------------+
    | grid                      | Directory generated by the ``make_grid`` task to store grid files  |
    |                           | for the experiment                                                 |

docs/UsersGuide/source/WE2Etests.rst

@@ -222,7 +222,6 @@ The rows of the file/sheet represent the full set of available tests (not just t
   |  ``EXTRN_MDL_NAME_LBCS``
   |  ``DATE_FIRST_CYCL``
   |  ``DATE_LAST_CYCL``
-  |  ``CYCL_HRS``
   |  ``INCR_CYCL_FREQ``
   |  ``FCST_LEN_HRS``
   |  ``DT_ATMOS``

docs/UsersGuide/source/tables/Tests.csv

@@ -1,30 +1,30 @@
-Test Name,PREDEF_GRID_NAME,CCPP_PHYS_SUITE,EXTRN_MDL_NAME_ICS,EXTRN_MDL_NAME_LBCS,DATES (UTC),CYCL_HRS (UTC),FCST_LEN_HRS (hrs),DT_ATMOS (s)
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16,RRFS_CONUS_25km,GFS_v16,FV3GFS,FV3GFS,20190701,0,6,40
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16,RRFS_CONUS_13km,GFS_v16,FV3GFS,FV3GFS,20190701,0,6,45
-grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16,SUBCONUS_Ind_3km,GFS_v16,FV3GFS,FV3GFS,20190615,18,6,40
-grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta,SUBCONUS_Ind_3km,RRFS_v1beta,HRRR,RAP,20200801,0,6,40
-grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR,SUBCONUS_Ind_3km,HRRR,HRRR,RAP,20200810,0,6,40
-grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0,SUBCONUS_Ind_3km,WoFS,HRRR,RAP,20200801,0,6,40
-grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16,RRFS_CONUS_3km,GFS_v16,FV3GFS,FV3GFS,20190701,0,6,36
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta,RRFS_CONUScompact_25km,RRFS_v1beta,HRRR,RAP,20200810,0,3,40
-grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta,RRFS_CONUScompact_13km,RRFS_v1beta,HRRR,RAP,20200801,0,6,45
-grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta,RRFS_CONUScompact_3km,RRFS_v1beta,HRRR,RAP,20200801,0,6,40
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR,RRFS_CONUScompact_25km,HRRR,HRRR,RAP,20200810,0,6,40
-grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR,RRFS_CONUScompact_13km,HRRR,HRRR,RAP,20200810,0,6,45
-grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR,RRFS_CONUScompact_3km,HRRR,HRRR,RAP,20200810,0,6,40
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta,RRFS_CONUS_25km,RRFS_v1beta,FV3GFS,FV3GFS,20190701,0,6,40
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR,RRFS_CONUS_25km,HRRR,FV3GFS,FV3GFS,20190701,0,6,40
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta,RRFS_CONUS_13km,RRFS_v1beta,FV3GFS,FV3GFS,20190701,0,6,45
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR,RRFS_CONUS_13km,HRRR,FV3GFS,FV3GFS,20190701,0,6,45
-grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta,RRFS_CONUS_3km,RRFS_v1beta,FV3GFS,FV3GFS,20190701,0,6,36
-grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR,RRFS_CONUS_3km,HRRR,FV3GFS,FV3GFS,20190701,0,6,36
-community_ensemble_008mems,RRFS_CONUS_25km,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,"20190701, 20190702","00,12",6,40
-community_ensemble_2mems,RRFS_CONUS_25km,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,"20190701, 20190702","00,12",6,40
-deactivate_tasks,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,20190701,0,6,40
-inline_post,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,20190701,0,6,40
-MET_ensemble_verification,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,20190615,0,6,40
-MET_verification,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,20190615,0,6,40
-custom_ESGgrid,N/A,FV3_GFS_2017_gfdlmp_regional,FV3GFS,FV3GFS,20190701,0,6,40
-custom_GFDLgrid,N/A,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,20190701,0,6,100
-custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE,N/A,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,20190701,0,6,100
-custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE,N/A,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,20190701,0,6,100
+Test Name,PREDEF_GRID_NAME,CCPP_PHYS_SUITE,EXTRN_MDL_NAME_ICS,EXTRN_MDL_NAME_LBCS,DATES (UTC),FCST_LEN_HRS (hrs),DT_ATMOS (s)
+grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16,RRFS_CONUS_25km,GFS_v16,FV3GFS,FV3GFS,2019070100,6,40
+grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16,RRFS_CONUS_13km,GFS_v16,FV3GFS,FV3GFS,2019070100,6,45
+grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16,SUBCONUS_Ind_3km,GFS_v16,FV3GFS,FV3GFS,2019061518,6,40
+grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta,SUBCONUS_Ind_3km,RRFS_v1beta,HRRR,RAP,2020080100,6,40
+grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR,SUBCONUS_Ind_3km,HRRR,HRRR,RAP,2020081000,6,40
+grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0,SUBCONUS_Ind_3km,WoFS,HRRR,RAP,2020080100,6,40
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16,RRFS_CONUS_3km,GFS_v16,FV3GFS,FV3GFS,2019070100,6,36
+grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta,RRFS_CONUScompact_25km,RRFS_v1beta,HRRR,RAP,2020081000,3,40
+grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta,RRFS_CONUScompact_13km,RRFS_v1beta,HRRR,RAP,2020080100,6,45
+grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta,RRFS_CONUScompact_3km,RRFS_v1beta,HRRR,RAP,2020080100,6,40
+grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR,RRFS_CONUScompact_25km,HRRR,HRRR,RAP,2020081000,6,40
+grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR,RRFS_CONUScompact_13km,HRRR,HRRR,RAP,2020081000,6,45
+grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR,RRFS_CONUScompact_3km,HRRR,HRRR,RAP,2020081000,6,40
+grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta,RRFS_CONUS_25km,RRFS_v1beta,FV3GFS,FV3GFS,2019070100,6,40
+grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR,RRFS_CONUS_25km,HRRR,FV3GFS,FV3GFS,2019070100,6,40
+grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta,RRFS_CONUS_13km,RRFS_v1beta,FV3GFS,FV3GFS,2019070100,6,45
+grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR,RRFS_CONUS_13km,HRRR,FV3GFS,FV3GFS,2019070100,6,45
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta,RRFS_CONUS_3km,RRFS_v1beta,FV3GFS,FV3GFS,2019070100,6,36
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR,RRFS_CONUS_3km,HRRR,FV3GFS,FV3GFS,2019070100,6,36
+community_ensemble_008mems,RRFS_CONUS_25km,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,"2019070100, 2019070112, 2019070200, 2019070212",6,40
+community_ensemble_2mems,RRFS_CONUS_25km,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,"2019070100, 2019070112, 2019070200, 2019070212",6,40
+deactivate_tasks,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019070100,6,40
+inline_post,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019070100,6,40
+MET_ensemble_verification,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019061500,6,40
+MET_verification,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019061500,6,40
+custom_ESGgrid,N/A,FV3_GFS_2017_gfdlmp_regional,FV3GFS,FV3GFS,2019070100,6,40
+custom_GFDLgrid,N/A,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,2019070100,6,100
+custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE,N/A,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,2019070100,6,100
+custom_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE,N/A,FV3_GFS_2017_gfdlmp,FV3GFS,FV3GFS,2019070100,6,100

parm/FV3LAM_wflow.xml

@@ -148,13 +148,9 @@ tasks; and the "FCST" type is used for the RUN_FCST_TN task.
 <workflow realtime="F" scheduler="&SCHED;" cyclethrottle="20">
 {# Double quotes are required inside the strftime! Expect an error from reading the template if using single quotes. #}
   <cycledef group="at_start">{{ cdate_first_cycl.strftime("%M %H %d %m %Y *") }}</cycledef>
-{% for c in cycl_hrs %}
   <cycledef group="forecast">
-  {%- set cdate_first=date_first_cycl ~ c ~ "00" -%}
-  {%- set cdate_last=date_last_cycl ~ c ~ "00" -%}
-  {{- cdate_first ~ " " ~ cdate_last ~ " " ~ cycl_freq -}}
+    {{- date_first_cycl ~ " " ~ date_last_cycl ~ " " ~ cycl_freq -}}
   </cycledef>
-{%- endfor %}
 
   <log>
   {%- if run_envir == "nco"  %}

scripts/exregional_make_ics.sh

@@ -601,7 +601,7 @@ if [ "${USE_FVCOM}" = "TRUE" ]; then
 #Format for fvcom_time: YYYY-MM-DDTHH:00:00.000000
   fvcom_exec_fn="fvcom_to_FV3"
   fvcom_exec_fp="$EXECdir/${fvcom_exec_fn}"
-  fvcom_time="${DATE_FIRST_CYCL:0:4}-${DATE_FIRST_CYCL:4:2}-${DATE_FIRST_CYCL:6:2}T${CYCL_HRS[0]}:00:00.000000"
+  fvcom_time="${DATE_FIRST_CYCL:0:4}-${DATE_FIRST_CYCL:4:2}-${DATE_FIRST_CYCL:6:2}T${DATE_FIRST_CYCL:8:2}:00:00.000000"
   if [ ! -f "${fvcom_exec_fp}" ]; then
     print_err_msg_exit "\
 The executable (fvcom_exec_fp) for processing FVCOM data onto FV3-LAM

tests/WE2E/get_WE2Etest_names_subdirs_descs.sh

@@ -929,7 +929,6 @@ they correspond to unique test names and rerun."
                       "EXTRN_MDL_NAME_LBCS" \
                       "DATE_FIRST_CYCL" \
                       "DATE_LAST_CYCL" \
-                      "CYCL_HRS" \
                       "INCR_CYCL_FREQ" \
                       "FCST_LEN_HRS" \
                       "LBC_SPEC_INTVL_HRS" \
@@ -1051,17 +1050,17 @@ configuration files of the primary WE2E tests...
 #    to cover those cases.
 #
 # 2) The double quotes (which need to be escaped here, i.e. \") are needed
-#    so that for any experiment variables that are arrays, all the elements 
-#    of the array are combined together and treated as a single element.  
-#    If the experiment variable is CYCL_HRS (cycle hours) and is set to
-#    the array ("00" "12"), we want the value saved in the local array
-#    here to be a single element consisting of "00 12".  Otherwise, "00" 
-#    and "12" will be treated as separate elements, and more than one 
-#    element would be added to the array (which would be incorrect here).
+#    so that for any experiment variables that are arrays, all the elements of
+#    the array are combined together and treated as a single element.  For
+#    example, if a variable CYCL_HRS is set to the array ("00" "12"), we want
+#    the value saved in the local array here to be a single element consisting
+#    of "00 12".  Otherwise, "00" and "12" will be treated as separate
+#    elements, and more than one element would be added to the array (which
+#    would be incorrect here).
 #
 # 3) The single quote (which needs to be escaped here, i.e. \') is needed
-#    so that any numbers (e.g. a set of cycle hours such as "00 12") are 
-#    treated as strings when the CSV file is opened in Google Sheets.  
+#    so that any numbers (e.g. a set of cycle hours such as "00 12") are
+#    treated as strings when the CSV file is opened in Google Sheets.
 #    If this is not done, Google Sheets will remove leading zeros.
 #
           var_name_at="${var_name}[@]"
@@ -1074,12 +1073,14 @@ configuration files of the primary WE2E tests...
 # Calculate the number of forecasts that will be launched by the current
 # test.  The "10#" forces bash to treat the following number as a decimal
 # (not hexadecimal, etc).  Note that INCR_CYCL_FREQ is in units of hours,
-# so the factor of 24 is needed to convert the number of days to hours.
-#
-      num_cycles_per_day=${#CYCL_HRS[@]}
-      num_days=$(( (${DATE_LAST_CYCL} - ${DATE_FIRST_CYCL} + 1)*24/10#${INCR_CYCL_FREQ} ))
-      num_cdates=$(( ${num_cycles_per_day}*${num_days} ))
-      nf=$(( ${num_cdates}*10#${NUM_ENS_MEMBERS} ))
+# so the factor of 3600 is needed to convert the number of seconds to hours.
+#
+      # Convert cycles to seconds
+      first=$(date --utc --date "${DATE_FIRST_CYCL:0:8} ${DATE_FIRST_CYCL:8:2}" +"%s")
+      last=$(date --utc --date "${DATE_LAST_CYCL:0:8} ${DATE_LAST_CYCL:8:2}" +"%s")
+      # Diff and convert seconds to number of cycles where freq is in
+      # hours
+      nf=$(( ($last - $first) / 3600 / 10#${INCR_CYCL_FREQ} ))
 #
 # Save the number of forecasts launched by the current test in an 
 # appropriately named array.  In the following, the single quote at the