diff --git a/tests/WE2E/machine_suites/comprehensive b/tests/WE2E/machine_suites/comprehensive index 9299f7b5e3..5a46e770f6 100644 --- a/tests/WE2E/machine_suites/comprehensive +++ b/tests/WE2E/machine_suites/comprehensive @@ -1,43 +1,35 @@ grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR -grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR +grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16 grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 -grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR -grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta +grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0 +grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR +grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0 +grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16 +grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta custom_ESGgrid deactivate_tasks -inline_post -specify_DOT_OR_USCORE -specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE -specify_RESTART_INTERVAL specify_template_filenames -community_ensemble_2mems -community_ensemble_2mems_stoch -community_ensemble_008mems custom_GFDLgrid custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE -custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 -grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 -grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp -grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional_plot grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_2017_gfdlmp grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2 -grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v16 grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 @@ -46,12 +38,9 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta grid_RRFS_CONUScompact_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta -grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 -grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2 nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km diff --git a/tests/WE2E/machine_suites/fundamental b/tests/WE2E/machine_suites/fundamental index 0887e6c58e..8f68bd52c6 100644 --- a/tests/WE2E/machine_suites/fundamental +++ b/tests/WE2E/machine_suites/fundamental @@ -3,7 +3,5 @@ grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR diff --git a/tests/WE2E/machine_suites/fundamental.cheyenne b/tests/WE2E/machine_suites/fundamental.cheyenne index 9158a03326..fb75acf1ca 100644 --- a/tests/WE2E/machine_suites/fundamental.cheyenne +++ b/tests/WE2E/machine_suites/fundamental.cheyenne @@ -1,9 +1,7 @@ grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR -grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR -specify_RESTART_INTERVAL +grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16 specify_template_filenames -grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR +grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta pregen_grid_orog_sfc_climo custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE -custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE diff --git a/tests/WE2E/machine_suites/fundamental.gaea b/tests/WE2E/machine_suites/fundamental.gaea index 2c079bb14b..6177fe1379 100644 --- a/tests/WE2E/machine_suites/fundamental.gaea +++ b/tests/WE2E/machine_suites/fundamental.gaea @@ -4,6 +4,5 @@ grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta nco_ensemble -grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta +grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta diff --git a/tests/WE2E/machine_suites/fundamental.hera.gnu.com b/tests/WE2E/machine_suites/fundamental.hera.gnu.com index 136600466c..69818609a8 100644 --- a/tests/WE2E/machine_suites/fundamental.hera.gnu.com +++ b/tests/WE2E/machine_suites/fundamental.hera.gnu.com @@ -1,5 +1,3 @@ -MET_verification MET_verification_only_vx -community_ensemble_2mems grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional_plot diff --git a/tests/WE2E/machine_suites/fundamental.hera.intel.nco b/tests/WE2E/machine_suites/fundamental.hera.intel.nco index 80fdf45be8..c4e536d106 100644 --- a/tests/WE2E/machine_suites/fundamental.hera.intel.nco +++ b/tests/WE2E/machine_suites/fundamental.hera.intel.nco @@ -2,9 +2,6 @@ grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2 -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional_plot -MET_ensemble_verification -community_ensemble_2mems_stoch pregen_grid_orog_sfc_climo diff --git a/tests/WE2E/machine_suites/fundamental.jet b/tests/WE2E/machine_suites/fundamental.jet index fc81810364..5005bb02b2 100644 --- a/tests/WE2E/machine_suites/fundamental.jet +++ b/tests/WE2E/machine_suites/fundamental.jet @@ -5,6 +5,3 @@ grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2 nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR custom_GFDLgrid custom_ESGgrid -specify_DOT_OR_USCORE -specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE -specify_RESTART_INTERVAL diff --git a/tests/WE2E/machine_suites/fundamental.orion b/tests/WE2E/machine_suites/fundamental.orion index 5cf7b73c16..fc23437eae 100644 --- a/tests/WE2E/machine_suites/fundamental.orion +++ b/tests/WE2E/machine_suites/fundamental.orion @@ -1,5 +1,3 @@ grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta -grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -community_ensemble_008mems +grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta deactivate_tasks -inline_post diff --git a/tests/WE2E/monitor_jobs.py b/tests/WE2E/monitor_jobs.py index 5d1d4a63af..181b93e2b1 100755 --- a/tests/WE2E/monitor_jobs.py +++ b/tests/WE2E/monitor_jobs.py @@ -29,10 +29,11 @@ def monitor_jobs(expts_dict: dict, monitor_file: str = '', procs: int = 1, debug contains results/summary) """ - starttime = datetime.now() + monitor_start = datetime.now() # Write monitor_file, which will contain information on each monitored experiment + monitor_start_string = monitor_start.strftime("%Y%m%d%H%M%S") if not monitor_file: - monitor_file = f'WE2E_tests_{starttime.strftime("%Y%m%d%H%M%S")}.yaml' + monitor_file = f'WE2E_tests_{monitor_start_string}.yaml' logging.info(f"Writing information for all experiments to {monitor_file}") write_monitor_file(monitor_file,expts_dict) @@ -68,24 +69,30 @@ def monitor_jobs(expts_dict: dict, monitor_file: str = '', procs: int = 1, debug for expt in running_expts.copy(): running_expts[expt] = expts_dict[expt] if running_expts[expt]["status"] in ['DEAD','ERROR','COMPLETE']: - logging.info(f'Experiment {expt} is {running_expts[expt]["status"]};'\ - 'will no longer monitor.') + # If start_time is in dictionary, compute total walltime + walltimestr = '' + if running_expts[expt].get("start_time",{}): + end = datetime.now() + start = datetime.strptime(running_expts[expt]["start_time"],'%Y%m%d%H%M%S') + walltime = end - start + walltimestr = f'Took {str(walltime)}; ' + running_expts[expt]["walltime"] = str(walltime) + + logging.info(f'Experiment {expt} is {running_expts[expt]["status"]}') + logging.info(f'{walltimestr}will no longer monitor.') running_expts.pop(expt) continue logging.debug(f'Experiment {expt} status is {expts_dict[expt]["status"]}') write_monitor_file(monitor_file,expts_dict) endtime = datetime.now() - total_walltime = endtime - starttime + total_walltime = endtime - monitor_start logging.debug(f"Finished loop {i}\nWalltime so far is {str(total_walltime)}") #Slow things down just a tad between loops so experiments behave better time.sleep(5) - endtime = datetime.now() - total_walltime = endtime - starttime - - logging.info(f'All {len(expts_dict)} experiments finished in {str(total_walltime)}') + logging.info(f'All {len(expts_dict)} experiments finished') logging.info('Calculating core-hour usage and printing final summary') # Calculate core hours and update yaml diff --git a/tests/WE2E/run_WE2E_tests.py b/tests/WE2E/run_WE2E_tests.py index b1ef55c9ed..6bb4de5c91 100755 --- a/tests/WE2E/run_WE2E_tests.py +++ b/tests/WE2E/run_WE2E_tests.py @@ -138,6 +138,8 @@ def run_we2e_tests(homedir, args) -> None: for test in tests_to_run: #Starting with test yaml template, fill in user-specified and machine- and # test-specific options, then write resulting complete config.yaml + starttime = datetime.now() + starttime_string = starttime.strftime("%Y%m%d%H%M%S") test_name = os.path.basename(test).split('.')[1] logging.debug(f"For test {test_name}, constructing config.yaml") test_cfg = load_config_file(test) @@ -213,10 +215,11 @@ def run_we2e_tests(homedir, args) -> None: monitor_yaml[test_name] = dict() monitor_yaml[test_name].update({"expt_dir": expt_dir}) monitor_yaml[test_name].update({"status": "CREATED"}) + monitor_yaml[test_name].update({"start_time": starttime_string}) if not args.use_cron_to_relaunch: logging.info("calling function that monitors jobs, prints summary") - monitor_file = f'WE2E_tests_{datetime.now().strftime("%Y%m%d%H%M%S")}.yaml' + monitor_file = f'WE2E_tests_{starttime_string}.yaml' write_monitor_file(monitor_file,monitor_yaml) try: monitor_file = monitor_jobs(monitor_yaml, monitor_file=monitor_file, procs=args.procs, 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_RRFS_v1beta.yaml similarity index 81% rename from tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml rename to tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta.yaml index 8b25ba7017..f4c40bf722 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_RRFS_v1beta.yaml @@ -2,16 +2,16 @@ metadata: description: |- This test is to ensure that the workflow running in community mode completes successfully on the CONUS_3km_GFDLgrid grid (which is a - GFDLgrid type of grid) using the GFS_v16 suite with ICs and LBCs + GFDLgrid type of grid) using the RRFS_v1beta suite with ICs and LBCs derived from the FV3GFS. user: RUN_ENVIR: community workflow: - CCPP_PHYS_SUITE: FV3_GFS_v16 + CCPP_PHYS_SUITE: FV3_RRFS_v1beta PREDEF_GRID_NAME: CONUS_3km_GFDLgrid DATE_FIRST_CYCL: '2019070100' DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 + FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: EXTRN_MDL_NAME_ICS: FV3GFS 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_HRRR.yaml similarity index 77% rename from tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml rename to tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR.yaml index 2e6caf0b12..6d4dbc3b33 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_HRRR.yaml @@ -1,21 +1,21 @@ metadata: description: |- This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_AK_3km grid using the GFS_v16 + completes successfully on the RRFS_AK_3km grid using the HRRR physics suite with ICs and LBCs derived from the FV3GFS. user: RUN_ENVIR: community workflow: - CCPP_PHYS_SUITE: FV3_GFS_v16 + CCPP_PHYS_SUITE: FV3_HRRR PREDEF_GRID_NAME: RRFS_AK_3km DATE_FIRST_CYCL: '2019070100' DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 + FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: EXTRN_MDL_NAME_ICS: FV3GFS USE_USER_STAGED_EXTRN_FILES: true task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 6 + LBC_SPEC_INTVL_HRS: 3 USE_USER_STAGED_EXTRN_FILES: true 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 f07904f058..cb51ca2452 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 @@ -3,13 +3,16 @@ metadata: This test is to ensure that the workflow running in community mode completes successfully on the RRFS_CONUS_25km grid using the GFS_2017_gfdlmp physics suite with ICs and LBCs derived from the FV3GFS. + This test additionally includes the cycling ensemble capability, with + 2 members run over 2 cycles. user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070100' + DATE_FIRST_CYCL: '2019070112' + DATE_LAST_CYCL: '2019070200' + INCR_CYCL_FREQ: 12 FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: @@ -19,3 +22,6 @@ task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: FV3GFS LBC_SPEC_INTVL_HRS: 3 USE_USER_STAGED_EXTRN_FILES: true +global: + DO_ENSEMBLE: true + NUM_ENS_MEMBERS: 2 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 deleted file mode 100644 index 7a27c095ec..0000000000 --- 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 +++ /dev/null @@ -1,21 +0,0 @@ -metadata: - description: |- - This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_CONUS_25km grid using the GFS_2017_gfdlmp_regional - physics suite with ICs and LBCs derived from the FV3GFS. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp_regional - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - USE_USER_STAGED_EXTRN_FILES: true -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 6 - USE_USER_STAGED_EXTRN_FILES: true 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 f3b26934d9..d0d184d288 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 @@ -3,6 +3,7 @@ metadata: This test is to ensure that the workflow running in community mode completes successfully on the RRFS_CONUS_25km grid using the GFS_v15p2 physics suite with ICs and LBCs derived from the FV3GFS. + In addition, this tests the "inline post" option (WRITE_DOPOST: true) user: RUN_ENVIR: community workflow: @@ -19,3 +20,5 @@ task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: FV3GFS LBC_SPEC_INTVL_HRS: 3 USE_USER_STAGED_EXTRN_FILES: true +task_run_fcst: + WRITE_DOPOST: true 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 f582575176..f133013040 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 @@ -3,6 +3,7 @@ metadata: This test is to ensure that the workflow running in community mode completes successfully on the RRFS_CONUS_25km grid using the GFS_v16 physics suite with ICs and LBCs derived from the FV3GFS. + Also tests the capability to write restart files. user: RUN_ENVIR: community workflow: @@ -19,3 +20,5 @@ task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: FV3GFS LBC_SPEC_INTVL_HRS: 3 USE_USER_STAGED_EXTRN_FILES: true +task_run_fcst: + RESTART_INTERVAL: 1 2 5 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 526ba26496..53e1ff1763 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 @@ -4,18 +4,20 @@ metadata: completes successfully on the RRFS_CONUS_25km grid using the HRRR physics suite with ICs derived from the FV3GFS and LBCs derived from the RAP. - Note that this test specifies the file format of the FV3GFS external - model data (from which to generate ICs) to be "grib2" as opposed to - the default value of "nemsio". + This test also ensures that MET deterministic verification runs + successfully. user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_HRRR PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2020081000' - DATE_LAST_CYCL: '2020081000' + DATE_FIRST_CYCL: '2019061518' + DATE_LAST_CYCL: '2019061518' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename +workflow_switches: + RUN_TASK_VX_GRIDSTAT: true + RUN_TASK_VX_POINTSTAT: true task_get_extrn_ics: EXTRN_MDL_NAME_ICS: FV3GFS FV3GFS_FILE_FMT_ICS: grib2 @@ -23,6 +25,8 @@ task_get_extrn_ics: task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: RAP LBC_SPEC_INTVL_HRS: 1 + EXTRN_MDL_LBCS_OFFSET_HRS: 0 USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_LBCS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' +verification: + RUN_TASKS_METVX_DET: true + VX_FCST_MODEL_NAME: FV3_GFS_v15p2_CONUS_25km 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_GFS_v16.yaml similarity index 50% rename from tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.yaml rename to tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16.yaml index 51a717d720..af33066fa0 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_GFS_v16.yaml @@ -1,17 +1,24 @@ metadata: description: |- This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_CONUS_25km grid using the HRRR + completes successfully on the RRFS_CONUS_25km grid using the GFS_v16 physics suite with ICs and LBCs derived from the NAM. + This test also runs with two ensemble members, and ensures the MET + ensemble-specific tasks run successfully. user: RUN_ENVIR: community workflow: - CCPP_PHYS_SUITE: FV3_HRRR + CCPP_PHYS_SUITE: FV3_GFS_v16 PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2021061500' - DATE_LAST_CYCL: '2021061500' + DATE_FIRST_CYCL: '2021051212' + DATE_LAST_CYCL: '2021051212' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename +workflow_switches: + RUN_TASK_VX_GRIDSTAT: true + RUN_TASK_VX_POINTSTAT: true + RUN_TASK_VX_ENSGRID: true + RUN_TASK_VX_ENSPOINT: true task_get_extrn_ics: EXTRN_MDL_NAME_ICS: NAM USE_USER_STAGED_EXTRN_FILES: true @@ -19,3 +26,11 @@ task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: NAM LBC_SPEC_INTVL_HRS: 3 USE_USER_STAGED_EXTRN_FILES: true +global: + DO_ENSEMBLE: true + NUM_ENS_MEMBERS: 2 +verification: + RUN_TASKS_METVX_DET: true + RUN_TASKS_METVX_ENS: true + VX_FCST_MODEL_NAME: FV3_GFS_v15p2_CONUS_25km + 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 71919a759e..fb407ba861 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 @@ -10,7 +10,7 @@ workflow: PREDEF_GRID_NAME: RRFS_CONUS_3km DATE_FIRST_CYCL: '2019070100' DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 + FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: EXTRN_MDL_NAME_ICS: FV3GFS 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 d3a36fc970..b61427a2e1 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 @@ -3,6 +3,9 @@ metadata: This test is to ensure that the workflow running in community mode completes successfully on the RRFS_CONUScompact_25km grid using the HRRR physics suite with ICs and LBCs derived from the HRRR. + This test also checks the capability of the workflow to have the run_fcst + MPI layout (LAYOUT_X and LAYOUT_Y) and its cache block size be set to + user-specified values. user: RUN_ENVIR: community workflow: @@ -23,3 +26,8 @@ task_get_extrn_lbcs: USE_USER_STAGED_EXTRN_FILES: true EXTRN_MDL_FILES_LBCS: - '{yy}{jjj}{hh}00{fcst_hr:02d}00' +task_run_fcst: + DT_ATMOS: 75 + LAYOUT_X: 10 + LAYOUT_Y: 4 + BLOCKSIZE: 23 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 deleted file mode 100644 index 2ae05628f6..0000000000 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta.yaml +++ /dev/null @@ -1,27 +0,0 @@ -metadata: - description: |- - This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_CONUScompact_25km grid using the RRFS_v1beta - physics suite with ICs and LBCs derived from the HRRR. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_RRFS_v1beta - PREDEF_GRID_NAME: RRFS_CONUScompact_25km - DATE_FIRST_CYCL: '2020081000' - DATE_LAST_CYCL: '2020081000' - FCST_LEN_HRS: 24 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: HRRR - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_ICS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: HRRR - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_LBCS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_run_fcst: - DT_ATMOS: 75 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 deleted file mode 100644 index 563a329158..0000000000 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml +++ /dev/null @@ -1,27 +0,0 @@ -metadata: - description: |- - This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_CONUScompact_25km grid using the HRRR - physics suite with ICs derived from the HRRR and LBCs derived from the RAP. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_HRRR - PREDEF_GRID_NAME: RRFS_CONUScompact_25km - DATE_FIRST_CYCL: '2020081000' - DATE_LAST_CYCL: '2020081000' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: HRRR - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_ICS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: RAP - LBC_SPEC_INTVL_HRS: 2 - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_LBCS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_run_fcst: - DT_ATMOS: 75 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 d83d0a91b4..2a5124e9ae 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 @@ -3,9 +3,11 @@ metadata: This test is to ensure that the workflow running in community mode completes successfully on the RRFS_CONUScompact_25km grid using the RRFS_v1beta physics suite with ICs derived from the HRRR and LBCs derived from the RAP. + Also tests the "DOT_OR_USCORE" option user: RUN_ENVIR: community workflow: + DOT_OR_USCORE: . CCPP_PHYS_SUITE: FV3_RRFS_v1beta PREDEF_GRID_NAME: RRFS_CONUScompact_25km DATE_FIRST_CYCL: '2020081000' 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 fac46ebe0c..c38ecec944 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 @@ -10,7 +10,7 @@ workflow: PREDEF_GRID_NAME: RRFS_CONUScompact_3km DATE_FIRST_CYCL: '2019070100' DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 + FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: EXTRN_MDL_NAME_ICS: FV3GFS 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 deleted file mode 100644 index e151746bd8..0000000000 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml +++ /dev/null @@ -1,25 +0,0 @@ -metadata: - description: |- - This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_CONUScompact_3km grid using the GFS_v15p2 - physics suite with ICs derived from the HRRR and LBCs derived from the RAP. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUScompact_3km - DATE_FIRST_CYCL: '2020080100' - DATE_LAST_CYCL: '2020080100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: HRRR - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_ICS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: RAP - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_LBCS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' 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 efe4485712..56d1587595 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 @@ -13,21 +13,21 @@ workflow: PREDEF_GRID_NAME: RRFS_NA_3km DATE_FIRST_CYCL: '2019070100' DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 + FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename workflow_switches: RUN_TASK_RUN_PRDGEN: true task_make_orog: - WTIME_MAKE_OROG: 01:00:00 + OMP_NUM_THREADS_MAKE_OROG: 24 task_get_extrn_ics: EXTRN_MDL_NAME_ICS: FV3GFS USE_USER_STAGED_EXTRN_FILES: true task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 6 + LBC_SPEC_INTVL_HRS: 3 USE_USER_STAGED_EXTRN_FILES: true task_make_ics: - NNODES_MAKE_ICS: 12 + NNODES_MAKE_ICS: 16 PPN_MAKE_ICS: 4 OMP_STACKSIZE_MAKE_ICS: 2048m task_make_lbcs: @@ -36,6 +36,8 @@ task_make_lbcs: WTIME_MAKE_LBCS: 01:00:00 task_run_fcst: OMP_STACKSIZE_RUN_FCST: 2048m + DT_ATMOS: 40 + WTIME_RUN_FCST: 01:00:00 task_run_post: NNODES_RUN_POST: 8 PPN_RUN_POST: 12 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 deleted file mode 100644 index 60a83ce68d..0000000000 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml +++ /dev/null @@ -1,21 +0,0 @@ -metadata: - description: |- - This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_SUBCONUS_3km grid using the GFS_v16 - physics suite with ICs and LBCs derived from the FV3GFS. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v16 - PREDEF_GRID_NAME: RRFS_SUBCONUS_3km - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - USE_USER_STAGED_EXTRN_FILES: true -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true 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 deleted file mode 100644 index b28755e521..0000000000 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2.yaml +++ /dev/null @@ -1,26 +0,0 @@ -metadata: - description: |- - This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_SUBCONUS_3km grid using the GFS_v15p2 - physics suite with ICs derived from the HRRR and LBCs derived from the - RAP. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_SUBCONUS_3km - DATE_FIRST_CYCL: '2020080100' - DATE_LAST_CYCL: '2020080100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: HRRR - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_ICS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: RAP - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_LBCS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0.yaml b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0.yaml index 5368feaad5..e3a7eee09b 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0.yaml +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0.yaml @@ -1,7 +1,7 @@ metadata: description: |- This test is to ensure that the workflow running in community mode - completes successfully on the RRFS_SUBCONUS_3km grid using the WoFS_v0 + completes successfully on the SUBCONUS_Ind_3km grid using the WoFS_v0 physics suite with ICs and LBCs derived from the FV3GFS. user: RUN_ENVIR: community 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_HRRR_suite_HRRR.yaml similarity index 66% rename from tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR.yaml rename to tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR.yaml index baa6173237..c0dafb9539 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_HRRR_suite_HRRR.yaml @@ -2,7 +2,8 @@ metadata: description: |- This test is to ensure that the workflow running in community mode completes successfully on the SUBCONUS_Ind_3km grid using the HRRR - physics suite with ICs derived from HRRR and LBCs derived from the RAP. + physics suite with ICs and LBCs derived from the HRRR model output. + This test also tests the ensemble capability with stochastic user: RUN_ENVIR: community workflow: @@ -10,7 +11,7 @@ workflow: PREDEF_GRID_NAME: SUBCONUS_Ind_3km DATE_FIRST_CYCL: '2020081000' DATE_LAST_CYCL: '2020081000' - FCST_LEN_HRS: 6 + FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: EXTRN_MDL_NAME_ICS: HRRR @@ -18,8 +19,15 @@ task_get_extrn_ics: EXTRN_MDL_FILES_ICS: - '{yy}{jjj}{hh}00{fcst_hr:02d}00' task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: RAP - LBC_SPEC_INTVL_HRS: 6 + EXTRN_MDL_NAME_LBCS: HRRR + LBC_SPEC_INTVL_HRS: 3 USE_USER_STAGED_EXTRN_FILES: true EXTRN_MDL_FILES_LBCS: - '{yy}{jjj}{hh}00{fcst_hr:02d}00' +global: + DO_ENSEMBLE: true + NUM_ENS_MEMBERS: 2 + DO_SHUM: true + DO_SPPT: true + DO_SKEB: true + DO_SPP: true 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_NAM_lbcs_NAM_suite_GFS_v16.yaml similarity index 74% rename from tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16.yaml rename to tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16.yaml index abdc2c9f81..8273f3ccf9 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_NAM_lbcs_NAM_suite_GFS_v16.yaml @@ -2,22 +2,22 @@ metadata: description: |- This test is to ensure that the workflow running in community mode completes successfully on the SUBCONUS_Ind_3km grid using the GFS_v16 - physics suite with ICs and LBCs derived from the FV3GFS. + physics suite with ICs and LBCs derived from the NAM. user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_GFS_v16 PREDEF_GRID_NAME: SUBCONUS_Ind_3km - DATE_FIRST_CYCL: '2019061518' - DATE_LAST_CYCL: '2019061518' + DATE_FIRST_CYCL: '2021061500' + DATE_LAST_CYCL: '2021061500' FCST_LEN_HRS: 6 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS + EXTRN_MDL_NAME_ICS: NAM FV3GFS_FILE_FMT_ICS: grib2 USE_USER_STAGED_EXTRN_FILES: true task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS + EXTRN_MDL_NAME_LBCS: NAM LBC_SPEC_INTVL_HRS: 6 FV3GFS_FILE_FMT_LBCS: grib2 USE_USER_STAGED_EXTRN_FILES: true 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_RAP_lbcs_RAP_suite_RRFS_v1beta.yaml similarity index 70% rename from tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml rename to tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta.yaml index 94f794c78e..1c82f1a8ac 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_RAP_lbcs_RAP_suite_RRFS_v1beta.yaml @@ -2,24 +2,26 @@ metadata: description: |- This test is to ensure that the workflow running in community mode completes successfully on the SUBCONUS_Ind_3km grid using the RRFS_v1beta - physics suite with ICs derived from HRRR and LBCs derived from the RAP. + physics suite with ICs and LBCs derived from the RAP. user: RUN_ENVIR: community workflow: CCPP_PHYS_SUITE: FV3_RRFS_v1beta PREDEF_GRID_NAME: SUBCONUS_Ind_3km - DATE_FIRST_CYCL: '2020080100' - DATE_LAST_CYCL: '2020080100' - FCST_LEN_HRS: 6 + DATE_FIRST_CYCL: '2020080103' + DATE_LAST_CYCL: '2020080103' + FCST_LEN_HRS: 3 PREEXISTING_DIR_METHOD: rename task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: HRRR + EXTRN_MDL_NAME_ICS: RAP + EXTRN_MDL_ICS_OFFSET_HRS: 6 USE_USER_STAGED_EXTRN_FILES: true EXTRN_MDL_FILES_ICS: - '{yy}{jjj}{hh}00{fcst_hr:02d}00' task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: RAP - LBC_SPEC_INTVL_HRS: 6 + LBC_SPEC_INTVL_HRS: 3 + EXTRN_MDL_LBCS_OFFSET_HRS: 6 USE_USER_STAGED_EXTRN_FILES: true EXTRN_MDL_FILES_LBCS: - '{yy}{jjj}{hh}00{fcst_hr:02d}00' diff --git a/tests/WE2E/test_configs/verification/config.MET_ensemble_verification.yaml b/tests/WE2E/test_configs/verification/config.MET_ensemble_verification.yaml deleted file mode 100644 index 2eae0cffd9..0000000000 --- a/tests/WE2E/test_configs/verification/config.MET_ensemble_verification.yaml +++ /dev/null @@ -1,43 +0,0 @@ -metadata: - description: |- - This test is to ensure that the workflow running in community mode - completes successfully with MET ensemble verification. -user: - RUN_ENVIR: community - -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019061500' - DATE_LAST_CYCL: '2019061500' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename - -workflow_switches: - RUN_TASK_VX_GRIDSTAT: true - RUN_TASK_VX_POINTSTAT: true - RUN_TASK_VX_ENSGRID: true - RUN_TASK_VX_ENSPOINT: true - -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - FV3GFS_FILE_FMT_ICS: grib2 - USE_USER_STAGED_EXTRN_FILES: true - -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 6 - FV3GFS_FILE_FMT_LBCS: grib2 - USE_USER_STAGED_EXTRN_FILES: true - -task_run_fcst: - WTIME_RUN_FCST: 01:00:00 - -global: - DO_ENSEMBLE: true - NUM_ENS_MEMBERS: 2 - -verification: - RUN_TASKS_METVX_DET: true - RUN_TASKS_METVX_ENS: true - VX_FCST_MODEL_NAME: FV3_GFS_v15p2_CONUS_25km diff --git a/tests/WE2E/test_configs/verification/config.MET_ensemble_verification.yaml b/tests/WE2E/test_configs/verification/config.MET_ensemble_verification.yaml new file mode 120000 index 0000000000..e5004911fe --- /dev/null +++ b/tests/WE2E/test_configs/verification/config.MET_ensemble_verification.yaml @@ -0,0 +1 @@ +../grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR.yaml \ No newline at end of file diff --git a/tests/WE2E/test_configs/verification/config.MET_verification.yaml b/tests/WE2E/test_configs/verification/config.MET_verification.yaml deleted file mode 100644 index 088262e1f5..0000000000 --- a/tests/WE2E/test_configs/verification/config.MET_verification.yaml +++ /dev/null @@ -1,37 +0,0 @@ -metadata: - description: |- - This test is to ensure that the workflow running in community mode - completes successfully with MET deterministic verification. - -user: - RUN_ENVIR: community - -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019061500' - DATE_LAST_CYCL: '2019061500' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename - -workflow_switches: - RUN_TASK_VX_GRIDSTAT: true - RUN_TASK_VX_POINTSTAT: true - -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - FV3GFS_FILE_FMT_ICS: grib2 - USE_USER_STAGED_EXTRN_FILES: true - -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 6 - FV3GFS_FILE_FMT_LBCS: grib2 - USE_USER_STAGED_EXTRN_FILES: true - -task_run_fcst: - WTIME_RUN_FCST: 01:00:00 - -verification: - RUN_TASKS_METVX_DET: true - VX_FCST_MODEL_NAME: FV3_GFS_v15p2_CONUS_25km diff --git a/tests/WE2E/test_configs/verification/config.MET_verification.yaml b/tests/WE2E/test_configs/verification/config.MET_verification.yaml new file mode 120000 index 0000000000..70f8754fb1 --- /dev/null +++ b/tests/WE2E/test_configs/verification/config.MET_verification.yaml @@ -0,0 +1 @@ +../grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR.yaml \ No newline at end of file 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 deleted file mode 100644 index e7e8ae4e84..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_008mems.yaml +++ /dev/null @@ -1,28 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to run ensemble forecasts - (i.e. DO_ENSEMBLE set to "TRUE") in community mode (i.e. RUN_ENVIR set - to "community") with the number of ensemble members (NUM_ENS_MEMBERS) - set to "008". The leading zeros in "008" should cause the ensemble - members to be numbered "mem001", "mem002", ..., "mem008" (instead of, - for instance, "mem1", "mem2", ..., "mem8"). -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070212' - INCR_CYCL_FREQ: 12 - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - USE_USER_STAGED_EXTRN_FILES: true -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true -global: - DO_ENSEMBLE: true - NUM_ENS_MEMBERS: 8 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 deleted file mode 100644 index 8e52964f0a..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems.yaml +++ /dev/null @@ -1,31 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to run ensemble forecasts - (i.e. DO_ENSEMBLE set to "TRUE") in community mode (i.e. RUN_ENVIR set - to "community") with the number of ensemble members (NUM_ENS_MEMBERS) - set to "2". The lack of leading zeros in this "2" should cause the - ensemble members to be named "mem1" and "mem2" (instead of, for instance, - "mem01" and "mem02"). - Note also that this test uses two cycle hours ("00" and "12") to test - the capability of the workflow to run ensemble forecasts for more than - one cycle hour in community mode. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070212' - INCR_CYCL_FREQ: 12 - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - USE_USER_STAGED_EXTRN_FILES: true -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true -global: - DO_ENSEMBLE: true - NUM_ENS_MEMBERS: 2 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 new file mode 120000 index 0000000000..d1b5b19f6d --- /dev/null +++ b/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems.yaml @@ -0,0 +1 @@ +../grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp.yaml \ No newline at end of file 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 deleted file mode 100644 index ab5c6bdde0..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems_stoch.yaml +++ /dev/null @@ -1,36 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to run ensemble forecasts - (i.e. DO_ENSEMBLE set to "TRUE") in community mode (i.e. RUN_ENVIR set - to "community") with the number of ensemble members (NUM_ENS_MEMBERS) - set to "2" and all stochastic physics options turned on. - The lack of leading zeros in this "2" should cause the - ensemble members to be named "mem1" and "mem2" (instead of, for instance, - "mem01" and "mem02"). -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_HRRR - PREDEF_GRID_NAME: SUBCONUS_Ind_3km - DATE_FIRST_CYCL: '2020081000' - DATE_LAST_CYCL: '2020081000' - FCST_LEN_HRS: 3 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: HRRR - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_ICS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: HRRR - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_LBCS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -global: - DO_ENSEMBLE: true - NUM_ENS_MEMBERS: 2 - DO_SHUM: true - DO_SPPT: true - DO_SKEB: true - DO_SPP: true 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 new file mode 120000 index 0000000000..62cc7980be --- /dev/null +++ b/tests/WE2E/test_configs/wflow_features/config.community_ensemble_2mems_stoch.yaml @@ -0,0 +1 @@ +../grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR.yaml \ No newline at end of file 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 ea65ee6b6b..51286626ec 100644 --- a/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.yaml +++ b/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid.yaml @@ -7,9 +7,7 @@ metadata: GFDLgrid_USE_NUM_CELLS_IN_FILENAMES to "TRUE" (which is its default value); see the UFS SRW App's User's Guide for a description of this variable. - The difference between this test and the one named - new_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE - is that this one uses almost no stretching by setting the workflow + This test uses almost no stretching by setting the workflow variable GFDLgrid_STRETCH_FAC very close to 1. Setting it exactly to 1 used to cause the workflow to fail because it caused the GFDL grid generator to assume a global grid. This bug should be rechecked, e.g. 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 deleted file mode 100644 index 3f3cb93acc..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE.yaml +++ /dev/null @@ -1,55 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to have the user - specify a new grid (as opposed to one of the predefined ones in the - workflow) of GFDLgrid type. Note that this test sets the workflow - variable - GFDLgrid_USE_NUM_CELLS_IN_FILENAMES - to "TRUE" (which is its default value); see the UFS SRW App's User's - Guide for a description of this variable. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - GRID_GEN_METHOD: GFDLgrid - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_make_grid: - GFDLgrid_LON_T6_CTR: -97.5 - GFDLgrid_LAT_T6_CTR: 38.5 - GFDLgrid_NUM_CELLS: 96 - GFDLgrid_STRETCH_FAC: 1.5 - GFDLgrid_REFINE_RATIO: 2 - GFDLgrid_ISTART_OF_RGNL_DOM_ON_T6G: 10 - GFDLgrid_IEND_OF_RGNL_DOM_ON_T6G: 87 - GFDLgrid_JSTART_OF_RGNL_DOM_ON_T6G: 10 - GFDLgrid_JEND_OF_RGNL_DOM_ON_T6G: 87 - GFDLgrid_USE_NUM_CELLS_IN_FILENAMES: true -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - USE_USER_STAGED_EXTRN_FILES: true -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true -task_run_fcst: - DT_ATMOS: 100 - LAYOUT_X: 6 - LAYOUT_Y: 6 - BLOCKSIZE: 26 - QUILTING: true - WRTCMP_write_groups: 1 - WRTCMP_write_tasks_per_group: 6 - WRTCMP_output_grid: rotated_latlon - WRTCMP_cen_lon: -97.5 - WRTCMP_cen_lat: 38.5 - WRTCMP_lon_lwr_left: -25.0 - WRTCMP_lat_lwr_left: -15.0 - WRTCMP_lon_upr_rght: 25.0 - WRTCMP_lat_upr_rght: 15.0 - WRTCMP_dlon: 0.24 - WRTCMP_dlat: 0.24 -task_run_post: - POST_OUTPUT_DOMAIN_NAME: custom_GFDLgrid 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 deleted file mode 100644 index da8d40bc4a..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019101818.yaml +++ /dev/null @@ -1,24 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to retrieve from NOAA - HPSS grib2-formatted output files generated by the FV3GFS external - model (from which ICs and LBCs will be derived) on a cycle date - (2019101818) that is about halfway between the date (2019061200) on - which the FV3GFS officially became operational and the date (2020022600) - on which changes to the FV3GFS output files took effect. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019101818' - DATE_LAST_CYCL: '2019101818' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - FV3GFS_FILE_FMT_ICS: grib2 -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - FV3GFS_FILE_FMT_LBCS: grib2 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 deleted file mode 100644 index c66933e646..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2021010100.yaml +++ /dev/null @@ -1,23 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to retrieve from NOAA - HPSS grib2-formatted output files generated by the FV3GFS external - model (from which ICs and LBCs will be derived) on a cycle date - (2021010100) that is several months in the future from the date - (2020022600) on which changes to the FV3GFS output files took effect. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2021010100' - DATE_LAST_CYCL: '2021010100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - FV3GFS_FILE_FMT_ICS: grib2 -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - FV3GFS_FILE_FMT_LBCS: grib2 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 deleted file mode 100644 index 84f2ee2900..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio.yaml +++ /dev/null @@ -1,19 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to retrieve from NOAA - HPSS nemsio-formatted output files generated by the FV3GFS external - model (from which ICs and LBCs will be derived). -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 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 deleted file mode 100644 index 922a7074fd..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019101818.yaml +++ /dev/null @@ -1,24 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to retrieve from NOAA - HPSS nemsio-formatted output files generated by the FV3GFS external - model (from which ICs and LBCs will be derived) on a cycle date - (2019101818) that is about halfway between the date (2019061200) on - which the FV3GFS officially became operational and the date (2020022600) - on which changes to the FV3GFS output files took effect. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019101818' - DATE_LAST_CYCL: '2019101818' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - FV3GFS_FILE_FMT_ICS: nemsio -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - FV3GFS_FILE_FMT_LBCS: nemsio 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 deleted file mode 100644 index 1bd80d361e..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021010100.yaml +++ /dev/null @@ -1,23 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to retrieve from NOAA - HPSS nemsio-formatted output files generated by the FV3GFS external - model (from which ICs and LBCs will be derived) on a cycle date - (2021010100) that is several months in the future from the date - (2020022600) on which changes to the FV3GFS output files took effect. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2021010100' - DATE_LAST_CYCL: '2021010100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - FV3GFS_FILE_FMT_ICS: nemsio -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - FV3GFS_FILE_FMT_LBCS: nemsio 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 deleted file mode 100644 index 0765846138..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2021062000.yaml +++ /dev/null @@ -1,21 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to retrieve from NOAA - HPSS netcdf-formatted output files generated by the FV3GFS external - model. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2021062000' - DATE_LAST_CYCL: '2021062000' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - FV3GFS_FILE_FMT_ICS: netcdf -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - FV3GFS_FILE_FMT_LBCS: netcdf 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 d6c6f68088..435b4723a1 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 @@ -19,3 +19,7 @@ task_get_extrn_lbcs: EXTRN_MDL_NAME_LBCS: FV3GFS LBC_SPEC_INTVL_HRS: 12 FV3GFS_FILE_FMT_LBCS: netcdf +task_run_fcst: + LAYOUT_X: 10 + LAYOUT_Y: 4 + BLOCKSIZE: 40 diff --git a/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml b/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml deleted file mode 100644 index bc0d464d85..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml +++ /dev/null @@ -1,22 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to use the inline - post option (WRITE_DOPOST) in model_configure. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v15p2 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - USE_USER_STAGED_EXTRN_FILES: true -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true -task_run_fcst: - WRITE_DOPOST: true diff --git a/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml b/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml new file mode 120000 index 0000000000..7081703132 --- /dev/null +++ b/tests/WE2E/test_configs/wflow_features/config.inline_post.yaml @@ -0,0 +1 @@ +../grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2.yaml \ No newline at end of file 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 deleted file mode 100644 index 515569aa3a..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.specify_DOT_OR_USCORE.yaml +++ /dev/null @@ -1,32 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to have the character - (DOT_OR_USCORE) in the names of the input grid and orography files - that comes after the C-resolution be set to a user-specified value. - For example, a grid file may be named - C403${DOT_OR_USCORE}grid.tile7.halo4.nc - where "C403" is the C-resolution for this specific grid and - ${DOT_OR_USCORE} represents the contents of the workflow variable - DOT_OR_USCORE (bash syntax). DOT_OR_USCORE is by default set to an - underscore, but for consistency with the rest of the separators in the - file name (as well as with the character after the C-resolution in the - names of the surface climatology files), it should be a "." (a dot). - The MAKE_GRID_TN and MAKE_OROG_TN tasks will name the grid and orography - files that they create using this character. -user: - RUN_ENVIR: community -workflow: - DOT_OR_USCORE: . - CCPP_PHYS_SUITE: FV3_GFS_2017_gfdlmp - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019052000' - DATE_LAST_CYCL: '2019052000' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: GSMGFS - USE_USER_STAGED_EXTRN_FILES: true -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: GSMGFS - LBC_SPEC_INTVL_HRS: 6 - USE_USER_STAGED_EXTRN_FILES: true 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 new file mode 120000 index 0000000000..fb04923a01 --- /dev/null +++ b/tests/WE2E/test_configs/wflow_features/config.specify_DOT_OR_USCORE.yaml @@ -0,0 +1 @@ +../grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta.yaml \ No newline at end of file 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 deleted file mode 100644 index e7dd5f62f0..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE.yaml +++ /dev/null @@ -1,30 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to have the forecast - model's time step (DT_ATMOS), its MPI layout (LAYOUT_X and LAYOUT_Y), - and its cache block size be set to user-specified values. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_HRRR - PREDEF_GRID_NAME: RRFS_CONUScompact_25km - DATE_FIRST_CYCL: '2020080100' - DATE_LAST_CYCL: '2020080100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: HRRR - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_ICS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: RAP - LBC_SPEC_INTVL_HRS: 3 - USE_USER_STAGED_EXTRN_FILES: true - EXTRN_MDL_FILES_LBCS: - - '{yy}{jjj}{hh}00{fcst_hr:02d}00' -task_run_fcst: - DT_ATMOS: 100 - LAYOUT_X: 10 - LAYOUT_Y: 4 - BLOCKSIZE: 35 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 new file mode 120000 index 0000000000..9aa451de3e --- /dev/null +++ b/tests/WE2E/test_configs/wflow_features/config.specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE.yaml @@ -0,0 +1 @@ +../grids_extrn_mdls_suites_community/config.grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR.yaml \ No newline at end of file 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 deleted file mode 100644 index 4b31015735..0000000000 --- a/tests/WE2E/test_configs/wflow_features/config.specify_RESTART_INTERVAL.yaml +++ /dev/null @@ -1,23 +0,0 @@ -metadata: - description: |- - This test checks the capability of the workflow to have the time - interval (RESTART_INTERVAL) at which restart files are written by the - forecast model be set to user-specified values. -user: - RUN_ENVIR: community -workflow: - CCPP_PHYS_SUITE: FV3_GFS_v16 - PREDEF_GRID_NAME: RRFS_CONUS_25km - DATE_FIRST_CYCL: '2019070100' - DATE_LAST_CYCL: '2019070100' - FCST_LEN_HRS: 6 - PREEXISTING_DIR_METHOD: rename -task_get_extrn_ics: - EXTRN_MDL_NAME_ICS: FV3GFS - USE_USER_STAGED_EXTRN_FILES: true -task_get_extrn_lbcs: - EXTRN_MDL_NAME_LBCS: FV3GFS - LBC_SPEC_INTVL_HRS: 6 - USE_USER_STAGED_EXTRN_FILES: true -task_run_fcst: - RESTART_INTERVAL: 1 2 5 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 new file mode 120000 index 0000000000..f3daf1734b --- /dev/null +++ b/tests/WE2E/test_configs/wflow_features/config.specify_RESTART_INTERVAL.yaml @@ -0,0 +1 @@ +../grids_extrn_mdls_suites_community/config.grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional_plot.yaml \ No newline at end of file diff --git a/tests/WE2E/utils.py b/tests/WE2E/utils.py index 1a6d4aae12..e6a9148fb2 100755 --- a/tests/WE2E/utils.py +++ b/tests/WE2E/utils.py @@ -58,7 +58,7 @@ def print_WE2E_summary(expts_dict: dict, debug: bool = False): for task in expts_dict[expt]: # Skip non-task entries - if task in ["expt_dir","status"]: + if task in ["expt_dir","status","start_time","walltime"]: continue status = expts_dict[expt][task]["status"] walltime = expts_dict[expt][task]["walltime"] @@ -113,7 +113,7 @@ def create_expts_dict(expt_dir: str) -> dict: Returns: dict : Experiment dictionary """ - contents = os.listdir(expt_dir) + contents = sorted(os.listdir(expt_dir)) expts_dict=dict() for item in contents: @@ -161,7 +161,7 @@ def calculate_core_hours(expts_dict: dict) -> dict: cores_per_node = vdf["NCORES_PER_NODE"] for task in expts_dict[expt]: # Skip non-task entries - if task in ["expt_dir","status"]: + if task in ["expt_dir","status","start_time","walltime"]: continue # Cycle is last 12 characters, task name is rest (minus separating underscore) taskname = task[:-13] @@ -190,6 +190,9 @@ def write_monitor_file(monitor_file: str, expts_dict: dict): f.write("### THIS FILE IS AUTO_GENERATED AND REGULARLY OVER-WRITTEN BY WORKFLOW SCRIPTS\n") f.write("### EDITS MAY RESULT IN MISBEHAVIOR OF EXPERIMENTS RUNNING\n") f.writelines(cfg_to_yaml_str(expts_dict)) + except KeyboardInterrupt: + logging.warning("\nRefusing to interrupt during file write; try again\n") + write_monitor_file(monitor_file,expts_dict) except: logging.fatal("\n********************************\n") logging.fatal(f"WARNING WARNING WARNING\n") @@ -309,7 +312,7 @@ def update_expt_status(expt: dict, name: str, refresh: bool = False, debug: bool statuses = list() for task in expt: # Skip non-task entries - if task in ["expt_dir","status"]: + if task in ["expt_dir","status","start_time","walltime"]: continue statuses.append(expt[task]["status"]) diff --git a/ush/predef_grid_params.yaml b/ush/predef_grid_params.yaml index 4b1ad0c451..9674ca68c9 100644 --- a/ush/predef_grid_params.yaml +++ b/ush/predef_grid_params.yaml @@ -257,41 +257,6 @@ # #----------------------------------------------------------------------- # -# The RRFS SUBCONUS domain with ~3km cells. -# -#----------------------------------------------------------------------- -# -"RRFS_SUBCONUS_3km": - GRID_GEN_METHOD: "ESGgrid" - ESGgrid_LON_CTR: -97.5 - ESGgrid_LAT_CTR: 35.0 - ESGgrid_DELX: 3000.0 - ESGgrid_DELY: 3000.0 - ESGgrid_NX: 840 - ESGgrid_NY: 600 - ESGgrid_PAZI: 0.0 - ESGgrid_WIDE_HALO_WIDTH: 6 - DT_ATMOS: 36 - LAYOUT_X: 30 - LAYOUT_Y: 24 - BLOCKSIZE: 35 - QUILTING: - WRTCMP_write_groups: 1 - WRTCMP_write_tasks_per_group: 24 - WRTCMP_output_grid: "lambert_conformal" - WRTCMP_cen_lon: -97.5 - WRTCMP_cen_lat: 35.0 - WRTCMP_stdlat1: 35.0 - WRTCMP_stdlat2: 35.0 - WRTCMP_nx: 837 - WRTCMP_ny: 595 - WRTCMP_lon_lwr_left: -109.97410429 - WRTCMP_lat_lwr_left: 26.31459843 - WRTCMP_dx: 3000.0 - WRTCMP_dy: 3000.0 -# -#----------------------------------------------------------------------- -# # A subconus domain over Indianapolis, Indiana with ~3km cells. This is # mostly for testing on a 3km grid with a much small number of cells than # on the full CONUS. diff --git a/ush/valid_param_vals.yaml b/ush/valid_param_vals.yaml index 641090de84..237031e3d9 100644 --- a/ush/valid_param_vals.yaml +++ b/ush/valid_param_vals.yaml @@ -15,7 +15,6 @@ valid_vals_PREDEF_GRID_NAME: [ "RRFS_CONUScompact_25km", "RRFS_CONUScompact_13km", "RRFS_CONUScompact_3km", -"RRFS_SUBCONUS_3km", "RRFS_AK_13km", "RRFS_AK_3km", "CONUS_25km_GFDLgrid",