From 77f9ed162b7b812c26c97126e3743d0abd0859a2 Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Mon, 16 Oct 2023 19:43:33 +0000 Subject: [PATCH 1/6] [develop] Add comprehensive.gaea-c5 test suite. --- tests/WE2E/machine_suites/comprehensive.gaea-c5 | 1 + 1 file changed, 1 insertion(+) create mode 120000 tests/WE2E/machine_suites/comprehensive.gaea-c5 diff --git a/tests/WE2E/machine_suites/comprehensive.gaea-c5 b/tests/WE2E/machine_suites/comprehensive.gaea-c5 new file mode 120000 index 0000000000..ffd340b1eb --- /dev/null +++ b/tests/WE2E/machine_suites/comprehensive.gaea-c5 @@ -0,0 +1 @@ +coverage.orion \ No newline at end of file From 6fb5d54182841f755631f96a29129fa147abfe41 Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Mon, 16 Oct 2023 20:33:10 +0000 Subject: [PATCH 2/6] [develop] Increase walltime for APCP to allow for verification tests to pass on Gaea. --- parm/wflow/verify_pre.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parm/wflow/verify_pre.yaml b/parm/wflow/verify_pre.yaml index 1ae6894d59..03a07abcc6 100644 --- a/parm/wflow/verify_pre.yaml +++ b/parm/wflow/verify_pre.yaml @@ -233,7 +233,7 @@ metatask_PcpCombine_fcst_APCP_all_accums_all_mems: attrs: age: 00:00:00:30 text: !cycstr '{{ workflow.EXPTDIR }}/@Y@m@d@H/post_files_exist_mem#mem#.txt' - walltime: 00:05:00 + walltime: 00:10:00 metatask_PcpCombine_fcst_ASNOW_all_accums_all_mems: var: @@ -261,4 +261,4 @@ metatask_PcpCombine_fcst_ASNOW_all_accums_all_mems: attrs: age: 00:00:00:30 text: !cycstr '{{ workflow.EXPTDIR }}/@Y@m@d@H/post_files_exist_mem#mem#.txt' - walltime: 00:10:00 + walltime: 00:05:00 From 2fd4bd6c1ee802566052cfc9d2586686fca895cc Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Tue, 17 Oct 2023 17:59:29 +0000 Subject: [PATCH 3/6] [develop] Add loading of wget to build_orion_intel.lua to allow get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS test to pass and add comprehensive.noaacloud test suite. --- modulefiles/build_orion_intel.lua | 1 + .../machine_suites/comprehensive.noaacloud | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 tests/WE2E/machine_suites/comprehensive.noaacloud diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua index 0b07e8493e..1ecd3fdab3 100644 --- a/modulefiles/build_orion_intel.lua +++ b/modulefiles/build_orion_intel.lua @@ -18,6 +18,7 @@ load("srw_common") load("nccmp/1.9.0.1") load("nco/5.0.6") load("ufs-pyenv") +load("wget") setenv("CMAKE_C_COMPILER","mpiicc") setenv("CMAKE_CXX_COMPILER","mpiicpc") diff --git a/tests/WE2E/machine_suites/comprehensive.noaacloud b/tests/WE2E/machine_suites/comprehensive.noaacloud new file mode 100644 index 0000000000..65401f54e1 --- /dev/null +++ b/tests/WE2E/machine_suites/comprehensive.noaacloud @@ -0,0 +1,63 @@ +community +custom_ESGgrid +custom_ESGgrid_Central_Asia_3km +custom_ESGgrid_IndianOcean_6km +custom_ESGgrid_NewZealand_3km +custom_ESGgrid_Peru_12km +custom_ESGgrid_SF_1p1km +custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE +custom_GFDLgrid +deactivate_tasks +grid_CONUS_25km_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_plot +grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR +grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP +grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot +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_v15p2 +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v17_p8_plot +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_RAP +grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2 +grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16 +grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR +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_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_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_RAP +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_plot +MET_ensemble_verification_only_vx +MET_verification_only_vx +nco +nco_ensemble +nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +nco_grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_timeoffset_suite_GFS_v16 +nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km +nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR +pregen_grid_orog_sfc_climo +specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS +specify_template_filenames +2020_CAD +get_from_AWS_ics_GEFS_lbcs_GEFS_fmt_grib2_2022040400_ensemble_2mems +get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS +long_fcst From 4c03ac869c605843cf7f1d5291e15af0f7836e00 Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Tue, 17 Oct 2023 18:48:53 +0000 Subject: [PATCH 4/6] [develop] Add reuse to the list of valid parameters for PREEXISTING_DIR_METHOD. --- ush/valid_param_vals.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/valid_param_vals.yaml b/ush/valid_param_vals.yaml index e73f57c2f7..f62c8dcdef 100644 --- a/ush/valid_param_vals.yaml +++ b/ush/valid_param_vals.yaml @@ -45,7 +45,7 @@ valid_vals_USE_USER_STAGED_EXTRN_FILES: [True, False] valid_vals_FV3GFS_FILE_FMT_ICS: ["nemsio", "grib2", "netcdf"] valid_vals_FV3GFS_FILE_FMT_LBCS: ["nemsio", "grib2", "netcdf"] valid_vals_GRID_GEN_METHOD: ["GFDLgrid", "ESGgrid"] -valid_vals_PREEXISTING_DIR_METHOD: ["delete", "rename", "quit"] +valid_vals_PREEXISTING_DIR_METHOD: ["delete", "rename", "reuse", "quit"] valid_vals_GTYPE: ["regional"] valid_vals_WRTCMP_output_grid: ["rotated_latlon", "lambert_conformal", "regional_latlon"] valid_vals_WRITE_DOPOST: [True, False] From 0e39ca0faad1243e615d5f8e85b5eed97baa405d Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Wed, 18 Oct 2023 13:26:07 +0000 Subject: [PATCH 5/6] [develop] Corrected symlink to point to comprehensive.orion for comprehensive.gaea-c5. --- tests/WE2E/machine_suites/comprehensive.gaea-c5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/WE2E/machine_suites/comprehensive.gaea-c5 b/tests/WE2E/machine_suites/comprehensive.gaea-c5 index ffd340b1eb..18a56d9739 120000 --- a/tests/WE2E/machine_suites/comprehensive.gaea-c5 +++ b/tests/WE2E/machine_suites/comprehensive.gaea-c5 @@ -1 +1 @@ -coverage.orion \ No newline at end of file +comprehensive.orion \ No newline at end of file From 4fa494b353a1395b79b2b98f1ff7ef1980ca3745 Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Tue, 24 Oct 2023 13:17:38 +0000 Subject: [PATCH 6/6] [develop] Increase walltime for ASNOW from 5 minutes to 10 minutes. --- parm/wflow/verify_pre.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/wflow/verify_pre.yaml b/parm/wflow/verify_pre.yaml index 03a07abcc6..9943c57544 100644 --- a/parm/wflow/verify_pre.yaml +++ b/parm/wflow/verify_pre.yaml @@ -261,4 +261,4 @@ metatask_PcpCombine_fcst_ASNOW_all_accums_all_mems: attrs: age: 00:00:00:30 text: !cycstr '{{ workflow.EXPTDIR }}/@Y@m@d@H/post_files_exist_mem#mem#.txt' - walltime: 00:05:00 + walltime: 00:10:00