From e7d25620b7b52f4a740eab7c942f304e9e1d5c52 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Tue, 11 Oct 2022 21:59:50 +0000 Subject: [PATCH 1/9] Deprecating CYCL_HRS Changes were made to all config files and scripts to use FIRST and LAST cycle definitions to accept the cycle HH, and frequency will start from those for all relevant computation. --- scripts/exregional_make_ics.sh | 2 +- .../WE2E/get_WE2Etest_names_subdirs_descs.sh | 33 ++++----- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...cs_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml | 6 +- ..._FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml | 6 +- ...GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp.yaml | 6 +- ...FV3GFS_suite_GFS_2017_gfdlmp_regional.yaml | 6 +- ...cs_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...5km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml | 6 +- ..._FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml | 6 +- ...S_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR.yaml | 6 +- ...GFS_lbcs_GSMGFS_suite_GFS_2017_gfdlmp.yaml | 6 +- ...cs_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2.yaml | 6 +- ..._ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v16.yaml | 6 +- ...ONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.yaml | 6 +- ...km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.yaml | 6 +- ...FS_suite_GFS_v15_thompson_mynn_lam3km.yaml | 6 +- ...cs_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml | 6 +- ..._FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...act_13km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml | 6 +- ...m_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...ct_25km_ics_HRRR_lbcs_HRRR_suite_HRRR.yaml | 6 +- ..._ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta.yaml | 6 +- ...act_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml | 6 +- ...m_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml | 6 +- ...pact_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml | 6 +- ...m_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml | 6 +- ..._FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml | 6 +- ..._FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ..._Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml | 6 +- ...m_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml | 6 +- ..._ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml | 6 +- ...FS_suite_GFS_v15_thompson_mynn_lam3km.yaml | 6 +- ...act_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml | 6 +- .../config.GST_release_public_v1.yaml | 6 +- .../config.MET_ensemble_verification.yaml | 6 +- .../config.MET_verification.yaml | 6 +- .../config.community_ensemble_008mems.yaml | 8 +-- .../config.community_ensemble_2mems.yaml | 8 +-- ...config.community_ensemble_2mems_stoch.yaml | 6 +- .../wflow_features/config.custom_ESGgrid.yaml | 6 +- .../config.custom_GFDLgrid.yaml | 6 +- ...d_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE.yaml | 6 +- ...id_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE.yaml | 6 +- .../config.deactivate_tasks.yaml | 6 +- ...3GFS_lbcs_FV3GFS_fmt_grib2_2019061200.yaml | 6 +- ...3GFS_lbcs_FV3GFS_fmt_grib2_2019101818.yaml | 6 +- ...3GFS_lbcs_FV3GFS_fmt_grib2_2020022518.yaml | 6 +- ...3GFS_lbcs_FV3GFS_fmt_grib2_2020022600.yaml | 6 +- ...3GFS_lbcs_FV3GFS_fmt_grib2_2021010100.yaml | 6 +- ...PSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml | 6 +- ...GFS_lbcs_FV3GFS_fmt_nemsio_2019061200.yaml | 6 +- ...GFS_lbcs_FV3GFS_fmt_nemsio_2019101818.yaml | 6 +- ...GFS_lbcs_FV3GFS_fmt_nemsio_2020022518.yaml | 6 +- ...GFS_lbcs_FV3GFS_fmt_nemsio_2020022600.yaml | 6 +- ...GFS_lbcs_FV3GFS_fmt_nemsio_2021010100.yaml | 6 +- ...GFS_lbcs_FV3GFS_fmt_netcdf_2021062000.yaml | 6 +- ...lbcs_FV3GFS_fmt_netcdf_2022060112_48h.yaml | 6 +- ....get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS.yaml | 6 +- ...onfig.get_from_HPSS_ics_HRRR_lbcs_RAP.yaml | 6 +- ...config.get_from_HPSS_ics_RAP_lbcs_RAP.yaml | 6 +- ...ADS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml | 6 +- .../wflow_features/config.inline_post.yaml | 6 +- .../wflow_features/config.nco_ensemble.yaml | 8 +-- .../config.pregen_grid_orog_sfc_climo.yaml | 6 +- .../config.specify_DOT_OR_USCORE.yaml | 6 +- ....specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE.yaml | 6 +- ...specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS.yaml | 6 +- .../config.specify_RESTART_INTERVAL.yaml | 6 +- .../config.specify_template_filenames.yaml | 6 +- .../wflow_features/config.subhourly_post.yaml | 6 +- .../config.subhourly_post_ensemble_2mems.yaml | 6 +- ush/Python/qsub_job.sh | 2 +- ush/Python/qsub_job_diff.sh | 2 +- ush/Python/sq_job.sh | 2 +- ush/Python/sq_job_diff.sh | 2 +- ush/cmp_expt_to_baseline.sh | 2 +- ush/config.community.yaml | 6 +- ush/config.nco.yaml | 6 +- ush/config_defaults.yaml | 23 +++---- ush/python_utils/test_data/var_defns.sh | 5 +- ush/set_cycle_dates.py | 55 ++++++--------- ush/setup.py | 67 +++---------------- ush/wrappers/run_fcst.sh | 2 +- ush/wrappers/run_get_ics.sh | 2 +- ush/wrappers/run_get_lbcs.sh | 2 +- ush/wrappers/run_gridensvx.sh | 4 +- ush/wrappers/run_gridvx.sh | 4 +- ush/wrappers/run_make_grid.sh | 2 +- ush/wrappers/run_make_ics.sh | 2 +- ush/wrappers/run_make_lbcs.sh | 2 +- ush/wrappers/run_make_orog.sh | 2 +- ush/wrappers/run_make_sfc_climo.sh | 2 +- ush/wrappers/run_pointensvx.sh | 4 +- ush/wrappers/run_pointvx.sh | 4 +- ush/wrappers/run_post.sh | 4 +- 111 files changed, 258 insertions(+), 501 deletions(-) diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh index ab78f4bb78..5c2d6c393a 100755 --- a/scripts/exregional_make_ics.sh +++ b/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 diff --git a/tests/WE2E/get_WE2Etest_names_subdirs_descs.sh b/tests/WE2E/get_WE2Etest_names_subdirs_descs.sh index 1222a63a76..04248a7615 100755 --- a/tests/WE2E/get_WE2Etest_names_subdirs_descs.sh +++ b/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 diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 4212c5edc3..6db673ff7a 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -8,10 +8,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index fe94a9f456..cfc8c9022e 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -8,10 +8,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index bf49c994bc..448d147b2a 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 3366d145ea..3f23a3634b 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml index 449e65ed06..4cdda3773d 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 90ecb7f02a..5d1047a399 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml index aed5c3ff37..74fc5dc55b 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml index cda8ab16aa..e682260e7d 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp.yaml index d2ed1f4bc8..10fcfc4705 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional.yaml index 9217180e42..9e0720319d 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp_regional - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml index 3c311a6624..a4e561bf44 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 45588d779f..2f75756cde 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml index 785bba261b..06c7a8e8ea 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml index d213f36e1b..a4f951174e 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR.yaml index 2055b56846..d2c63d16a8 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR.yaml @@ -11,10 +11,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_2017_gfdlmp.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_2017_gfdlmp.yaml index e94f0f6dc7..6638c5698a 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_2017_gfdlmp.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_2017_gfdlmp.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - DATE_FIRST_CYCL: '20190520' - DATE_LAST_CYCL: '20190520' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019052000' + DATE_LAST_CYCL: '2019052000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2.yaml index 197c0e9fce..905a321ef8 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190520' - DATE_LAST_CYCL: '20190520' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019052000' + DATE_LAST_CYCL: '2019052000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v16.yaml index 3a3f2b8b96..3d212cce95 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190520' - DATE_LAST_CYCL: '20190520' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019052000' + DATE_LAST_CYCL: '2019052000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.yaml index 5122bd7012..10e209af3e 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20210615' - DATE_LAST_CYCL: '20210615' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2021061500' + DATE_LAST_CYCL: '2021061500' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.yaml index a813a1129f..ea88871abc 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20210615' - DATE_LAST_CYCL: '20210615' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2021061500' + DATE_LAST_CYCL: '2021061500' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km.yaml index 94700fac99..61e66aa422 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15_thompson_mynn_lam3km - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml index 3d2d26c022..5ab1079d34 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index a2b7fb31a4..cfa905f250 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml index 6a5d240303..9c64581c41 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml index 202e542c80..1cd8234708 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 8d28c47e84..2c7f2a9902 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml index 776bf91700..d01a2ba1cb 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml @@ -8,10 +8,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml index 1b9a269d22..8dd3ba2ae2 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20200801' - DATE_LAST_CYCL: '20200801' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020080100' + DATE_LAST_CYCL: '2020080100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 9e41ccb973..7632d6234f 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR.yaml index e0a6a0687c..a68751923e 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 24 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta.yaml index 40f1ceadba..e4feb98a39 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 24 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml index 477bc77dab..b255e5b12e 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml index 87140b99ef..fbffddf60d 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 0c366e0d90..bb1b456c27 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml index 263fdf941d..4b3180596e 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20200801' - DATE_LAST_CYCL: '20200801' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020080100' + DATE_LAST_CYCL: '2020080100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml index 6857504f7a..56f1452b3b 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml index 8423600ce4..2eee7019b4 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml @@ -8,10 +8,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20200801' - DATE_LAST_CYCL: '20200801' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020080100' + DATE_LAST_CYCL: '2020080100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml index 8fa62695ce..662116f2b2 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml @@ -10,10 +10,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml index d51e59550e..8b6da1b2a6 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml @@ -10,10 +10,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 9831759b20..a51bcbb346 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml index 7d712e0d33..6842aa2100 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml @@ -8,10 +8,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20200801' - DATE_LAST_CYCL: '20200801' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020080100' + DATE_LAST_CYCL: '2020080100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 078576272a..971b2d3d54 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190615' - DATE_LAST_CYCL: '20190615' - CYCL_HRS: - - 18 + DATE_FIRST_CYCL: '2019061518' + DATE_LAST_CYCL: '2019061518' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml index 3237b6c53d..199eb388e3 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml index 00b45f1ef1..a025df00e4 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20200801' - DATE_LAST_CYCL: '20200801' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020080100' + DATE_LAST_CYCL: '2020080100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml index 33d5345776..ba302d8e67 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: nco workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190615' - DATE_LAST_CYCL: '20190615' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019061500' + DATE_LAST_CYCL: '2019061500' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename workflow_switches: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km.yaml index b99e27b26c..6f7e723756 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: nco workflow: CCPP_PHYS_SUITE: FV3_GFS_v15_thompson_mynn_lam3km - DATE_FIRST_CYCL: '20190615' - DATE_LAST_CYCL: '20190615' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019061500' + DATE_LAST_CYCL: '2019061500' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename workflow_switches: diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml index 62aa0df848..3519878448 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_nco/config.nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: nco workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename workflow_switches: diff --git a/tests/WE2E/test_configs/release_SRW_v1/config.GST_release_public_v1.yaml b/tests/WE2E/test_configs/release_SRW_v1/config.GST_release_public_v1.yaml index 498c0c7056..eb450a5a79 100644 --- a/tests/WE2E/test_configs/release_SRW_v1/config.GST_release_public_v1.yaml +++ b/tests/WE2E/test_configs/release_SRW_v1/config.GST_release_public_v1.yaml @@ -6,10 +6,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190615' - DATE_LAST_CYCL: '20190615' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019061500' + DATE_LAST_CYCL: '2019061500' FCST_LEN_HRS: 48 PREEXISTING_DIR_METHOD: rename task_run_fcst: diff --git a/tests/WE2E/test_configs/wflow_features/config.MET_ensemble_verification.yaml b/tests/WE2E/test_configs/wflow_features/config.MET_ensemble_verification.yaml index 277ab2e74f..45b98e2167 100644 --- a/tests/WE2E/test_configs/wflow_features/config.MET_ensemble_verification.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.MET_ensemble_verification.yaml @@ -8,10 +8,8 @@ platform: MODEL: FV3_GFS_v15p2_CONUS_25km workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190615' - DATE_LAST_CYCL: '20190615' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019061500' + DATE_LAST_CYCL: '2019061500' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename workflow_switches: diff --git a/tests/WE2E/test_configs/wflow_features/config.MET_verification.yaml b/tests/WE2E/test_configs/wflow_features/config.MET_verification.yaml index 34785cf25c..178cba9c6f 100644 --- a/tests/WE2E/test_configs/wflow_features/config.MET_verification.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.MET_verification.yaml @@ -8,10 +8,8 @@ platform: MODEL: FV3_GFS_v15p2_CONUS_25km workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190615' - DATE_LAST_CYCL: '20190615' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019061500' + DATE_LAST_CYCL: '2019061500' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename workflow_switches: diff --git a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_008mems.yaml b/tests/WE2E/test_configs/wflow_features/config.community_ensemble_008mems.yaml index d1e7834674..b273aaf8cb 100644 --- a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_008mems.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.community_ensemble_008mems.yaml @@ -10,11 +10,9 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190702' - CYCL_HRS: - - 0 - - 12 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070212' + INCR_CYCL_FREQ: 12 FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems.yaml b/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems.yaml index 3e7ecd221e..7646a8f3bf 100644 --- a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems.yaml @@ -13,11 +13,9 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190702' - CYCL_HRS: - - 0 - - 12 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070212' + INCR_CYCL_FREQ: 12 FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems_stoch.yaml b/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems_stoch.yaml index b9cf2549a9..67bc91e71b 100644 --- a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems_stoch.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems_stoch.yaml @@ -11,10 +11,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_run_fcst: diff --git a/tests/WE2E/test_configs/wflow_features/config.custom_ESGgrid.yaml b/tests/WE2E/test_configs/wflow_features/config.custom_ESGgrid.yaml index 28b65eb0ed..f331b6ff63 100644 --- a/tests/WE2E/test_configs/wflow_features/config.custom_ESGgrid.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.custom_ESGgrid.yaml @@ -8,10 +8,8 @@ user: workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp_regional GRID_GEN_METHOD: ESGgrid - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_make_grid: diff --git a/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.yaml b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.yaml index c2d9d82358..ea65ee6b6b 100644 --- a/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.yaml @@ -20,10 +20,8 @@ user: workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp GRID_GEN_METHOD: GFDLgrid - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_make_grid: diff --git a/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE.yaml b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE.yaml index 332d54e507..debc4439c7 100644 --- a/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE.yaml @@ -12,10 +12,8 @@ user: workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp GRID_GEN_METHOD: GFDLgrid - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_make_grid: diff --git a/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE.yaml b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE.yaml index e43e0d240c..3f3cb93acc 100644 --- a/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE.yaml @@ -12,10 +12,8 @@ user: workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp GRID_GEN_METHOD: GFDLgrid - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_make_grid: diff --git a/tests/WE2E/test_configs/wflow_features/config.deactivate_tasks.yaml b/tests/WE2E/test_configs/wflow_features/config.deactivate_tasks.yaml index d2455a1c08..f6758dc15d 100644 --- a/tests/WE2E/test_configs/wflow_features/config.deactivate_tasks.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.deactivate_tasks.yaml @@ -20,10 +20,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename workflow_switches: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200.yaml index 8fd81b31ef..9861ea10ee 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200.yaml @@ -8,10 +8,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190612' - DATE_LAST_CYCL: '20190612' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019061200' + DATE_LAST_CYCL: '2019061200' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019101818.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019101818.yaml index 875bd0871d..cad54c746b 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019101818.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019101818.yaml @@ -10,10 +10,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20191018' - DATE_LAST_CYCL: '20191018' - CYCL_HRS: - - 18 + DATE_FIRST_CYCL: '2019101818' + DATE_LAST_CYCL: '2019101818' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2020022518.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2020022518.yaml index 3beafca5bb..96bdf56151 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2020022518.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2020022518.yaml @@ -9,10 +9,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20200225' - DATE_LAST_CYCL: '20200225' - CYCL_HRS: - - 18 + DATE_FIRST_CYCL: '2020022518' + DATE_LAST_CYCL: '2020022518' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2020022600.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2020022600.yaml index 9da488d0ba..2b5e3ff026 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2020022600.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2020022600.yaml @@ -9,10 +9,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20200226' - DATE_LAST_CYCL: '20200226' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020022600' + DATE_LAST_CYCL: '2020022600' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2021010100.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2021010100.yaml index 027d4103a1..eae43995e6 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2021010100.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2021010100.yaml @@ -9,10 +9,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20210101' - DATE_LAST_CYCL: '20210101' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2021010100' + DATE_LAST_CYCL: '2021010100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml index 4a32b06949..825d6cf737 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200.yaml index f187395beb..fdcb63f6b2 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200.yaml @@ -8,10 +8,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190612' - DATE_LAST_CYCL: '20190612' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019061200' + DATE_LAST_CYCL: '2019061200' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019101818.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019101818.yaml index ea7ed80195..be3afcc55e 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019101818.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019101818.yaml @@ -10,10 +10,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20191018' - DATE_LAST_CYCL: '20191018' - CYCL_HRS: - - 18 + DATE_FIRST_CYCL: '2019101818' + DATE_LAST_CYCL: '2019101818' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2020022518.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2020022518.yaml index 43addb5d80..ab94e5f5d7 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2020022518.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2020022518.yaml @@ -9,10 +9,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20200225' - DATE_LAST_CYCL: '20200225' - CYCL_HRS: - - 18 + DATE_FIRST_CYCL: '2020022518' + DATE_LAST_CYCL: '2020022518' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2020022600.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2020022600.yaml index 26f733ff41..3fd247724f 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2020022600.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2020022600.yaml @@ -9,10 +9,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20200226' - DATE_LAST_CYCL: '20200226' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020022600' + DATE_LAST_CYCL: '2020022600' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021010100.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021010100.yaml index 3875c78bbe..2452697445 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021010100.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021010100.yaml @@ -9,10 +9,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20210101' - DATE_LAST_CYCL: '20210101' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2021010100' + DATE_LAST_CYCL: '2021010100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2021062000.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2021062000.yaml index e0a96c374c..0f169fe266 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2021062000.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2021062000.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20210620' - DATE_LAST_CYCL: '20210620' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2021062000' + DATE_LAST_CYCL: '2021062000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h.yaml index 861d222c0e..2beab31369 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20220601' - DATE_LAST_CYCL: '20220601' - CYCL_HRS: - - 12 + DATE_FIRST_CYCL: '2022060112' + DATE_LAST_CYCL: '2022060112' FCST_LEN_HRS: 48 PREEXISTING_DIR_METHOD: rename task_run_fcst: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS.yaml index feedeee067..2539a5a440 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - DATE_FIRST_CYCL: '20190520' - DATE_LAST_CYCL: '20190520' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019052000' + DATE_LAST_CYCL: '2019052000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_HRRR_lbcs_RAP.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_HRRR_lbcs_RAP.yaml index 2d8540e2d1..f8425df483 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_HRRR_lbcs_RAP.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_HRRR_lbcs_RAP.yaml @@ -9,10 +9,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200801' - DATE_LAST_CYCL: '20200801' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020080100' + DATE_LAST_CYCL: '2020080100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_RAP_lbcs_RAP.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_RAP_lbcs_RAP.yaml index 923fce480f..6599e5ca15 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_RAP_lbcs_RAP.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_RAP_lbcs_RAP.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20190520' - DATE_LAST_CYCL: '20190520' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019052000' + DATE_LAST_CYCL: '2019052000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml b/tests/WE2E/test_configs/wflow_features/config.get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml index fc0a3eba42..5ec180b13e 100644 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - DATE_FIRST_CYCL: '20200826' - DATE_LAST_CYCL: '20200826' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020082600' + DATE_LAST_CYCL: '2020082600' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml b/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml index 7a55883822..1c5a30a798 100644 --- a/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml @@ -6,10 +6,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.nco_ensemble.yaml b/tests/WE2E/test_configs/wflow_features/config.nco_ensemble.yaml index de4c7c414a..ce410707c0 100644 --- a/tests/WE2E/test_configs/wflow_features/config.nco_ensemble.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.nco_ensemble.yaml @@ -13,11 +13,9 @@ user: RUN_ENVIR: nco workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190702' - CYCL_HRS: - - 0 - - 12 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070212' + INCR_CYCL_FREQ: 12 FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename workflow_switches: diff --git a/tests/WE2E/test_configs/wflow_features/config.pregen_grid_orog_sfc_climo.yaml b/tests/WE2E/test_configs/wflow_features/config.pregen_grid_orog_sfc_climo.yaml index 2ff9af6a0c..9c0ea38c77 100644 --- a/tests/WE2E/test_configs/wflow_features/config.pregen_grid_orog_sfc_climo.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.pregen_grid_orog_sfc_climo.yaml @@ -6,10 +6,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename workflow_switches: diff --git a/tests/WE2E/test_configs/wflow_features/config.specify_DOT_OR_USCORE.yaml b/tests/WE2E/test_configs/wflow_features/config.specify_DOT_OR_USCORE.yaml index 45db52dd9b..54bfca45e7 100644 --- a/tests/WE2E/test_configs/wflow_features/config.specify_DOT_OR_USCORE.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.specify_DOT_OR_USCORE.yaml @@ -18,10 +18,8 @@ user: workflow: DOT_OR_USCORE: . CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - DATE_FIRST_CYCL: '20190520' - DATE_LAST_CYCL: '20190520' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019052000' + DATE_LAST_CYCL: '2019052000' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE.yaml b/tests/WE2E/test_configs/wflow_features/config.specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE.yaml index 0557e15941..94566e29d3 100644 --- a/tests/WE2E/test_configs/wflow_features/config.specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR - DATE_FIRST_CYCL: '20200801' - DATE_LAST_CYCL: '20200801' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020080100' + DATE_LAST_CYCL: '2020080100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS.yaml b/tests/WE2E/test_configs/wflow_features/config.specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS.yaml index 0e9414e3d3..2222127c3d 100644 --- a/tests/WE2E/test_configs/wflow_features/config.specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20210615' - DATE_LAST_CYCL: '20210615' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2021061500' + DATE_LAST_CYCL: '2021061500' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.specify_RESTART_INTERVAL.yaml b/tests/WE2E/test_configs/wflow_features/config.specify_RESTART_INTERVAL.yaml index 4fe820f9c2..9c974b8e7f 100644 --- a/tests/WE2E/test_configs/wflow_features/config.specify_RESTART_INTERVAL.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.specify_RESTART_INTERVAL.yaml @@ -7,10 +7,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.specify_template_filenames.yaml b/tests/WE2E/test_configs/wflow_features/config.specify_template_filenames.yaml index 448d3a81c1..289c63e2da 100644 --- a/tests/WE2E/test_configs/wflow_features/config.specify_template_filenames.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.specify_template_filenames.yaml @@ -11,10 +11,8 @@ workflow: MODEL_CONFIG_TMPL_FN: model_configure NEMS_CONFIG_TMPL_FN: nems.configure CCPP_PHYS_SUITE: FV3_GFS_v15p2 - DATE_FIRST_CYCL: '20190701' - DATE_LAST_CYCL: '20190701' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2019070100' + DATE_LAST_CYCL: '2019070100' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.subhourly_post.yaml b/tests/WE2E/test_configs/wflow_features/config.subhourly_post.yaml index 01094cc05b..5916ad4ca9 100644 --- a/tests/WE2E/test_configs/wflow_features/config.subhourly_post.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.subhourly_post.yaml @@ -6,10 +6,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/tests/WE2E/test_configs/wflow_features/config.subhourly_post_ensemble_2mems.yaml b/tests/WE2E/test_configs/wflow_features/config.subhourly_post_ensemble_2mems.yaml index 851843bc81..038b3d9466 100644 --- a/tests/WE2E/test_configs/wflow_features/config.subhourly_post_ensemble_2mems.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.subhourly_post_ensemble_2mems.yaml @@ -11,10 +11,8 @@ user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta - DATE_FIRST_CYCL: '20200810' - DATE_LAST_CYCL: '20200810' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2020081000' + DATE_LAST_CYCL: '2020081000' FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: diff --git a/ush/Python/qsub_job.sh b/ush/Python/qsub_job.sh index 6244b17e63..6a6b0833f1 100755 --- a/ush/Python/qsub_job.sh +++ b/ush/Python/qsub_job.sh @@ -31,7 +31,7 @@ SHAPE_FILES=/glade/p/ral/jntp/UFS_SRW_app/tools/NaturalEarth export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export FCST_START=3 export FCST_END=${FCST_LEN_HRS} export FCST_INC=3 diff --git a/ush/Python/qsub_job_diff.sh b/ush/Python/qsub_job_diff.sh index 798f742af4..e024958203 100755 --- a/ush/Python/qsub_job_diff.sh +++ b/ush/Python/qsub_job_diff.sh @@ -32,7 +32,7 @@ SHAPE_FILES=/glade/p/ral/jntp/UFS_SRW_app/tools/NaturalEarth export GLOBAL_VAR_DEFNS_FP="${EXPTDIR1}/var_defns.sh" source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export FCST_START=3 export FCST_END=${FCST_LEN_HRS} export FCST_INC=3 diff --git a/ush/Python/sq_job.sh b/ush/Python/sq_job.sh index aa54baf9e1..0c06369d29 100755 --- a/ush/Python/sq_job.sh +++ b/ush/Python/sq_job.sh @@ -52,7 +52,7 @@ SHAPE_FILES=/scratch2/BMC/det/UFS_SRW_app/v1p0/fix_files/NaturalEarth export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export FCST_START=6 export FCST_END=${FCST_LEN_HRS} export FCST_INC=6 diff --git a/ush/Python/sq_job_diff.sh b/ush/Python/sq_job_diff.sh index 64cad61f63..5f66a3d7d1 100755 --- a/ush/Python/sq_job_diff.sh +++ b/ush/Python/sq_job_diff.sh @@ -54,7 +54,7 @@ SHAPE_FILES=/scratch2/BMC/det/UFS_SRW_app/v1p0/fix_files/NaturalEarth export GLOBAL_VAR_DEFNS_FP="${EXPTDIR1}/var_defns.sh" source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export FCST_START=6 export FCST_END=${FCST_LEN_HRS} export FCST_INC=3 diff --git a/ush/cmp_expt_to_baseline.sh b/ush/cmp_expt_to_baseline.sh index c7eab46524..b75dce8517 100755 --- a/ush/cmp_expt_to_baseline.sh +++ b/ush/cmp_expt_to_baseline.sh @@ -92,7 +92,7 @@ fi #----------------------------------------------------------------------- # . ${expt_dir}/var_defns.sh -CDATE="${DATE_FIRST_CYCL[0]}${CYCL_HRS[0]}" +CDATE="${DATE_FIRST_CYCL}" # #----------------------------------------------------------------------- # diff --git a/ush/config.community.yaml b/ush/config.community.yaml index 65f3a998cc..5a13ffeb9d 100644 --- a/ush/config.community.yaml +++ b/ush/config.community.yaml @@ -15,10 +15,8 @@ platform: workflow: EXPT_SUBDIR: test_community CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20190615' - DATE_LAST_CYCL: '20190615' - CYCL_HRS: - - 18 + DATE_FIRST_CYCL: '2019061518' + DATE_LAST_CYCL: '2019061518' FCST_LEN_HRS: 12 PREEXISTING_DIR_METHOD: rename VERBOSE: true diff --git a/ush/config.nco.yaml b/ush/config.nco.yaml index 013c765d7d..eec2ac1765 100644 --- a/ush/config.nco.yaml +++ b/ush/config.nco.yaml @@ -10,10 +10,8 @@ workflow: CRON_RELAUNCH_INTVL_MNTS: 3 EXPT_SUBDIR: test_nco CCPP_PHYS_SUITE: FV3_GFS_v16 - DATE_FIRST_CYCL: '20220407' - DATE_LAST_CYCL: '20220407' - CYCL_HRS: - - 0 + DATE_FIRST_CYCL: '2022040700' + DATE_LAST_CYCL: '2022040700' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename VERBOSE: true diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index c3d1608e9f..27bc11199d 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -586,22 +586,20 @@ workflow: # Set forecast parameters. Definitions: # # DATE_FIRST_CYCL: - # 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-day. + # Starting cycle date of the FIRST forecast in the set of forecasts to + # run. Format is "YYYYMMDDHH". Note: This has recently changed to + # include the first cycle hour. # # DATE_LAST_CYCL: - # 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-day. + # Starting cylce date of the LAST forecast in the set of forecasts to run. + # Format is "YYYYMMDDHH". Note: This has recently changed to include + # the last cycle hour. # # CYCL_HRS: - # 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". + # Deprecated. # # INCR_CYCL_FREQ: - # Increment in hours for Cycle Frequency (cycl_freq). + # Increment in hours for Rocoto cycle frequency. # Default is 24, which means cycle_freq=24:00:00 # # FCST_LEN_HRS: @@ -609,9 +607,8 @@ workflow: # #----------------------------------------------------------------------- # - DATE_FIRST_CYCL: "YYYYMMDD" - DATE_LAST_CYCL: "YYYYMMDD" - CYCL_HRS: [ "HH1", "HH2" ] + DATE_FIRST_CYCL: "YYYYMMDDHH" + DATE_LAST_CYCL: "YYYYMMDDHH" INCR_CYCL_FREQ: 24 FCST_LEN_HRS: 24 # diff --git a/ush/python_utils/test_data/var_defns.sh b/ush/python_utils/test_data/var_defns.sh index c2937c56b9..4790a65976 100644 --- a/ush/python_utils/test_data/var_defns.sh +++ b/ush/python_utils/test_data/var_defns.sh @@ -1,6 +1,5 @@ RUN_ENVIR="nco" MACHINE="hera" -DATE_FIRST_CYCL="20210210" -DATE_LAST_CYCL="20210210" -CYCL_HRS="12" +DATE_FIRST_CYCL="2021021012" +DATE_LAST_CYCL="2021021012" FCST_LEN_HRS="12" diff --git a/ush/set_cycle_dates.py b/ush/set_cycle_dates.py index 7138cfe5b5..60657e042b 100644 --- a/ush/set_cycle_dates.py +++ b/ush/set_cycle_dates.py @@ -6,58 +6,41 @@ from python_utils import print_input_args, print_err_msg_exit -def set_cycle_dates(date_start, date_end, cycle_hrs, incr_cycl_freq): - """This file defines a function that, given the starting date (date_start, - in the form YYYYMMDD), the ending date (date_end, in the form YYYYMMDD), - and an array containing the cycle hours for each day (whose elements - have the form HH), returns an array of cycle date-hours whose elements - have the form YYYYMMDD. Here, YYYY is a four-digit year, MM is a two- - digit month, DD is a two-digit day of the month, and HH is a two-digit - hour of the day. +def set_cycle_dates(date_start, date_end, incr_cycl_freq): + """This file defines a function that, given the start and end dates + as date time objects, and a cycling frequency, returns an array of + cycle date-hours whose elements have the form YYYYMMDDHH. Here, + YYYY is a four-digit year, MM is a two- digit month, DD is a + two-digit day of the month, and HH is a two-digit hour of the day. Args: - date_start: start date - date_end: end date - cycle_hrs: [ HH0, HH1, ...] - incr_cycl_freq: cycle frequency increment in hours + date_start: start date, datetime object + date_end: end date, datetime object + incr_cycl_freq: cycle frequency increment in hours, an int Returns: A list of dates in a format YYYYMMDDHH """ print_input_args(locals()) - # calculate date increment - if incr_cycl_freq <= 24: - incr_days = 1 - else: - incr_days = incr_cycl_freq // 24 - if incr_cycl_freq % 24 != 0: - print_err_msg_exit( - f''' - INCR_CYCL_FREQ is not divided by 24: - INCR_CYCL_FREQ = \"{incr_cycl_freq}\"''' - ) + freq_delta = timedelta(hours=incr_cycl_freq) - # iterate over days and cycles + # iterate over cycles all_cdates = [] - d = date_start - while d <= date_end: - for c in cycle_hrs: - dc = d + timedelta(hours=c) - v = datetime.strftime(dc, "%Y%m%d%H") - all_cdates.append(v) - d += timedelta(days=incr_days) - + cdate = date_start + while cdate <= date_end: + cyc = datetime.strftime(cdate, "%Y%m%d%H") + all_cdates.append(cyc) + cdate += freq_delta return all_cdates class Testing(unittest.TestCase): def test_set_cycle_dates(self): cdates = set_cycle_dates( - date_start=datetime(2022, 1, 1), - date_end=datetime(2022, 1, 4), - cycle_hrs=[6, 12], - incr_cycl_freq=48, + date_start=datetime(2022, 1, 1, 6), + date_end=datetime(2022, 1, 4, 12), + incr_cycl_freq=6, ) self.assertEqual( cdates, ["2022010106", "2022010112", "2022010306", "2022010312"] diff --git a/ush/setup.py b/ush/setup.py index b3a58fa04a..310cc491bb 100644 --- a/ush/setup.py +++ b/ush/setup.py @@ -527,7 +527,7 @@ def get_location(xcs,fmt): # ----------------------------------------------------------------------- # # Check that DATE_FIRST_CYCL and DATE_LAST_CYCL are strings consisting - # of exactly 8 digits. + # of exactly 10 digits. # # ----------------------------------------------------------------------- # @@ -535,8 +535,9 @@ def get_location(xcs,fmt): print_err_msg_exit( f''' DATE_FIRST_CYCL must be a string consisting of exactly 8 digits of the - form \"YYYYMMDD\", where YYYY is the 4-digit year, MM is the 2-digit - month, and DD is the 2-digit day-of-month. + form \"YYYYMMDDHH\", where YYYY is the 4-digit year, MM is the 2-digit + month, DD is the 2-digit day-of-month, and HH is the 2-digit + cycle hour. DATE_FIRST_CYCL = \"{DATE_FIRST_CYCL}\"''' ) @@ -544,64 +545,14 @@ def get_location(xcs,fmt): print_err_msg_exit( f''' DATE_LAST_CYCL must be a string consisting of exactly 8 digits of the - form \"YYYYMMDD\", where YYYY is the 4-digit year, MM is the 2-digit - month, and DD is the 2-digit day-of-month. + form \"YYYYMMDDHH\", where YYYY is the 4-digit year, MM is the 2-digit + month, DD is the 2-digit day-of-month, and HH is the 2-digit + cycle hour. DATE_LAST_CYCL = \"{DATE_LAST_CYCL}\"''' ) # # ----------------------------------------------------------------------- # - # Check that all elements of CYCL_HRS are strings consisting of exactly - # 2 digits that are between "00" and "23", inclusive. - # - # ----------------------------------------------------------------------- - # - i = 0 - for CYCL in CYCL_HRS: - if CYCL < 0 or CYCL > 23: - print_err_msg_exit( - f''' - Each element of CYCL_HRS must be an integer between \"00\" and \"23\", in- - clusive (including a leading \"0\", if necessary), specifying an hour-of- - day. Element #{i} of CYCL_HRS (where the index of the first element is 0) - does not have this form: - CYCL_HRS = {CYCL_HRS} - CYCL_HRS[{i}] = \"{CYCL_HRS[i]}\"''' - ) - - i = i + 1 - # - # ----------------------------------------------------------------------- - # Check cycle increment for cycle frequency (cycl_freq). - # only if INCR_CYCL_FREQ < 24. - # ----------------------------------------------------------------------- - # - if INCR_CYCL_FREQ < 24 and i > 1: - cycl_intv = 24 // i - if cycl_intv != INCR_CYCL_FREQ: - print_err_msg_exit( - f""" - The number of CYCL_HRS does not match with that expected by INCR_CYCL_FREQ: - INCR_CYCL_FREQ = {INCR_CYCL_FREQ} - cycle interval by the number of CYCL_HRS = {cycl_intv} - CYCL_HRS = {CYCL_HRS} """ - ) - - for itmp in range(1, i): - itm1 = itmp - 1 - cycl_next_itmp = CYCL_HRS[itm1] + INCR_CYCL_FREQ - if cycl_next_itmp != CYCL_HRS[itmp]: - print_err_msg_exit( - f''' - Element {itmp} of CYCL_HRS does not match with the increment of cycle - frequency INCR_CYCL_FREQ: - CYCL_HRS = {CYCL_HRS} - INCR_CYCL_FREQ = {INCR_CYCL_FREQ} - CYCL_HRS[{itmp}] = \"{CYCL_HRS[itmp]}\"''' - ) - # - # ----------------------------------------------------------------------- - # # Call a function to generate the array ALL_CDATES containing the cycle # dates/hours for which to run forecasts. The elements of this array # will have the form YYYYMMDDHH. They are the starting dates/times of @@ -614,18 +565,18 @@ def get_location(xcs,fmt): ALL_CDATES = set_cycle_dates( date_start=DATE_FIRST_CYCL, date_end=DATE_LAST_CYCL, - cycle_hrs=CYCL_HRS, incr_cycl_freq=INCR_CYCL_FREQ, ) NUM_CYCLES = len(ALL_CDATES) + # Completely arbitrary cutoff of 90 cycles. if NUM_CYCLES > 90: ALL_CDATES = None print_info_msg( f""" Too many cycles in ALL_CDATES to list, redefining in abbreviated form." - ALL_CDATES="{DATE_FIRST_CYCL}{CYCL_HRS[0]}...{DATE_LAST_CYCL}{CYCL_HRS[-1]}""" + ALL_CDATES="{DATE_FIRST_CYCL}...{DATE_LAST_CYCL}""" ) # # ----------------------------------------------------------------------- diff --git a/ush/wrappers/run_fcst.sh b/ush/wrappers/run_fcst.sh index b268c5211b..a5e589197d 100755 --- a/ush/wrappers/run_fcst.sh +++ b/ush/wrappers/run_fcst.sh @@ -2,7 +2,7 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} export SLASH_ENSMEM_SUBDIR="" export ENSMEM_INDX="" diff --git a/ush/wrappers/run_get_ics.sh b/ush/wrappers/run_get_ics.sh index 8b1f87843f..b434e6cec1 100755 --- a/ush/wrappers/run_get_ics.sh +++ b/ush/wrappers/run_get_ics.sh @@ -2,7 +2,7 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} # get the ICS files diff --git a/ush/wrappers/run_get_lbcs.sh b/ush/wrappers/run_get_lbcs.sh index 5ccc5c2faa..85eb20b9f0 100755 --- a/ush/wrappers/run_get_lbcs.sh +++ b/ush/wrappers/run_get_lbcs.sh @@ -2,7 +2,7 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} # get the LBCS files diff --git a/ush/wrappers/run_gridensvx.sh b/ush/wrappers/run_gridensvx.sh index 610ac983e3..6134e6f33a 100755 --- a/ush/wrappers/run_gridensvx.sh +++ b/ush/wrappers/run_gridensvx.sh @@ -4,9 +4,9 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} -export cyc=${CYCL_HRS} +export cyc=${DATE_FIRST_CYCL:8:2} export PDY=${DATE_FIRST_CYCL} export OBS_DIR=${MRMS_OBS_DIR} # CCPA_OBS_DIR MRMS_OBS_DIR export VAR="REFC" # APCP REFC RETOP diff --git a/ush/wrappers/run_gridvx.sh b/ush/wrappers/run_gridvx.sh index 71a577ef51..9b6f0e3979 100755 --- a/ush/wrappers/run_gridvx.sh +++ b/ush/wrappers/run_gridvx.sh @@ -4,9 +4,9 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} -export cyc=${CYCL_HRS} +export cyc=${DATE_FIRST_CYCL:8:2} export PDY=${DATE_FIRST_CYCL} export SLASH_ENSMEM_SUBDIR="" # When running with do_ensemble = true, need to run for each member, e.g., "/mem1" export OBS_DIR=${CCPA_OBS_DIR} # CCPA_OBS_DIR MRMS_OBS_DIR diff --git a/ush/wrappers/run_make_grid.sh b/ush/wrappers/run_make_grid.sh index 9b2242f0f4..b3df718162 100755 --- a/ush/wrappers/run_make_grid.sh +++ b/ush/wrappers/run_make_grid.sh @@ -3,6 +3,6 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} ${JOBSdir}/JREGIONAL_MAKE_GRID diff --git a/ush/wrappers/run_make_ics.sh b/ush/wrappers/run_make_ics.sh index 8ecfce2799..7a62571b90 100755 --- a/ush/wrappers/run_make_ics.sh +++ b/ush/wrappers/run_make_ics.sh @@ -2,7 +2,7 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} export SLASH_ENSMEM_SUBDIR="" diff --git a/ush/wrappers/run_make_lbcs.sh b/ush/wrappers/run_make_lbcs.sh index 7377444738..f6dc78e0ee 100755 --- a/ush/wrappers/run_make_lbcs.sh +++ b/ush/wrappers/run_make_lbcs.sh @@ -2,7 +2,7 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} export SLASH_ENSMEM_SUBDIR="" diff --git a/ush/wrappers/run_make_orog.sh b/ush/wrappers/run_make_orog.sh index cf1972e6de..c68cf38a03 100755 --- a/ush/wrappers/run_make_orog.sh +++ b/ush/wrappers/run_make_orog.sh @@ -3,6 +3,6 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} ${JOBSdir}/JREGIONAL_MAKE_OROG diff --git a/ush/wrappers/run_make_sfc_climo.sh b/ush/wrappers/run_make_sfc_climo.sh index 538d6f8924..3cd3025992 100755 --- a/ush/wrappers/run_make_sfc_climo.sh +++ b/ush/wrappers/run_make_sfc_climo.sh @@ -3,6 +3,6 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} ${JOBSdir}/JREGIONAL_MAKE_SFC_CLIMO diff --git a/ush/wrappers/run_pointensvx.sh b/ush/wrappers/run_pointensvx.sh index f066ea8676..87ad3e2e30 100755 --- a/ush/wrappers/run_pointensvx.sh +++ b/ush/wrappers/run_pointensvx.sh @@ -4,9 +4,9 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} -export cyc=${CYCL_HRS} +export cyc=${DATE_FIRST_CYCL:8:2} export PDY=${DATE_FIRST_CYCL} export OBS_DIR=${NDAS_OBS_DIR} diff --git a/ush/wrappers/run_pointvx.sh b/ush/wrappers/run_pointvx.sh index 5f87d29fbc..d59a57ed5f 100755 --- a/ush/wrappers/run_pointvx.sh +++ b/ush/wrappers/run_pointvx.sh @@ -4,9 +4,9 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} -export cyc=${CYCL_HRS} +export cyc=${DATE_FIRST_CYCL:8:2} export PDY=${DATE_FIRST_CYCL} export SLASH_ENSMEM_SUBDIR="" # When running with do_ensemble = true, need to run for each member, e.g., "/mem1" export OBS_DIR=${NDAS_OBS_DIR} diff --git a/ush/wrappers/run_post.sh b/ush/wrappers/run_post.sh index 6e63226d21..c1a4f89bf1 100755 --- a/ush/wrappers/run_post.sh +++ b/ush/wrappers/run_post.sh @@ -2,9 +2,9 @@ export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -x source ${GLOBAL_VAR_DEFNS_FP} -export CDATE=${DATE_FIRST_CYCL}${CYCL_HRS} +export CDATE=${DATE_FIRST_CYCL} export CYCLE_DIR=${EXPTDIR}/${CDATE} -export cyc=${CYCL_HRS} +export cyc=${DATE_FIRST_CYCL:8:2} export SLASH_ENSMEM_SUBDIR="" export ENSMEM_INDX="" From 19d2adb496ac76f9b5e994bf5c36344f72abb551 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Wed, 12 Oct 2022 20:26:07 +0000 Subject: [PATCH 2/9] Updating docs to remove ref to CYCL_HRS --- docs/UsersGuide/source/BuildRunSRW.rst | 8 ++- docs/UsersGuide/source/ConfigWorkflow.rst | 11 ++-- docs/UsersGuide/source/Graphics.rst | 2 +- docs/UsersGuide/source/InputOutputFiles.rst | 2 +- docs/UsersGuide/source/Introduction.rst | 5 +- docs/UsersGuide/source/WE2Etests.rst | 1 - docs/UsersGuide/source/tables/Tests.csv | 60 ++++++++++----------- 7 files changed, 41 insertions(+), 48 deletions(-) diff --git a/docs/UsersGuide/source/BuildRunSRW.rst b/docs/UsersGuide/source/BuildRunSRW.rst index 299bdfb65e..48b0620f55 100644 --- a/docs/UsersGuide/source/BuildRunSRW.rst +++ b/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| | | 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" | +--------------------------------+-------------------+----------------------------------------------------------------------------------+ diff --git a/docs/UsersGuide/source/ConfigWorkflow.rst b/docs/UsersGuide/source/ConfigWorkflow.rst index 7a2b3f9aca..3c3d4cffac 100644 --- a/docs/UsersGuide/source/ConfigWorkflow.rst +++ b/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. diff --git a/docs/UsersGuide/source/Graphics.rst b/docs/UsersGuide/source/Graphics.rst index 205882cea6..259892e73c 100644 --- a/docs/UsersGuide/source/Graphics.rst +++ b/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 diff --git a/docs/UsersGuide/source/InputOutputFiles.rst b/docs/UsersGuide/source/InputOutputFiles.rst index 124a888795..75dec1b4b7 100644 --- a/docs/UsersGuide/source/InputOutputFiles.rst +++ b/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. diff --git a/docs/UsersGuide/source/Introduction.rst b/docs/UsersGuide/source/Introduction.rst index 390e9ca2d6..1dd1f763ee 100644 --- a/docs/UsersGuide/source/Introduction.rst +++ b/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 differenti element 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 | diff --git a/docs/UsersGuide/source/WE2Etests.rst b/docs/UsersGuide/source/WE2Etests.rst index e189668c52..77026b09bd 100644 --- a/docs/UsersGuide/source/WE2Etests.rst +++ b/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`` diff --git a/docs/UsersGuide/source/tables/Tests.csv b/docs/UsersGuide/source/tables/Tests.csv index ec518ab779..80570f14a6 100644 --- a/docs/UsersGuide/source/tables/Tests.csv +++ b/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 \ No newline at end of file +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 From d7a6692750aaf7b03bc8b9a1823a7062012c3e39 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Wed, 12 Oct 2022 20:26:30 +0000 Subject: [PATCH 3/9] Remove CYCL_HRS from workflow. --- parm/FV3LAM_wflow.xml | 6 +----- ush/generate_FV3LAM_wflow.py | 12 ++++-------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml index 2f8b02b228..73525486e7 100644 --- a/parm/FV3LAM_wflow.xml +++ b/parm/FV3LAM_wflow.xml @@ -148,13 +148,9 @@ tasks; and the "FCST" type is used for the RUN_FCST_TN task. {# Double quotes are required inside the strftime! Expect an error from reading the template if using single quotes. #} {{ cdate_first_cycl.strftime("%M %H %d %m %Y *") }} -{% for c in cycl_hrs %} - {%- set cdate_first=date_first_cycl ~ c ~ "00" -%} - {%- set cdate_last=date_last_cycl ~ c ~ "00" -%} - {{- cdate_first ~ " " ~ cdate_last ~ " " ~ cycl_freq -}} + {{- date_first_cycle ~ " " ~ date_last_cyc ~ " " ~ cycl_freq -}} -{%- endfor %} {%- if run_envir == "nco" %} diff --git a/ush/generate_FV3LAM_wflow.py b/ush/generate_FV3LAM_wflow.py index a38f9de737..a297723ddc 100755 --- a/ush/generate_FV3LAM_wflow.py +++ b/ush/generate_FV3LAM_wflow.py @@ -163,9 +163,6 @@ def generate_FV3LAM_wflow(): d = DATE_FIRST_CYCL + timedelta(seconds=DT_ATMOS) time_str = d.strftime("%M:%S") - cycl_hrs_str = [f"{c:02d}" for c in CYCL_HRS] - cdate_first_cycl = DATE_FIRST_CYCL + timedelta(hours=CYCL_HRS[0]) - # Dictionary of settings settings = { # @@ -397,10 +394,9 @@ def generate_FV3LAM_wflow(): # # Parameters that determine the set of cycles to run. # - "date_first_cycl": date_to_str(DATE_FIRST_CYCL, format="%Y%m%d"), - "date_last_cycl": date_to_str(DATE_LAST_CYCL, format="%Y%m%d"), - "cdate_first_cycl": cdate_first_cycl, - "cycl_hrs": cycl_hrs_str, + "date_first_cycl": date_to_str(DATE_FIRST_CYCL, format="%Y%m%d%H00"), + "date_last_cycl": date_to_str(DATE_LAST_CYCL, format="%Y%m%d%H00"), + "cdate_first_cycl": DATE_FIRST_CYCL "cycl_freq": f"{INCR_CYCL_FREQ:02d}:00:00", # # Forecast length (same for all cycles). @@ -1057,7 +1053,7 @@ def generate_FV3LAM_wflow(): NOMADS_script = os.path.join(USHdir, "NOMADS_get_extrn_mdl_files.h") run_command( f"""{NOMADS_script} {date_to_str(DATE_FIRST_CYCL,format="%Y%m%d")} \ - {CYCL_HRS} {NOMADS_file_type} {FCST_LEN_HRS} {LBC_SPEC_INTVL_HRS}""" + {date_to_str(DATE_FIRST_CYCL,format="%H")} {NOMADS_file_type} {FCST_LEN_HRS} {LBC_SPEC_INTVL_HRS}""" ) From 6826cfcf4d855ddc84e5d355cef7bfb5069c290c Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 13 Oct 2022 00:44:47 +0000 Subject: [PATCH 4/9] Add option to run all tests. --- tests/WE2E/setup_WE2E_tests.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh index b7aa768f13..d33b4805b7 100755 --- a/tests/WE2E/setup_WE2E_tests.sh +++ b/tests/WE2E/setup_WE2E_tests.sh @@ -30,7 +30,7 @@ function usage { echo " machine [required] is one of: ${machines[@]}" echo " slurm_account [required] case sensitive name of the user-specific slurm account" echo " compiler [optional] compiler used for build" - echo " test_type [optional] test type: fundamental or comprehensive or any other name" + echo " test_type [optional] test type: fundamental or comprehensive or all or any other name" echo " expts_dir [optional] Experiment base directory" echo " -h display this help" echo @@ -66,9 +66,18 @@ EXPTS_DIR=${5:-"${TOP_DIR}/expt_dirs"} # Set the path to the machine-specific test suite file. #----------------------------------------------------------------------- -auto_file=${scrfunc_dir}/machine_suites/${test_type}.${machine} -if [ ! -f ${auto_file} ]; then - auto_file=${scrfunc_dir}/machine_suites/${test_type} +if [ $test_type = "all" ] ; then + auto_file=$(mktemp ${scrfunc_dir}/all_tests.XXXXX) + for fp in $(find ${scrfunc_dir}/test_configs -name "config.*" -type f ) ; do + # Remove the path with basename, remove the prefix and suffix + # with cut + echo $(basename $fp | cut -f 2 -d .) >> $auto_file + done +else + auto_file=${scrfunc_dir}/machine_suites/${test_type}.${machine} + if [ ! -f ${auto_file} ]; then + auto_file=${scrfunc_dir}/machine_suites/${test_type} + fi fi #---------------------------------------------------------------------- From 4faf8673e03da0613daaa7654f39a7e45ebae42b Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 13 Oct 2022 00:45:04 +0000 Subject: [PATCH 5/9] Fixes needed to run WE2E tests. --- parm/FV3LAM_wflow.xml | 2 +- ush/generate_FV3LAM_wflow.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml index 73525486e7..08cb4e45a2 100644 --- a/parm/FV3LAM_wflow.xml +++ b/parm/FV3LAM_wflow.xml @@ -149,7 +149,7 @@ tasks; and the "FCST" type is used for the RUN_FCST_TN task. {# Double quotes are required inside the strftime! Expect an error from reading the template if using single quotes. #} {{ cdate_first_cycl.strftime("%M %H %d %m %Y *") }} - {{- date_first_cycle ~ " " ~ date_last_cyc ~ " " ~ cycl_freq -}} + {{- date_first_cycl ~ " " ~ date_last_cycl ~ " " ~ cycl_freq -}} diff --git a/ush/generate_FV3LAM_wflow.py b/ush/generate_FV3LAM_wflow.py index a297723ddc..63be16bd50 100755 --- a/ush/generate_FV3LAM_wflow.py +++ b/ush/generate_FV3LAM_wflow.py @@ -396,7 +396,7 @@ def generate_FV3LAM_wflow(): # "date_first_cycl": date_to_str(DATE_FIRST_CYCL, format="%Y%m%d%H00"), "date_last_cycl": date_to_str(DATE_LAST_CYCL, format="%Y%m%d%H00"), - "cdate_first_cycl": DATE_FIRST_CYCL + "cdate_first_cycl": DATE_FIRST_CYCL, "cycl_freq": f"{INCR_CYCL_FREQ:02d}:00:00", # # Forecast length (same for all cycles). From 0c8e3af7a4b1b78274dbe80aa03ca104f168af19 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 13 Oct 2022 01:30:50 +0000 Subject: [PATCH 6/9] Fix the failed test. --- ush/set_cycle_dates.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ush/set_cycle_dates.py b/ush/set_cycle_dates.py index 60657e042b..09adf55e88 100644 --- a/ush/set_cycle_dates.py +++ b/ush/set_cycle_dates.py @@ -39,9 +39,10 @@ class Testing(unittest.TestCase): def test_set_cycle_dates(self): cdates = set_cycle_dates( date_start=datetime(2022, 1, 1, 6), - date_end=datetime(2022, 1, 4, 12), + date_end=datetime(2022, 1, 2, 12), incr_cycl_freq=6, ) self.assertEqual( - cdates, ["2022010106", "2022010112", "2022010306", "2022010312"] + cdates, ["2022010106", "2022010112", "2022010118", + "2022010200", "2022010206", "2022010212"] ) From a72b5dec54636db037812dd4defc7629937468bf Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 13 Oct 2022 18:17:16 +0000 Subject: [PATCH 7/9] Make specification of groups of test more flexible. --- tests/WE2E/run_WE2E_tests.sh | 118 ++++++++++++++++++++++----------- tests/WE2E/setup_WE2E_tests.sh | 20 +----- 2 files changed, 81 insertions(+), 57 deletions(-) diff --git a/tests/WE2E/run_WE2E_tests.sh b/tests/WE2E/run_WE2E_tests.sh index 9a01e295cb..4d425b16d1 100755 --- a/tests/WE2E/run_WE2E_tests.sh +++ b/tests/WE2E/run_WE2E_tests.sh @@ -101,10 +101,20 @@ Usage: The arguments in brackets are optional. The arguments are defined as follows: -tests_file: -Name of file or relative or absolute path to file containing the list of -WE2E tests to run. This file must contain one test name per line, with -no repeated names. This is a required argument. +Exactly one of the following flags for defining which tests to run is +required + + tests_file: + Name of file or relative or absolute path to file containing the list + of WE2E tests to run. This file must contain one test name per line, + with no repeated names. + + test_type: + Name of a supported set of tests. Options are fundamental, + comprehensive, or all. + + test_name: + The name of a single test to run machine: Argument used to explicitly set the experiment variable MACHINE in the @@ -317,6 +327,8 @@ fi # valid_args=( \ "tests_file" \ + "test_type" \ + "test_name" \ "machine" \ "account" \ "expt_basedir" \ @@ -356,10 +368,13 @@ Use ${scrfunc_fn} ${help_flag} to get help on how to use this script." -if [ -z "${tests_file}" ]; then +if [ -z "${tests_file}" ] && [ -z "${test_name}" ] && [ -z "${test_type}" ] ; then print_err_msg_exit "\ -The argument \"tests_file\" specifying the file containing a list of the -WE2E tests to run was not specified in the call to this script. \ +At least on of the following arguments must be specified to run this +script: + tests_file + test_name + test_type ${help_msg}" fi @@ -380,42 +395,69 @@ fi # #----------------------------------------------------------------------- # -# Get the full path to the file containing the list of user-specified -# WE2E tests to run. Then verify that the file exists. +# Set the list of tests to run. # #----------------------------------------------------------------------- # -user_spec_tests_fp=$( readlink -f "${tests_file}" ) +if [ -n "${test_name}" ] ; then -if [ ! -f "${user_spec_tests_fp}" ]; then - print_err_msg_exit "\ -The file containing the user-specified list of WE2E tests to run -(tests_file) that is passed in as an argument to this script does not -exit: - tests_file = \"${tests_file}\" -The full path to this script is: - user_spec_tests_fp = \"${user_spec_tests_fp}\" -Please ensure that this file exists and rerun." -fi -# -#----------------------------------------------------------------------- -# -# Read in each line of the file specified by user_spec_tests_fp and add -# each non-empty line to the array user_spec_tests. Note that the read -# command will remove any leading and trailing whitespace from each line -# in user_spec_tests_fp [because it treats whatever character(s) the bash -# variable IFS (Internal Field Separator) is set to as word separators -# on each line, and IFS is by default set to a space, a tab, and a -# newline]. -# -#----------------------------------------------------------------------- -# -user_spec_tests=() -while read -r line; do - if [ ! -z "$line" ]; then - user_spec_tests+=("$line") + # User specified a single test + user_spec_tests=( "${test_name}" ) + +elif [ "${test_type}" = "all" ] ; then + + # User would like to run all the tests available + user_spec_tests=() + for fp in $(find ${scrfunc_dir}/test_configs -name "config.*" -type f ) ; do + user_spec_tests+=("$(basename $fp | cut -f 2 -d .)") + done + +elif [ -n "${tests_file}" ] | [ -n "${test_type}" ] ; then + + # User wants to run a set of tests from a file, either their own or + # one managed in the repo + + if [ -n "${test_type}" ] ; then + # Check for a pre-defined set. It could be machine dependent or not. + user_spec_tests_fp=${scrfunc_dir}/machine_suites/${test_type}.${machine} + if [ ! -f ${user_spec_tests_fp} ]; then + user_spec_tests_fp=${scrfunc_dir}/machine_suites/${test_type} + fi + elif [ -n "${tests_file}" ] ; then + user_spec_tests_fp=$( readlink -f "${tests_file}" ) fi -done < "${user_spec_tests_fp}" + + if [ ! -f "${user_spec_tests_fp}" ]; then + print_err_msg_exit "\ + The file containing the user-specified list of WE2E tests to run + (tests_file) that is passed in as an argument to this script does not + exit: + tests_file = \"${tests_file}\" + The full path to this script is: + user_spec_tests_fp = \"${user_spec_tests_fp}\" + Please ensure that this file exists and rerun." + fi + # + #----------------------------------------------------------------------- + # + # Read in each line of the file specified by user_spec_tests_fp and add + # each non-empty line to the array user_spec_tests. Note that the read + # command will remove any leading and trailing whitespace from each line + # in user_spec_tests_fp [because it treats whatever character(s) the bash + # variable IFS (Internal Field Separator) is set to as word separators + # on each line, and IFS is by default set to a space, a tab, and a + # newline]. + # + #----------------------------------------------------------------------- + # + user_spec_tests=() + while read -r line; do + if [ ! -z "$line" ]; then + user_spec_tests+=("$line") + fi + done < "${user_spec_tests_fp}" + +fi # #----------------------------------------------------------------------- # diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh index d33b4805b7..bc4def09c7 100755 --- a/tests/WE2E/setup_WE2E_tests.sh +++ b/tests/WE2E/setup_WE2E_tests.sh @@ -62,24 +62,6 @@ TOP_DIR=$( dirname "${SRW_APP_DIR}" ) EXPTS_DIR=${5:-"${TOP_DIR}/expt_dirs"} -#----------------------------------------------------------------------- -# Set the path to the machine-specific test suite file. -#----------------------------------------------------------------------- - -if [ $test_type = "all" ] ; then - auto_file=$(mktemp ${scrfunc_dir}/all_tests.XXXXX) - for fp in $(find ${scrfunc_dir}/test_configs -name "config.*" -type f ) ; do - # Remove the path with basename, remove the prefix and suffix - # with cut - echo $(basename $fp | cut -f 2 -d .) >> $auto_file - done -else - auto_file=${scrfunc_dir}/machine_suites/${test_type}.${machine} - if [ ! -f ${auto_file} ]; then - auto_file=${scrfunc_dir}/machine_suites/${test_type} - fi -fi - #---------------------------------------------------------------------- # Use exec_subdir consistent with the automated build. #---------------------------------------------------------------------- @@ -112,7 +94,7 @@ module list # Run the E2E Workflow tests ./run_WE2E_tests.sh \ - tests_file=${auto_file} \ + test_type=${test_type} \ machine=${machine} \ account=${account} \ exec_subdir=${exec_subdir} \ From 7f2277e840018a27b8c10a44aa1f7f5014dcbd0c Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 13 Oct 2022 18:27:54 +0000 Subject: [PATCH 8/9] Addressing Mike's review comments. --- docs/UsersGuide/source/BuildRunSRW.rst | 2 +- docs/UsersGuide/source/Introduction.rst | 4 ++-- ush/config_defaults.yaml | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/UsersGuide/source/BuildRunSRW.rst b/docs/UsersGuide/source/BuildRunSRW.rst index 48b0620f55..9e0da6016a 100644 --- a/docs/UsersGuide/source/BuildRunSRW.rst +++ b/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, INCR_CYCL_FREQ, FCST_LEN_HRS| + | Forecast | DATE_FIRST_CYCL, DATE_LAST_CYCL, INCR_CYCL_FREQ, | | | FCST_LEN_HRS | +----------------------+--------------------------------------------------------------+ | IC/LBC | EXTRN_MDL_NAME_ICS, EXTRN_MDL_NAME_LBCS, | diff --git a/docs/UsersGuide/source/Introduction.rst b/docs/UsersGuide/source/Introduction.rst index 1dd1f763ee..f81766bae2 100644 --- a/docs/UsersGuide/source/Introduction.rst +++ b/docs/UsersGuide/source/Introduction.rst @@ -378,8 +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 differenti 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 | diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index 27bc11199d..b612ed6436 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -595,9 +595,6 @@ workflow: # Format is "YYYYMMDDHH". Note: This has recently changed to include # the last cycle hour. # - # CYCL_HRS: - # Deprecated. - # # INCR_CYCL_FREQ: # Increment in hours for Rocoto cycle frequency. # Default is 24, which means cycle_freq=24:00:00 From 36cd70899be65f4971bb92a1934f874c83477140 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Fri, 14 Oct 2022 15:29:26 +0000 Subject: [PATCH 9/9] Addressing Gerard's comments. --- ush/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ush/setup.py b/ush/setup.py index 310cc491bb..187304f81e 100644 --- a/ush/setup.py +++ b/ush/setup.py @@ -534,7 +534,7 @@ def get_location(xcs,fmt): if not isinstance(DATE_FIRST_CYCL, datetime.date): print_err_msg_exit( f''' - DATE_FIRST_CYCL must be a string consisting of exactly 8 digits of the + DATE_FIRST_CYCL must be a string consisting of exactly 10 digits of the form \"YYYYMMDDHH\", where YYYY is the 4-digit year, MM is the 2-digit month, DD is the 2-digit day-of-month, and HH is the 2-digit cycle hour. @@ -544,7 +544,7 @@ def get_location(xcs,fmt): if not isinstance(DATE_LAST_CYCL, datetime.date): print_err_msg_exit( f''' - DATE_LAST_CYCL must be a string consisting of exactly 8 digits of the + DATE_LAST_CYCL must be a string consisting of exactly 10 digits of the form \"YYYYMMDDHH\", where YYYY is the 4-digit year, MM is the 2-digit month, DD is the 2-digit day-of-month, and HH is the 2-digit cycle hour.