From 1fc6b2004a27e64ff621e0df5e938c23ebc832e6 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 26 Mar 2025 14:26:22 -0500 Subject: [PATCH 1/3] Improve variable and viewer handling --- ...st_min_case_add_dependencies_chrysalis.cfg | 8 +-- ..._case_carryover_dependencies_chrysalis.cfg | 10 ++-- ...n_case_deprecated_parameters_chrysalis.cfg | 8 +-- ...e_e3sm_diags_depend_on_climo_chrysalis.cfg | 8 +-- ..._diags_depend_on_climo_mvm_1_chrysalis.cfg | 6 +-- ..._diags_depend_on_climo_mvm_2_chrysalis.cfg | 10 ++-- ...case_e3sm_diags_depend_on_ts_chrysalis.cfg | 8 +-- ...3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg | 6 +-- ...3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg | 10 ++-- ...ase_e3sm_diags_diurnal_cycle_chrysalis.cfg | 8 +-- ...sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg | 6 +-- ...sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg | 10 ++-- ...3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg | 6 +-- ...3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg | 10 ++-- ...n_case_e3sm_diags_streamflow_chrysalis.cfg | 8 +-- ..._e3sm_diags_streamflow_mvm_1_chrysalis.cfg | 6 +-- ..._e3sm_diags_streamflow_mvm_2_chrysalis.cfg | 10 ++-- ..._case_e3sm_diags_tc_analysis_chrysalis.cfg | 8 +-- ...e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg | 6 +-- ...e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg | 10 ++-- ...m_diags_tc_analysis_parallel_chrysalis.cfg | 8 +-- ...se_e3sm_diags_tc_analysis_v2_chrysalis.cfg | 8 +-- ...m_diags_tc_analysis_v2_mvm_1_chrysalis.cfg | 6 +-- ...m_diags_tc_analysis_v2_mvm_2_chrysalis.cfg | 10 ++-- ...iags_tc_analysis_v2_parallel_chrysalis.cfg | 8 +-- ...m_diags_tropical_subseasonal_chrysalis.cfg | 6 +-- ...s_tropical_subseasonal_mvm_1_chrysalis.cfg | 6 +-- ...s_tropical_subseasonal_mvm_2_chrysalis.cfg | 10 ++-- ..._comprehensive_v3_setup_only_chrysalis.cfg | 6 +-- ...se_global_time_series_custom_chrysalis.cfg | 8 +-- ...lobal_time_series_original_8_chrysalis.cfg | 8 +-- ...eries_original_8_missing_ocn_chrysalis.cfg | 38 ++++++++++++++ ...ime_series_original_8_no_ocn_chrysalis.cfg | 8 +-- ...s_viewers_all_land_variables_chrysalis.cfg | 45 +++++++++++++++++ ...e_global_time_series_viewers_chrysalis.cfg | 45 +++++++++++++++++ ...me_series_viewers_original_8_chrysalis.cfg | 50 +++++++++++++++++++ ...ewers_original_atm_plus_land_chrysalis.cfg | 45 +++++++++++++++++ ..._viewers_undefined_variables_chrysalis.cfg | 47 +++++++++++++++++ .../test_min_case_ilamb_chrysalis.cfg | 6 +-- ...st_min_case_ilamb_diff_years_chrysalis.cfg | 6 +-- ...est_min_case_ilamb_land_only_chrysalis.cfg | 6 +-- .../test_min_case_mpas_analysis_chrysalis.cfg | 6 +-- .../generated/test_min_case_nco_chrysalis.cfg | 6 +-- ...st_min_case_tc_analysis_only_chrysalis.cfg | 6 +-- ...est_min_case_tc_analysis_res_chrysalis.cfg | 6 +-- ...e_tc_analysis_simultaneous_1_chrysalis.cfg | 6 +-- ...e_tc_analysis_simultaneous_2_chrysalis.cfg | 6 +-- ...c_analysis_v2_simultaneous_1_chrysalis.cfg | 6 +-- ...c_analysis_v2_simultaneous_2_chrysalis.cfg | 6 +-- .../test_weekly_bundles_chrysalis.cfg | 12 ++--- ...test_weekly_comprehensive_v2_chrysalis.cfg | 14 +++--- ...test_weekly_comprehensive_v3_chrysalis.cfg | 22 ++++---- .../update_weekly_expected_files_chrysalis.sh | 6 +-- ...bal_time_series_original_8_missing_ocn.cfg | 38 ++++++++++++++ ...te_min_case_global_time_series_viewers.cfg | 45 +++++++++++++++++ ...time_series_viewers_all_land_variables.cfg | 45 +++++++++++++++++ ..._global_time_series_viewers_original_8.cfg | 50 +++++++++++++++++++ ..._series_viewers_original_atm_plus_land.cfg | 45 +++++++++++++++++ ...ime_series_viewers_undefined_variables.cfg | 47 +++++++++++++++++ tests/integration/utils.py | 16 ++++-- zppy/defaults/default.ini | 4 +- zppy/global_time_series.py | 3 ++ zppy/templates/ts.bash | 2 + 63 files changed, 746 insertions(+), 193 deletions(-) create mode 100644 tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg create mode 100644 tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg create mode 100644 tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg create mode 100644 tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg create mode 100644 tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg create mode 100644 tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg create mode 100644 tests/integration/template_min_case_global_time_series_original_8_missing_ocn.cfg create mode 100644 tests/integration/template_min_case_global_time_series_viewers.cfg create mode 100644 tests/integration/template_min_case_global_time_series_viewers_all_land_variables.cfg create mode 100644 tests/integration/template_min_case_global_time_series_viewers_original_8.cfg create mode 100644 tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg create mode 100644 tests/integration/template_min_case_global_time_series_viewers_undefined_variables.cfg diff --git a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg index ef84fe93..a469366f 100644 --- a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg @@ -10,16 +10,16 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" # ts is in 5 year increments ts_num_years = 5 -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test_pr697_20250327_try10" # We want to produce diagnostics for 10 years. years = "1985:1995:10", @@ -93,7 +93,7 @@ years = "1985:1995:5" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg index 8d8c1f97..711f3486 100644 --- a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg @@ -25,14 +25,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/test_pr697_20250327_try10" years = "1985:1989:2", [climo] @@ -119,7 +119,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -152,7 +152,7 @@ years = "1987:1989:2" partition = "compute" qos = "regular" ref_name = "v3.LR.historical_0051" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon", short_ref_name = "same simulation" diff --git a/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg b/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg index 77da5bd9..ca141960 100644 --- a/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg @@ -2,17 +2,17 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = True # Exlcusively testing with dry_run -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" fail_on_dependency_skip = True infer_path_parameters = False infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250327_try10" years = "1985:1989:2", [ts] @@ -36,7 +36,7 @@ walltime = "00:30:00" active = True atmosphere_only = "False" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654 climo_years = "1985-1989", "1990-1995", -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" moc_file=mocTimeSeries_1985-1995.nc diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg index 1238eb0c..64d8ea05 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test_pr697_20250327_try10" years = "1985:1989:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg index 2ab6a865..fd5492fb 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test_pr697_20250327_try10" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg index d094eb19..57cc7b81 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test_pr697_20250327_try10" years = "1995:1999:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -42,7 +42,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg index 998f65bc..9c87032f 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test_pr697_20250327_try10" years = "1985:1989:4", [ts] @@ -23,7 +23,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg index 51cfd973..6c0df21a 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test_pr697_20250327_try10" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg index cc694380..80a301bd 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test_pr697_20250327_try10" years = "1995:1999:4", [ts] @@ -23,7 +23,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -42,7 +42,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "enso_diags","qbo", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg index 6016c7e3..88f77cf6 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test_pr697_20250327_try10" years = "1985:1989:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg index 938aa8f6..f0c3db78 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test_pr697_20250327_try10" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg index a3ee1fd6..c4f71af4 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test_pr697_20250327_try10" years = "1995:1999:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -40,7 +40,7 @@ walltime = "5:00:00" ref_name = "v3.LR.historical_0051" ref_years = "1985-1988", # Use _1 as reference - reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" + reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" run_type = "model_vs_model" sets = "diurnal_cycle", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg index 0b13acfe..b61f701d 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/test_pr697_20250327_try10" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg index 425c91c6..75a5cb2b 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/test_pr697_20250327_try10" years = "1995:1999:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -41,7 +41,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/lnd/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon_land", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg index 448078da..6b3c4a6e 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/test_pr697_20250327_try10" years = "1985:1989:4", [ts] @@ -26,7 +26,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg index 98ca91b8..fee52d36 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/test_pr697_20250327_try10" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg index 70469f73..59758fc6 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/test_pr697_20250327_try10" years = "1995:1999:4", [ts] @@ -26,7 +26,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -44,7 +44,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_ts_rof determined automatically run_type = "model_vs_model" sets="streamflow" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg index 3520160b..71ced673 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] @@ -18,7 +18,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg index 7401b998..c35f9371 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg index 1740f190..3fcd2055 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg @@ -3,14 +3,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250327_try10" years = "1995:1997:2", [tc_analysis] @@ -19,7 +19,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -37,7 +37,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1986", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_tc determined automatically run_type = "model_vs_model" sets = "tc_analysis", diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg index 294292a0..b30fb655 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/test_pr697_20250327_try10" years = "1985:1989:2", [tc_analysis] @@ -18,7 +18,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg index 20c56132..a4cc949d 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test_pr697_20250327_try10/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] @@ -18,7 +18,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg index 87ba6489..8a232450 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250327_try10/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg index 5c93c819..6812a2bb 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg @@ -3,14 +3,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test_pr697_20250327_try10/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250327_try10" years = "1995:1997:2", [tc_analysis] @@ -19,7 +19,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -37,7 +37,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1986", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250327_try10/v2.LR.historical_0201/post/atm/180x360_aave/clim" # reference_data_path_tc determined automatically run_type = "model_vs_model" sets = "tc_analysis", diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg index 8828e058..67b12a05 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/test_pr697_20250327_try10/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/test_pr697_20250327_try10" years = "1985:1989:2", [tc_analysis] @@ -18,7 +18,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg index dd643995..82227a30 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_www/test_pr697_20250327_try10" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg index 340f0d65..a9f458ba 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_www/test_pr697_20250327_try10" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg index 3fc9860b..4c82fd9c 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_www/test_pr697_20250327_try10" years = "1995:1999:4", [ts] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -43,7 +43,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_daily is determined automatically run_type = "model_vs_model" sets = "tropical_subseasonal", diff --git a/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg index c7dbe1eb..1ef79f81 100644 --- a/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg @@ -2,17 +2,17 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" fail_on_dependency_skip = True infer_path_parameters = False infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_www/test_pr697_20250327_try10" years = "1985:1989:2", [ts] diff --git a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg index 0ce5dcbb..a7b3035f 100644 --- a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_custom_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_custom_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_custom_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_custom_www/test_pr697_20250327_try10" [ts] active = True @@ -33,7 +33,7 @@ years = "1985:1995:5", [global_time_series] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" plots_original="" diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg index 6ba5d107..c0e4e991 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_www/test_pr697_20250327_try10" [ts] active = True @@ -39,7 +39,7 @@ walltime = "00:30:00" [global_time_series] active = True climo_years = "1985-1989", "1990-1995", -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" moc_file=mocTimeSeries_1985-1995.nc diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg new file mode 100644 index 00000000..f2a4493a --- /dev/null +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg @@ -0,0 +1,38 @@ +[default] +case = "v3.LR.historical_0051" +constraint = "" +dry_run = "False" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_output/test_pr697_20250327_try10/v3.LR.historical_0051" +partition = "debug" +qos = "regular" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_www/test_pr697_20250327_try10" + +[ts] +active = True +walltime = "00:30:00" + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + years = "1985:1995:5", + +[global_time_series] +active = True +climo_years = "1985-1989", "1990-1995", +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +experiment_name = "v3.LR.historical_0051" +figstr = "v3.LR.historical_0051" +# plots_original -- use the default vars, +# which includes 3 ocean plots that won't work since we're not running mpas_analysis. +# This should cause `skipping because of dependency status file missing`. +ts_num_years = 5 +ts_years = "1985-1989", "1985-1995", +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg index 82d1132d..49023dc5 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_www/test_pr697_20250327_try10" [ts] active = True @@ -25,7 +25,7 @@ walltime = "00:30:00" [global_time_series] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance" diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg new file mode 100644 index 00000000..993dfc1e --- /dev/null +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg @@ -0,0 +1,45 @@ +[default] +case = "v3.LR.historical_0051" +constraint = "" +dry_run = "False" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_output/test_pr697_20250327_try10/v3.LR.historical_0051" +partition = "debug" +qos = "regular" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_www/test_pr697_20250327_try10" + +[ts] +active = True +walltime = "00:30:00" +years = "1985:1995:5", + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + vars = "TREFHT,AODDUST" + + [[ lnd_monthly_glb ]] + frequency = "monthly" + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" + +[global_time_series] +active = True +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +experiment_name = "v3.LR.historical_0051" +figstr = "v3.LR.historical_0051" +make_viewer = True +plots_original="" +plots_atm = "TREFHT" +plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables. +ts_num_years = 5 +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg new file mode 100644 index 00000000..15183ebd --- /dev/null +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg @@ -0,0 +1,45 @@ +[default] +case = "v3.LR.historical_0051" +constraint = "" +dry_run = "False" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_output/test_pr697_20250327_try10/v3.LR.historical_0051" +partition = "debug" +qos = "regular" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_www/test_pr697_20250327_try10" + +[ts] +active = True +walltime = "00:30:00" +years = "1985:1995:5", + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + vars = "TREFHT,AODDUST" + + [[ lnd_monthly_glb ]] + frequency = "monthly" + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" + +[global_time_series] +active = True +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +experiment_name = "v3.LR.historical_0051" +figstr = "v3.LR.historical_0051" +make_viewer = True +plots_original="" +plots_atm = "TREFHT" +plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" +ts_num_years = 5 +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg new file mode 100644 index 00000000..4b285d1f --- /dev/null +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg @@ -0,0 +1,50 @@ +[default] +case = "v3.LR.historical_0051" +constraint = "" +dry_run = "False" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_output/test_pr697_20250327_try10/v3.LR.historical_0051" +partition = "debug" +qos = "regular" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_www/test_pr697_20250327_try10" + +[ts] +active = True +walltime = "00:30:00" + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + years = "1985:1995:5", + +[mpas_analysis] +active = True +anomalyRefYear = 1985 +climo_years = "1985-1989", "1990-1995", +enso_years = "1985-1989", "1990-1995", +mesh = "IcoswISC30E3r5" +parallelTaskCount = 6 +partition = "compute" +qos = "regular" +shortTermArchive = True +ts_years = "1985-1989", "1985-1995", +walltime = "00:30:00" + +[global_time_series] +active = True +climo_years = "1985-1989", "1990-1995", +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +experiment_name = "v3.LR.historical_0051" +figstr = "v3.LR.historical_0051" +make_viewer = True +moc_file=mocTimeSeries_1985-1995.nc +ts_num_years = 5 +ts_years = "1985-1989", "1985-1995", +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg new file mode 100644 index 00000000..1fc2c7cc --- /dev/null +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg @@ -0,0 +1,45 @@ +[default] +case = "v3.LR.historical_0051" +constraint = "" +dry_run = "False" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_output/test_pr697_20250327_try10/v3.LR.historical_0051" +partition = "debug" +qos = "regular" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_www/test_pr697_20250327_try10" + +[ts] +active = True +walltime = "00:30:00" +years = "1985:1995:5", + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + + [[ lnd_monthly_glb ]] + frequency = "monthly" + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + vars = "" # Get all available variables + +[global_time_series] +active = True +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +experiment_name = "v3.LR.historical_0051" +figstr = "v3.LR.historical_0051" +make_viewer = True +# We have to set plots_original to the 5 plots that don't require ocean. +plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance" +plots_atm = "TREFHT" +plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" +ts_num_years = 5 +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg new file mode 100644 index 00000000..2d27e65b --- /dev/null +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg @@ -0,0 +1,47 @@ +[default] +case = "v3.LR.historical_0051" +constraint = "" +dry_run = "False" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_output/test_pr697_20250327_try10/v3.LR.historical_0051" +partition = "debug" +qos = "regular" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_www/test_pr697_20250327_try10" + +[ts] +active = True +walltime = "00:30:00" +years = "1985:1995:5", + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + vars = "TREFHT,AODDUST" + + [[ lnd_monthly_glb ]] + frequency = "monthly" + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + vars = "" # This should prompt NCO to process all available variables. + +[global_time_series] +active = True +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +experiment_name = "v3.LR.historical_0051" +figstr = "v3.LR.historical_0051" +make_viewer = True +partition = "compute" +plots_original="" +plots_atm = "TREFHT" +plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables. +qos = "regular" +ts_num_years = 5 +walltime = "04:00:00" +years = "1985-1995", diff --git a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg index a01a52d6..ee221281 100644 --- a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg @@ -2,15 +2,15 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" walltime = "00:30:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_www/test_pr697_20250327_try10" [ts] active = True diff --git a/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg index e2bc6e7a..d13d549e 100644 --- a/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg @@ -2,15 +2,15 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_diff_years_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_diff_years_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" walltime = "00:30:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_diff_years_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_diff_years_www/test_pr697_20250327_try10" [ts] active = True diff --git a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg index 506dda2a..bc05bf77 100644 --- a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_land_only_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_land_only_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_land_only_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_land_only_www/test_pr697_20250327_try10" [ts] active = True diff --git a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg index 21c1131d..a42a10bc 100644 --- a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_mpas_analysis_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_mpas_analysis_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_mpas_analysis_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_mpas_analysis_www/test_pr697_20250327_try10" [mpas_analysis] active = True diff --git a/tests/integration/generated/test_min_case_nco_chrysalis.cfg b/tests/integration/generated/test_min_case_nco_chrysalis.cfg index 64010a9f..b5f80cd4 100644 --- a/tests/integration/generated/test_min_case_nco_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_nco_chrysalis.cfg @@ -2,17 +2,17 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" fail_on_dependency_skip = True infer_path_parameters = False infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_nco_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_nco_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_nco_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_nco_www/test_pr697_20250327_try10" years = "1985:1989:2", [climo] diff --git a/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg index 52020a4e..bd4e2e5a 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_only_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_only_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_only_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_only_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg index 5c468282..fa1ad048 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_res_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_res_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_res_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_res_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg index e6f23006..4535aae6 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg index 832d43cd..dc440a2d 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg @@ -4,14 +4,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg index 9b0f1180..09b70f3d 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test_pr697_20250327_try10/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg index 046fc76f..3097fc2e 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg @@ -4,14 +4,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test_pr697_20250327_try10/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test_pr697_20250327_try10" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg index 01a9f9e4..fbfc7009 100644 --- a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg @@ -27,16 +27,16 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "compute" qos = "regular" walltime = "07:00:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_bundles_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_bundles_www/test_pr697_20250327_try10" [bundle] @@ -114,7 +114,7 @@ years = "1985:1989:2", [e3sm_diags] active = True -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' ref_final_yr = 1989 ref_start_yr = 1985 @@ -137,7 +137,7 @@ years = "1985:1989:2", ref_name = "v3.LR.historical_0051" ref_start_yr = 1985 ref_years = "1985-1986", - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" # TODO: Add "tc_analysis" back in after empty dat is resolved. sets = "polar","enso_diags","streamflow", @@ -151,7 +151,7 @@ years = "1985:1989:2", [global_time_series] active = True bundle = "bundle2" -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance" diff --git a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg index 9d605c3d..9353c081 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg @@ -2,15 +2,15 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" fail_on_dependency_skip = True input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/unique_id/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250327_try10/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/test_pr697_20250327_try10" years = "1980:1984:2", [climo] @@ -101,7 +101,7 @@ walltime = "00:30:00" active = True climo_diurnal_frequency = "diurnal_8xdaily" climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -134,7 +134,7 @@ years = "1982:1984:2", partition = "compute" qos = "regular" ref_name = "v2.LR.historical_0201" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250327_try10/v2.LR.historical_0201/post/atm/180x360_aave/clim" run_type = "model_vs_model" short_ref_name = "same simulation" swap_test_ref = False @@ -151,7 +151,7 @@ years = "1982:1984:2", partition = "compute" qos = "regular" ref_name = "v2.LR.historical_0201" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/unique_id/v2.LR.historical_0201/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250327_try10/v2.LR.historical_0201/post/lnd/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon_land", short_ref_name = "same simulation" @@ -175,7 +175,7 @@ walltime = "00:30:00" [global_time_series] active = True climo_years ="1980-1984", "1985-1990", -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" experiment_name = "v2.LR.historical_0201" figstr = "v2.LR.historical_0201" moc_file=mocTimeSeries_1980-1990.nc diff --git a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg index f7103d1b..f815d124 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg @@ -2,17 +2,17 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" fail_on_dependency_skip = True infer_path_parameters = False infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250327_try10" years = "1985:1989:2", [climo] @@ -109,7 +109,7 @@ active = True climo_diurnal_frequency = "diurnal_8xdaily" climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" climo_subsection = "atm_monthly_180x360_aave" -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -161,16 +161,16 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/" tag = "model_vs_model" ts_num_years_ref = 2 # Reference paths - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" # mvm streamflow only gauges_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv" - reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/rof/native/ts/monthly" + reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/rof/native/ts/monthly" # mvm diurnal_cycle only - reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" + reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" # mvm "enso_diags", "qbo", "area_mean_time_series" - reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly" + reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly" # mvm tropical_subseasonal only - reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily" + reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily" [[ lnd_monthly_mvm_lnd ]] # Test model-vs-model using the same files as the reference @@ -186,7 +186,7 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/" tag = "model_vs_model" ts_num_years_ref = 2 # Reference paths - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/lnd/180x360_aave/clim" [mpas_analysis] @@ -205,7 +205,7 @@ walltime = "00:30:00" [global_time_series] active = True climo_years = "1985-1989", "1990-1995", -environment_commands = "source /conda.sh; conda activate " +environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" moc_file=mocTimeSeries_1985-1995.nc diff --git a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh index 7efea25b..c0da5533 100755 --- a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh +++ b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh @@ -9,13 +9,13 @@ do # Your output will now become the new expectation. # Copy output so you don't have to rerun zppy to generate the output. if [[ "${test_name,,}" == "comprehensive_v2" ]]; then - cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} + cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test_pr697_20250327_try10/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} else - cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} + cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test_pr697_20250327_try10/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} fi if [[ "${test_name,,}" == "bundles" ]]; then mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files - cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files + cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files fi zppy_top_level=$(pwd) cd /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} diff --git a/tests/integration/template_min_case_global_time_series_original_8_missing_ocn.cfg b/tests/integration/template_min_case_global_time_series_original_8_missing_ocn.cfg new file mode 100644 index 00000000..a72f28d4 --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_original_8_missing_ocn.cfg @@ -0,0 +1,38 @@ +[default] +case = "#expand case_name#" +constraint = "#expand constraint#" +dry_run = "#expand dry_run#" +environment_commands = "#expand environment_commands#" +input = #expand user_input_v3#/E3SMv3/#expand case_name# +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "#expand user_output#zppy_min_case_global_time_series_original_8_missing_ocn_output/#expand unique_id#/#expand case_name#" +partition = "#expand partition_short#" +qos = "#expand qos_short#" +www = "#expand user_www#zppy_min_case_global_time_series_original_8_missing_ocn_www/#expand unique_id#" + +[ts] +active = True +walltime = "00:30:00" + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + years = "1985:1995:5", + +[global_time_series] +active = True +climo_years = "1985-1989", "1990-1995", +environment_commands = "#expand global_time_series_environment_commands#" +experiment_name = "#expand case_name#" +figstr = "#expand case_name#" +# plots_original -- use the default vars, +# which includes 3 ocean plots that won't work since we're not running mpas_analysis. +# This should cause `skipping because of dependency status file missing`. +ts_num_years = 5 +ts_years = "1985-1989", "1985-1995", +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/template_min_case_global_time_series_viewers.cfg b/tests/integration/template_min_case_global_time_series_viewers.cfg new file mode 100644 index 00000000..fc49406e --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers.cfg @@ -0,0 +1,45 @@ +[default] +case = "#expand case_name#" +constraint = "#expand constraint#" +dry_run = "#expand dry_run#" +environment_commands = "#expand environment_commands#" +input = #expand user_input_v3#/E3SMv3/#expand case_name# +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "#expand user_output#zppy_min_case_global_time_series_viewers_output/#expand unique_id#/#expand case_name#" +partition = "#expand partition_short#" +qos = "#expand qos_short#" +www = "#expand user_www#zppy_min_case_global_time_series_viewers_www/#expand unique_id#" + +[ts] +active = True +walltime = "00:30:00" +years = "1985:1995:5", + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + vars = "TREFHT,AODDUST" + + [[ lnd_monthly_glb ]] + frequency = "monthly" + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" + +[global_time_series] +active = True +environment_commands = "#expand global_time_series_environment_commands#" +experiment_name = "#expand case_name#" +figstr = "#expand case_name#" +make_viewer = True +plots_original="" +plots_atm = "TREFHT" +plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" +ts_num_years = 5 +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/template_min_case_global_time_series_viewers_all_land_variables.cfg b/tests/integration/template_min_case_global_time_series_viewers_all_land_variables.cfg new file mode 100644 index 00000000..fa4580cf --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers_all_land_variables.cfg @@ -0,0 +1,45 @@ +[default] +case = "#expand case_name#" +constraint = "#expand constraint#" +dry_run = "#expand dry_run#" +environment_commands = "#expand environment_commands#" +input = #expand user_input_v3#/E3SMv3/#expand case_name# +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "#expand user_output#zppy_min_case_global_time_series_viewers_all_land_variables_output/#expand unique_id#/#expand case_name#" +partition = "#expand partition_short#" +qos = "#expand qos_short#" +www = "#expand user_www#zppy_min_case_global_time_series_viewers_all_land_variables_www/#expand unique_id#" + +[ts] +active = True +walltime = "00:30:00" +years = "1985:1995:5", + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + vars = "TREFHT,AODDUST" + + [[ lnd_monthly_glb ]] + frequency = "monthly" + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" + +[global_time_series] +active = True +environment_commands = "#expand global_time_series_environment_commands#" +experiment_name = "#expand case_name#" +figstr = "#expand case_name#" +make_viewer = True +plots_original="" +plots_atm = "TREFHT" +plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables. +ts_num_years = 5 +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/template_min_case_global_time_series_viewers_original_8.cfg b/tests/integration/template_min_case_global_time_series_viewers_original_8.cfg new file mode 100644 index 00000000..620a25f3 --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers_original_8.cfg @@ -0,0 +1,50 @@ +[default] +case = "#expand case_name#" +constraint = "#expand constraint#" +dry_run = "#expand dry_run#" +environment_commands = "#expand environment_commands#" +input = #expand user_input_v3#/E3SMv3/#expand case_name# +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "#expand user_output#zppy_min_case_global_time_series_viewers_original_8_output/#expand unique_id#/#expand case_name#" +partition = "#expand partition_short#" +qos = "#expand qos_short#" +www = "#expand user_www#zppy_min_case_global_time_series_viewers_original_8_www/#expand unique_id#" + +[ts] +active = True +walltime = "00:30:00" + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + years = "1985:1995:5", + +[mpas_analysis] +active = True +anomalyRefYear = 1985 +climo_years = "1985-1989", "1990-1995", +enso_years = "1985-1989", "1990-1995", +mesh = "IcoswISC30E3r5" +parallelTaskCount = 6 +partition = "#expand partition_long#" +qos = "#expand qos_long#" +shortTermArchive = True +ts_years = "1985-1989", "1985-1995", +walltime = "#expand mpas_analysis_walltime#" + +[global_time_series] +active = True +climo_years = "1985-1989", "1990-1995", +environment_commands = "#expand global_time_series_environment_commands#" +experiment_name = "#expand case_name#" +figstr = "#expand case_name#" +make_viewer = True +moc_file=mocTimeSeries_1985-1995.nc +ts_num_years = 5 +ts_years = "1985-1989", "1985-1995", +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg b/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg new file mode 100644 index 00000000..161ce120 --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg @@ -0,0 +1,45 @@ +[default] +case = "#expand case_name#" +constraint = "#expand constraint#" +dry_run = "#expand dry_run#" +environment_commands = "#expand environment_commands#" +input = #expand user_input_v3#/E3SMv3/#expand case_name# +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "#expand user_output#zppy_min_case_global_time_series_viewers_original_atm_plus_land_output/#expand unique_id#/#expand case_name#" +partition = "#expand partition_short#" +qos = "#expand qos_short#" +www = "#expand user_www#zppy_min_case_global_time_series_viewers_original_atm_plus_land_www/#expand unique_id#" + +[ts] +active = True +walltime = "00:30:00" +years = "1985:1995:5", + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + + [[ lnd_monthly_glb ]] + frequency = "monthly" + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + vars = "" # Get all available variables + +[global_time_series] +active = True +environment_commands = "#expand global_time_series_environment_commands#" +experiment_name = "#expand case_name#" +figstr = "#expand case_name#" +make_viewer = True +# We have to set plots_original to the 5 plots that don't require ocean. +plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance" +plots_atm = "TREFHT" +plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" +ts_num_years = 5 +walltime = "00:30:00" +years = "1985-1995", diff --git a/tests/integration/template_min_case_global_time_series_viewers_undefined_variables.cfg b/tests/integration/template_min_case_global_time_series_viewers_undefined_variables.cfg new file mode 100644 index 00000000..e139f477 --- /dev/null +++ b/tests/integration/template_min_case_global_time_series_viewers_undefined_variables.cfg @@ -0,0 +1,47 @@ +[default] +case = "#expand case_name#" +constraint = "#expand constraint#" +dry_run = "#expand dry_run#" +environment_commands = "#expand environment_commands#" +input = #expand user_input_v3#/E3SMv3/#expand case_name# +input_subdir = archive/atm/hist +mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" +output = "#expand user_output#zppy_min_case_global_time_series_viewers_undefined_variables_output/#expand unique_id#/#expand case_name#" +partition = "#expand partition_short#" +qos = "#expand qos_short#" +www = "#expand user_www#zppy_min_case_global_time_series_viewers_undefined_variables_www/#expand unique_id#" + +[ts] +active = True +walltime = "00:30:00" +years = "1985:1995:5", + + [[ atm_monthly_glb ]] + # Note global average won't work for 3D variables. + frequency = "monthly" + input_files = "eam.h0" + input_subdir = "archive/atm/hist" + mapping_file = "glb" + vars = "TREFHT,AODDUST" + + [[ lnd_monthly_glb ]] + frequency = "monthly" + input_files = "elm.h0" + input_subdir = "archive/lnd/hist" + mapping_file = "glb" + vars = "" # This should prompt NCO to process all available variables. + +[global_time_series] +active = True +environment_commands = "#expand global_time_series_environment_commands#" +experiment_name = "#expand case_name#" +figstr = "#expand case_name#" +make_viewer = True +partition = "#expand partition_long#" +plots_original="" +plots_atm = "TREFHT" +plots_lnd = "all" # This should prompt global_time_series to attempt plotting all 354 Land variables. +qos = "#expand qos_long#" +ts_num_years = 5 +walltime = "04:00:00" +years = "1985-1995", diff --git a/tests/integration/utils.py b/tests/integration/utils.py index d2613d70..16403aeb 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -7,7 +7,7 @@ from mache import MachineInfo from PIL import Image, ImageChops, ImageDraw -UNIQUE_ID = "unique_id" +UNIQUE_ID = "test_pr697_20250327_try10" # Image checking ########################################################## @@ -171,11 +171,11 @@ def get_chyrsalis_expansions(config): "constraint": "", # To run this test, replace conda environment with your e3sm_diags dev environment # To use default environment_commands, set to "" - "diags_environment_commands": "source /conda.sh; conda activate ", + "diags_environment_commands": "", "diags_walltime": "5:00:00", - "environment_commands_test": "", + "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh", "expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/", - "global_time_series_environment_commands": "source /conda.sh; conda activate ", + "global_time_series_environment_commands": "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326", "mpas_analysis_walltime": "00:30:00", "partition_long": "compute", "partition_short": "debug", @@ -349,8 +349,14 @@ def generate_cfgs(unified_testing=False, dry_run=False): "min_case_e3sm_diags_tropical_subseasonal", "min_case_global_time_series_comprehensive_v3_setup_only", "min_case_global_time_series_custom", + "min_case_global_time_series_original_8_missing_ocn", "min_case_global_time_series_original_8_no_ocn", "min_case_global_time_series_original_8", + "min_case_global_time_series_viewers", + "min_case_global_time_series_viewers_all_land_variables", + "min_case_global_time_series_viewers_original_8", + "min_case_global_time_series_viewers_original_atm_plus_land", + "min_case_global_time_series_viewers_undefined_variables", "min_case_ilamb_diff_years", "min_case_ilamb_land_only", "min_case_ilamb", @@ -398,4 +404,4 @@ def generate_cfgs(unified_testing=False, dry_run=False): if __name__ == "__main__": - generate_cfgs(unified_testing=False, dry_run=False) + generate_cfgs(unified_testing=True, dry_run=False) diff --git a/zppy/defaults/default.ini b/zppy/defaults/default.ini index f04df56b..f98d57df 100644 --- a/zppy/defaults/default.ini +++ b/zppy/defaults/default.ini @@ -85,6 +85,8 @@ ts_subsection = string(default="") # If `vars` is set to "", then climo and ts will process *all* variables. # This is accomplished by not setting `-v`/`--vars` for `ncclimo`. vars = string(default="FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U") +# This is the list of variables to exclude. It is only used if `vars` is set to "". +vars_exclude = string(default="H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR") # The maximum time to run walltime = string(default="02:00:00") # web_portal_base_path -- NOTE: this parameter is created internally @@ -319,7 +321,7 @@ figstr = string(default="") # NOTE: always overrides value in [default] input_subdir = string(default="archive/ocn/hist") # Set to True to construct a Viewer page -make_viewer = string(default="False") +make_viewer = boolean(default=False) moc_file = string(default="") # Number of columns per page ncols = integer(default=2) diff --git a/zppy/global_time_series.py b/zppy/global_time_series.py index 296f1ead..2bfefcc8 100644 --- a/zppy/global_time_series.py +++ b/zppy/global_time_series.py @@ -31,6 +31,9 @@ def global_time_series(config, script_dir, existing_bundles, job_ids_file): # --- Generate and submit global_time_series scripts --- for c in tasks: + if c["make_viewer"]: + c["nrows"] = 1 + c["ncols"] = 1 c["ts_num_years"] = int(c["ts_num_years"]) # Loop over year sets year_sets = get_years(c["years"]) diff --git a/zppy/templates/ts.bash b/zppy/templates/ts.bash index de24489a..cd718993 100644 --- a/zppy/templates/ts.bash +++ b/zppy/templates/ts.bash @@ -66,6 +66,8 @@ cat input.txt | ncclimo \ -c {{ case }} \ {%- if vars != '' %} -v ${vars} \ +{%- elif 'elm' in input_files %} +--xcl_var -v {{ vars_exclude }} \ {%- endif %} --split \ {%- if extra_vars != '' %} From 7e4544980a70ae4004344944e8ba1fa556f7922f Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Fri, 28 Mar 2025 12:26:51 -0500 Subject: [PATCH 2/3] Fix nrows ncols logic --- .../test_min_case_add_dependencies_chrysalis.cfg | 4 ++-- ...min_case_carryover_dependencies_chrysalis.cfg | 6 +++--- ..._min_case_deprecated_parameters_chrysalis.cfg | 4 ++-- ...case_e3sm_diags_depend_on_climo_chrysalis.cfg | 4 ++-- ...3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg | 4 ++-- ...3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg | 6 +++--- ...in_case_e3sm_diags_depend_on_ts_chrysalis.cfg | 4 ++-- ...e_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg | 4 ++-- ...e_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg | 6 +++--- ...n_case_e3sm_diags_diurnal_cycle_chrysalis.cfg | 4 ++-- ..._e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg | 4 ++-- ..._e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg | 6 +++--- ...e_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg | 4 ++-- ...e_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg | 6 +++--- ..._min_case_e3sm_diags_streamflow_chrysalis.cfg | 4 ++-- ...ase_e3sm_diags_streamflow_mvm_1_chrysalis.cfg | 4 ++-- ...ase_e3sm_diags_streamflow_mvm_2_chrysalis.cfg | 6 +++--- ...min_case_e3sm_diags_tc_analysis_chrysalis.cfg | 4 ++-- ...se_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg | 4 ++-- ...se_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg | 6 +++--- ...e3sm_diags_tc_analysis_parallel_chrysalis.cfg | 4 ++-- ..._case_e3sm_diags_tc_analysis_v2_chrysalis.cfg | 4 ++-- ...e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg | 4 ++-- ...e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg | 6 +++--- ...m_diags_tc_analysis_v2_parallel_chrysalis.cfg | 4 ++-- ...e3sm_diags_tropical_subseasonal_chrysalis.cfg | 4 ++-- ...iags_tropical_subseasonal_mvm_1_chrysalis.cfg | 4 ++-- ...iags_tropical_subseasonal_mvm_2_chrysalis.cfg | 6 +++--- ...ies_comprehensive_v3_setup_only_chrysalis.cfg | 4 ++-- ..._case_global_time_series_custom_chrysalis.cfg | 4 ++-- ...e_global_time_series_original_8_chrysalis.cfg | 4 ++-- ...e_series_original_8_missing_ocn_chrysalis.cfg | 4 ++-- ...l_time_series_original_8_no_ocn_chrysalis.cfg | 4 ++-- ...ries_viewers_all_land_variables_chrysalis.cfg | 4 ++-- ...case_global_time_series_viewers_chrysalis.cfg | 4 ++-- ..._time_series_viewers_original_8_chrysalis.cfg | 4 ++-- ..._viewers_original_atm_plus_land_chrysalis.cfg | 4 ++-- ...ies_viewers_undefined_variables_chrysalis.cfg | 4 ++-- .../generated/test_min_case_ilamb_chrysalis.cfg | 4 ++-- .../test_min_case_ilamb_diff_years_chrysalis.cfg | 4 ++-- .../test_min_case_ilamb_land_only_chrysalis.cfg | 4 ++-- .../test_min_case_mpas_analysis_chrysalis.cfg | 4 ++-- .../generated/test_min_case_nco_chrysalis.cfg | 4 ++-- .../test_min_case_tc_analysis_only_chrysalis.cfg | 4 ++-- .../test_min_case_tc_analysis_res_chrysalis.cfg | 4 ++-- ...case_tc_analysis_simultaneous_1_chrysalis.cfg | 4 ++-- ...case_tc_analysis_simultaneous_2_chrysalis.cfg | 4 ++-- ...e_tc_analysis_v2_simultaneous_1_chrysalis.cfg | 4 ++-- ...e_tc_analysis_v2_simultaneous_2_chrysalis.cfg | 4 ++-- .../generated/test_weekly_bundles_chrysalis.cfg | 6 +++--- .../test_weekly_comprehensive_v2_chrysalis.cfg | 8 ++++---- .../test_weekly_comprehensive_v3_chrysalis.cfg | 16 ++++++++-------- .../update_weekly_expected_files_chrysalis.sh | 6 +++--- tests/integration/utils.py | 2 +- zppy/global_time_series.py | 3 --- zppy/templates/global_time_series.bash | 6 +----- 56 files changed, 127 insertions(+), 134 deletions(-) diff --git a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg index a469366f..40636003 100644 --- a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg @@ -14,12 +14,12 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" # ts is in 5 year increments ts_num_years = 5 -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test_pr697_20250328_try2" # We want to produce diagnostics for 10 years. years = "1985:1995:10", diff --git a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg index 711f3486..1262ecb5 100644 --- a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg @@ -29,10 +29,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/test_pr697_20250328_try2" years = "1985:1989:2", [climo] @@ -152,7 +152,7 @@ years = "1987:1989:2" partition = "compute" qos = "regular" ref_name = "v3.LR.historical_0051" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon", short_ref_name = "same simulation" diff --git a/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg b/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg index ca141960..366a38e9 100644 --- a/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg @@ -9,10 +9,10 @@ infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250328_try2" years = "1985:1989:2", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg index 64d8ea05..52b699c4 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test_pr697_20250328_try2" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg index fd5492fb..1833d6ea 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test_pr697_20250328_try2" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg index 57cc7b81..e70464f9 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test_pr697_20250328_try2" years = "1995:1999:4", [climo] @@ -42,7 +42,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg index 9c87032f..8099b396 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test_pr697_20250328_try2" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg index 6c0df21a..2f035469 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test_pr697_20250328_try2" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg index 80a301bd..0e8581e4 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test_pr697_20250328_try2" years = "1995:1999:4", [ts] @@ -42,7 +42,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "enso_diags","qbo", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg index 88f77cf6..c63b2e56 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test_pr697_20250328_try2" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg index f0c3db78..55b31208 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test_pr697_20250328_try2" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg index c4f71af4..abdbf525 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test_pr697_20250328_try2" years = "1995:1999:4", [climo] @@ -40,7 +40,7 @@ walltime = "5:00:00" ref_name = "v3.LR.historical_0051" ref_years = "1985-1988", # Use _1 as reference - reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" + reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" run_type = "model_vs_model" sets = "diurnal_cycle", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg index b61f701d..d2ba95de 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/test_pr697_20250328_try2" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg index 75a5cb2b..722ab732 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/test_pr697_20250328_try2" years = "1995:1999:4", [climo] @@ -41,7 +41,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/lnd/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon_land", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg index 6b3c4a6e..8e5e7ac5 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/test_pr697_20250328_try2" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg index fee52d36..13cb4c5e 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/test_pr697_20250328_try2" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg index 59758fc6..e5ea6d8a 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/test_pr697_20250328_try2" years = "1995:1999:4", [ts] @@ -44,7 +44,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_ts_rof determined automatically run_type = "model_vs_model" sets="streamflow" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg index 71ced673..33fd31b6 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg index c35f9371..9f580bbb 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg index 3fcd2055..e89e0757 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg @@ -7,10 +7,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250328_try2" years = "1995:1997:2", [tc_analysis] @@ -37,7 +37,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1986", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_tc determined automatically run_type = "model_vs_model" sets = "tc_analysis", diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg index b30fb655..5b0a248c 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/test_pr697_20250328_try2" years = "1985:1989:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg index a4cc949d..5ae97bf7 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test_pr697_20250327_try10/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test_pr697_20250328_try2/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg index 8a232450..8bca422f 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250327_try10/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250328_try2/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg index 6812a2bb..eeaf896d 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg @@ -7,10 +7,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test_pr697_20250327_try10/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test_pr697_20250328_try2/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250328_try2" years = "1995:1997:2", [tc_analysis] @@ -37,7 +37,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1986", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250327_try10/v2.LR.historical_0201/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250328_try2/v2.LR.historical_0201/post/atm/180x360_aave/clim" # reference_data_path_tc determined automatically run_type = "model_vs_model" sets = "tc_analysis", diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg index 67b12a05..3e36d333 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/test_pr697_20250327_try10/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/test_pr697_20250328_try2/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/test_pr697_20250328_try2" years = "1985:1989:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg index 82227a30..6b8deca3 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_www/test_pr697_20250328_try2" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg index a9f458ba..4736c9b9 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_www/test_pr697_20250328_try2" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg index 4c82fd9c..86c9c7c3 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_www/test_pr697_20250328_try2" years = "1995:1999:4", [ts] @@ -43,7 +43,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_daily is determined automatically run_type = "model_vs_model" sets = "tropical_subseasonal", diff --git a/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg index 1ef79f81..cf51eadd 100644 --- a/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg @@ -9,10 +9,10 @@ infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_www/test_pr697_20250328_try2" years = "1985:1989:2", [ts] diff --git a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg index a7b3035f..82ad77ed 100644 --- a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_custom_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_custom_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_custom_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_custom_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg index c0e4e991..6fc1f2b4 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg index f2a4493a..5aea6025 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg index 49023dc5..83c5e028 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg index 993dfc1e..2cbe811c 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg index 15183ebd..838fdd64 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg index 4b285d1f..e89704d0 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg index 1fc2c7cc..2e79150c 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg index 2d27e65b..1d327533 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg index ee221281..3b58b2eb 100644 --- a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg @@ -6,11 +6,11 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" walltime = "00:30:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg index d13d549e..1ebd6ed2 100644 --- a/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg @@ -6,11 +6,11 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_diff_years_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_diff_years_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" walltime = "00:30:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_diff_years_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_diff_years_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg index bc05bf77..5c811c2b 100644 --- a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_land_only_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_land_only_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_land_only_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_land_only_www/test_pr697_20250328_try2" [ts] active = True diff --git a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg index a42a10bc..041f84b9 100644 --- a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_mpas_analysis_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_mpas_analysis_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_mpas_analysis_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_mpas_analysis_www/test_pr697_20250328_try2" [mpas_analysis] active = True diff --git a/tests/integration/generated/test_min_case_nco_chrysalis.cfg b/tests/integration/generated/test_min_case_nco_chrysalis.cfg index b5f80cd4..27472cdc 100644 --- a/tests/integration/generated/test_min_case_nco_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_nco_chrysalis.cfg @@ -9,10 +9,10 @@ infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_nco_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_nco_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_nco_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_nco_www/test_pr697_20250328_try2" years = "1985:1989:2", [climo] diff --git a/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg index bd4e2e5a..4285a20e 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_only_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_only_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_only_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_only_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg index fa1ad048..7c08dcea 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_res_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_res_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_res_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_res_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg index 4535aae6..30cdb3c1 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg index dc440a2d..f0f9bfdc 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg @@ -8,10 +8,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg index 09b70f3d..05366919 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg @@ -6,10 +6,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test_pr697_20250327_try10/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test_pr697_20250328_try2/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg index 3097fc2e..a117f0c9 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg @@ -8,10 +8,10 @@ environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test_pr697_20250327_try10/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test_pr697_20250328_try2/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test_pr697_20250328_try2" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg index fbfc7009..545a4321 100644 --- a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg @@ -32,11 +32,11 @@ input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "compute" qos = "regular" walltime = "07:00:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_bundles_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_bundles_www/test_pr697_20250328_try2" [bundle] @@ -137,7 +137,7 @@ years = "1985:1989:2", ref_name = "v3.LR.historical_0051" ref_start_yr = 1985 ref_years = "1985-1986", - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" # TODO: Add "tc_analysis" back in after empty dat is resolved. sets = "polar","enso_diags","streamflow", diff --git a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg index 9353c081..9eb22088 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg @@ -7,10 +7,10 @@ fail_on_dependency_skip = True input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250327_try10/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250328_try2/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/test_pr697_20250328_try2" years = "1980:1984:2", [climo] @@ -134,7 +134,7 @@ years = "1982:1984:2", partition = "compute" qos = "regular" ref_name = "v2.LR.historical_0201" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250327_try10/v2.LR.historical_0201/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250328_try2/v2.LR.historical_0201/post/atm/180x360_aave/clim" run_type = "model_vs_model" short_ref_name = "same simulation" swap_test_ref = False @@ -151,7 +151,7 @@ years = "1982:1984:2", partition = "compute" qos = "regular" ref_name = "v2.LR.historical_0201" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250327_try10/v2.LR.historical_0201/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250328_try2/v2.LR.historical_0201/post/lnd/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon_land", short_ref_name = "same simulation" diff --git a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg index f815d124..95e460e9 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg @@ -9,10 +9,10 @@ infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250327_try10" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250328_try2" years = "1985:1989:2", [climo] @@ -161,16 +161,16 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/" tag = "model_vs_model" ts_num_years_ref = 2 # Reference paths - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" # mvm streamflow only gauges_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv" - reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/rof/native/ts/monthly" + reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/rof/native/ts/monthly" # mvm diurnal_cycle only - reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" + reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" # mvm "enso_diags", "qbo", "area_mean_time_series" - reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly" + reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly" # mvm tropical_subseasonal only - reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily" + reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily" [[ lnd_monthly_mvm_lnd ]] # Test model-vs-model using the same files as the reference @@ -186,7 +186,7 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/" tag = "model_vs_model" ts_num_years_ref = 2 # Reference paths - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/lnd/180x360_aave/clim" [mpas_analysis] diff --git a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh index c0da5533..fc77ec1a 100755 --- a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh +++ b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh @@ -9,13 +9,13 @@ do # Your output will now become the new expectation. # Copy output so you don't have to rerun zppy to generate the output. if [[ "${test_name,,}" == "comprehensive_v2" ]]; then - cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test_pr697_20250327_try10/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} + cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test_pr697_20250328_try2/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} else - cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test_pr697_20250327_try10/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} + cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test_pr697_20250328_try2/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} fi if [[ "${test_name,,}" == "bundles" ]]; then mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files - cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250327_try10/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files + cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files fi zppy_top_level=$(pwd) cd /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} diff --git a/tests/integration/utils.py b/tests/integration/utils.py index 16403aeb..586f4b68 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -7,7 +7,7 @@ from mache import MachineInfo from PIL import Image, ImageChops, ImageDraw -UNIQUE_ID = "test_pr697_20250327_try10" +UNIQUE_ID = "test_pr697_20250328_try2" # Image checking ########################################################## diff --git a/zppy/global_time_series.py b/zppy/global_time_series.py index 2bfefcc8..296f1ead 100644 --- a/zppy/global_time_series.py +++ b/zppy/global_time_series.py @@ -31,9 +31,6 @@ def global_time_series(config, script_dir, existing_bundles, job_ids_file): # --- Generate and submit global_time_series scripts --- for c in tasks: - if c["make_viewer"]: - c["nrows"] = 1 - c["ncols"] = 1 c["ts_num_years"] = int(c["ts_num_years"]) # Loop over year sets year_sets = get_years(c["years"]) diff --git a/zppy/templates/global_time_series.bash b/zppy/templates/global_time_series.bash index 8b1a2e0e..8e73b440 100644 --- a/zppy/templates/global_time_series.bash +++ b/zppy/templates/global_time_series.bash @@ -9,12 +9,8 @@ results_dir={{ prefix }}_results zi-global-time-series --use_ocn {{ use_ocn }} --input {{ input }} --input_subdir {{ input_subdir }} --moc_file {{ moc_file }} --case_dir {{ output }} --experiment_name {{ experiment_name }} --figstr {{ figstr }} --color {{ color }} --ts_num_years {{ ts_num_years }} --plots_original {{ plots_original }} --plots_atm {{ plots_atm }} --plots_ice {{ plots_ice }} --plots_lnd {{ plots_lnd }} --plots_ocn {{ plots_ocn }} --nrows {{ nrows }} --ncols {{ ncols }} --results_dir ${results_dir} --regions {{ regions }} --make_viewer {{ make_viewer }} --start_yr {{ year1 }} --end_yr {{ year2 }} -echo 'Copy images to directory' results_dir_absolute_path={{ scriptDir }}/${results_dir} -mkdir -p ${results_dir_absolute_path} -cp ${results_dir}/*.pdf ${results_dir_absolute_path} -cp ${results_dir}/*.png ${results_dir_absolute_path} -cp -r ${results_dir}/viewer ${results_dir_absolute_path} +# We are already in scriptDir so we don't have to copy files over to results_dir_absolute_path ################################################################################ case={{ case }} From 6f714a5f86355035b209032db95f5d1b7842769a Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Fri, 28 Mar 2025 18:18:31 -0500 Subject: [PATCH 3/3] Clean up code --- ...st_min_case_add_dependencies_chrysalis.cfg | 8 +++---- ..._case_carryover_dependencies_chrysalis.cfg | 10 ++++----- ...n_case_deprecated_parameters_chrysalis.cfg | 8 +++---- ...e_e3sm_diags_depend_on_climo_chrysalis.cfg | 8 +++---- ..._diags_depend_on_climo_mvm_1_chrysalis.cfg | 6 ++--- ..._diags_depend_on_climo_mvm_2_chrysalis.cfg | 10 ++++----- ...case_e3sm_diags_depend_on_ts_chrysalis.cfg | 8 +++---- ...3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg | 6 ++--- ...3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg | 10 ++++----- ...ase_e3sm_diags_diurnal_cycle_chrysalis.cfg | 8 +++---- ...sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg | 6 ++--- ...sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg | 10 ++++----- ...3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg | 6 ++--- ...3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg | 10 ++++----- ...n_case_e3sm_diags_streamflow_chrysalis.cfg | 8 +++---- ..._e3sm_diags_streamflow_mvm_1_chrysalis.cfg | 6 ++--- ..._e3sm_diags_streamflow_mvm_2_chrysalis.cfg | 10 ++++----- ..._case_e3sm_diags_tc_analysis_chrysalis.cfg | 8 +++---- ...e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg | 6 ++--- ...e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg | 10 ++++----- ...m_diags_tc_analysis_parallel_chrysalis.cfg | 8 +++---- ...se_e3sm_diags_tc_analysis_v2_chrysalis.cfg | 8 +++---- ...m_diags_tc_analysis_v2_mvm_1_chrysalis.cfg | 6 ++--- ...m_diags_tc_analysis_v2_mvm_2_chrysalis.cfg | 10 ++++----- ...iags_tc_analysis_v2_parallel_chrysalis.cfg | 8 +++---- ...m_diags_tropical_subseasonal_chrysalis.cfg | 6 ++--- ...s_tropical_subseasonal_mvm_1_chrysalis.cfg | 6 ++--- ...s_tropical_subseasonal_mvm_2_chrysalis.cfg | 10 ++++----- ..._comprehensive_v3_setup_only_chrysalis.cfg | 6 ++--- ...se_global_time_series_custom_chrysalis.cfg | 8 +++---- ...lobal_time_series_original_8_chrysalis.cfg | 8 +++---- ...eries_original_8_missing_ocn_chrysalis.cfg | 8 +++---- ...ime_series_original_8_no_ocn_chrysalis.cfg | 8 +++---- ...s_viewers_all_land_variables_chrysalis.cfg | 8 +++---- ...e_global_time_series_viewers_chrysalis.cfg | 8 +++---- ...me_series_viewers_original_8_chrysalis.cfg | 8 +++---- ...ewers_original_atm_plus_land_chrysalis.cfg | 10 ++++----- ..._viewers_undefined_variables_chrysalis.cfg | 8 +++---- .../test_min_case_ilamb_chrysalis.cfg | 6 ++--- ...st_min_case_ilamb_diff_years_chrysalis.cfg | 6 ++--- ...est_min_case_ilamb_land_only_chrysalis.cfg | 6 ++--- .../test_min_case_mpas_analysis_chrysalis.cfg | 6 ++--- .../generated/test_min_case_nco_chrysalis.cfg | 6 ++--- ...st_min_case_tc_analysis_only_chrysalis.cfg | 6 ++--- ...est_min_case_tc_analysis_res_chrysalis.cfg | 6 ++--- ...e_tc_analysis_simultaneous_1_chrysalis.cfg | 6 ++--- ...e_tc_analysis_simultaneous_2_chrysalis.cfg | 6 ++--- ...c_analysis_v2_simultaneous_1_chrysalis.cfg | 6 ++--- ...c_analysis_v2_simultaneous_2_chrysalis.cfg | 6 ++--- .../test_weekly_bundles_chrysalis.cfg | 12 +++++----- ...test_weekly_comprehensive_v2_chrysalis.cfg | 14 ++++++------ ...test_weekly_comprehensive_v3_chrysalis.cfg | 22 +++++++++---------- .../update_weekly_expected_files_chrysalis.sh | 6 ++--- ..._series_viewers_original_atm_plus_land.cfg | 2 +- tests/integration/utils.py | 10 ++++----- tests/test_sections.py | 8 +++++++ 56 files changed, 226 insertions(+), 218 deletions(-) diff --git a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg index 40636003..ef84fe93 100644 --- a/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg @@ -10,16 +10,16 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" # ts is in 5 year increments ts_num_years = 5 -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/unique_id" # We want to produce diagnostics for 10 years. years = "1985:1995:10", @@ -93,7 +93,7 @@ years = "1985:1995:5" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg index 1262ecb5..8d8c1f97 100644 --- a/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg @@ -25,14 +25,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/unique_id" years = "1985:1989:2", [climo] @@ -119,7 +119,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -152,7 +152,7 @@ years = "1987:1989:2" partition = "compute" qos = "regular" ref_name = "v3.LR.historical_0051" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon", short_ref_name = "same simulation" diff --git a/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg b/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg index 366a38e9..77da5bd9 100644 --- a/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_deprecated_parameters_chrysalis.cfg @@ -2,17 +2,17 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = True # Exlcusively testing with dry_run -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" fail_on_dependency_skip = True infer_path_parameters = False infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id" years = "1985:1989:2", [ts] @@ -36,7 +36,7 @@ walltime = "00:30:00" active = True atmosphere_only = "False" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654 climo_years = "1985-1989", "1990-1995", -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" moc_file=mocTimeSeries_1985-1995.nc diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg index 52b699c4..1238eb0c 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/unique_id" years = "1985:1989:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg index 1833d6ea..2ab6a865 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/unique_id" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg index e70464f9..d094eb19 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/unique_id" years = "1995:1999:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -42,7 +42,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg index 8099b396..998f65bc 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/unique_id" years = "1985:1989:4", [ts] @@ -23,7 +23,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg index 2f035469..51cfd973 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/unique_id" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg index 0e8581e4..cc694380 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/unique_id" years = "1995:1999:4", [ts] @@ -23,7 +23,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -42,7 +42,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" sets = "enso_diags","qbo", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg index c63b2e56..6016c7e3 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/unique_id" years = "1985:1989:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg index 55b31208..938aa8f6 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/unique_id" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg index abdbf525..a3ee1fd6 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/unique_id" years = "1995:1999:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -40,7 +40,7 @@ walltime = "5:00:00" ref_name = "v3.LR.historical_0051" ref_years = "1985-1988", # Use _1 as reference - reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" + reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" run_type = "model_vs_model" sets = "diurnal_cycle", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg index d2ba95de..0b13acfe 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/unique_id" years = "1985:1989:4", [climo] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg index 722ab732..425c91c6 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/unique_id" years = "1995:1999:4", [climo] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -41,7 +41,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon_land", short_ref_name = "v3.LR.historical_0051" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg index 8e5e7ac5..448078da 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/unique_id" years = "1985:1989:4", [ts] @@ -26,7 +26,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg index 13cb4c5e..98ca91b8 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/unique_id" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg index e5ea6d8a..70469f73 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/unique_id" years = "1995:1999:4", [ts] @@ -26,7 +26,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -44,7 +44,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_ts_rof determined automatically run_type = "model_vs_model" sets="streamflow" diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg index 33fd31b6..3520160b 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/unique_id" years = "1985:1987:2", [tc_analysis] @@ -18,7 +18,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg index 9f580bbb..7401b998 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg index e89e0757..1740f190 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_mvm_2_chrysalis.cfg @@ -3,14 +3,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" years = "1995:1997:2", [tc_analysis] @@ -19,7 +19,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -37,7 +37,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1986", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_tc determined automatically run_type = "model_vs_model" sets = "tc_analysis", diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg index 5b0a248c..294292a0 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_parallel_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/unique_id" years = "1985:1989:2", [tc_analysis] @@ -18,7 +18,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg index 5ae97bf7..20c56132 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/test_pr697_20250328_try2/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_output/unique_id/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_www/unique_id" years = "1985:1987:2", [tc_analysis] @@ -18,7 +18,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg index 8bca422f..87ba6489 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250328_try2/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg index eeaf896d..5c93c819 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_mvm_2_chrysalis.cfg @@ -3,14 +3,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/test_pr697_20250328_try2/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_output/unique_id/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_2_www/unique_id" years = "1995:1997:2", [tc_analysis] @@ -19,7 +19,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -37,7 +37,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1986", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/test_pr697_20250328_try2/v2.LR.historical_0201/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_mvm_1_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim" # reference_data_path_tc determined automatically run_type = "model_vs_model" sets = "tc_analysis", diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg index 3e36d333..8828e058 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tc_analysis_v2_parallel_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/test_pr697_20250328_try2/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_output/unique_id/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tc_analysis_parallel_www/unique_id" years = "1985:1989:2", [tc_analysis] @@ -18,7 +18,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg index 6b8deca3..dd643995 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_www/unique_id" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg index 4736c9b9..340f0d65 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_www/unique_id" years = "1985:1989:4", [ts] diff --git a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg index 86c9c7c3..3fc9860b 100644 --- a/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_e3sm_diags_tropical_subseasonal_mvm_2_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_2_www/unique_id" years = "1995:1999:4", [ts] @@ -24,7 +24,7 @@ walltime = "00:30:00" [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -43,7 +43,7 @@ walltime = "5:00:00" ref_start_yr = 1985 ref_years = "1985-1988", # Use _1 as reference - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_tropical_subseasonal_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" # reference_data_path_daily is determined automatically run_type = "model_vs_model" sets = "tropical_subseasonal", diff --git a/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg index cf51eadd..c7dbe1eb 100644 --- a/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_comprehensive_v3_setup_only_chrysalis.cfg @@ -2,17 +2,17 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" fail_on_dependency_skip = True infer_path_parameters = False infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_comprehensive_v3_setup_only_www/unique_id" years = "1985:1989:2", [ts] diff --git a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg index 82ad77ed..0ce5dcbb 100644 --- a/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_custom_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_custom_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_custom_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_custom_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_custom_www/unique_id" [ts] active = True @@ -33,7 +33,7 @@ years = "1985:1995:5", [global_time_series] active = True -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" plots_original="" diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg index 6fc1f2b4..6ba5d107 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_www/unique_id" [ts] active = True @@ -39,7 +39,7 @@ walltime = "00:30:00" [global_time_series] active = True climo_years = "1985-1989", "1990-1995", -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" moc_file=mocTimeSeries_1985-1995.nc diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg index 5aea6025..6711b353 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_missing_ocn_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_missing_ocn_www/unique_id" [ts] active = True @@ -26,7 +26,7 @@ walltime = "00:30:00" [global_time_series] active = True climo_years = "1985-1989", "1990-1995", -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" # plots_original -- use the default vars, diff --git a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg index 83c5e028..82d1132d 100644 --- a/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_original_8_no_ocn_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_original_8_no_ocn_www/unique_id" [ts] active = True @@ -25,7 +25,7 @@ walltime = "00:30:00" [global_time_series] active = True -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance" diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg index 2cbe811c..3456df34 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_all_land_variables_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_all_land_variables_www/unique_id" [ts] active = True @@ -33,7 +33,7 @@ years = "1985:1995:5", [global_time_series] active = True -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" make_viewer = True diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg index 838fdd64..c02d488c 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_www/unique_id" [ts] active = True @@ -33,7 +33,7 @@ years = "1985:1995:5", [global_time_series] active = True -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" make_viewer = True diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg index e89704d0..a2d27a7c 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_original_8_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_8_www/unique_id" [ts] active = True @@ -39,7 +39,7 @@ walltime = "00:30:00" [global_time_series] active = True climo_years = "1985-1989", "1990-1995", -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" make_viewer = True diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg index 2e79150c..5ffafc6b 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_original_atm_plus_land_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_original_atm_plus_land_www/unique_id" [ts] active = True @@ -32,14 +32,14 @@ years = "1985:1995:5", [global_time_series] active = True -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" make_viewer = True # We have to set plots_original to the 5 plots that don't require ocean. plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance" plots_atm = "TREFHT" -plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" +plots_lnd = "FSH,RH2M,LAISHA,LAISUN" ts_num_years = 5 walltime = "00:30:00" years = "1985-1995", diff --git a/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg b/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg index 1d327533..d2457dd1 100644 --- a/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_global_time_series_viewers_undefined_variables_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_global_time_series_viewers_undefined_variables_www/unique_id" [ts] active = True @@ -33,7 +33,7 @@ years = "1985:1995:5", [global_time_series] active = True -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" make_viewer = True diff --git a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg index 3b58b2eb..a01a52d6 100644 --- a/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_chrysalis.cfg @@ -2,15 +2,15 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" walltime = "00:30:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_www/unique_id" [ts] active = True diff --git a/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg index 1ebd6ed2..e2bc6e7a 100644 --- a/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_diff_years_chrysalis.cfg @@ -2,15 +2,15 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_diff_years_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_diff_years_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" walltime = "00:30:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_diff_years_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_diff_years_www/unique_id" [ts] active = True diff --git a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg index 5c811c2b..506dda2a 100644 --- a/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_ilamb_land_only_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_land_only_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_ilamb_land_only_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_land_only_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_ilamb_land_only_www/unique_id" [ts] active = True diff --git a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg index 041f84b9..21c1131d 100644 --- a/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_mpas_analysis_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_mpas_analysis_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_mpas_analysis_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_mpas_analysis_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_mpas_analysis_www/unique_id" [mpas_analysis] active = True diff --git a/tests/integration/generated/test_min_case_nco_chrysalis.cfg b/tests/integration/generated/test_min_case_nco_chrysalis.cfg index 27472cdc..64010a9f 100644 --- a/tests/integration/generated/test_min_case_nco_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_nco_chrysalis.cfg @@ -2,17 +2,17 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" fail_on_dependency_skip = True infer_path_parameters = False infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_nco_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_nco_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_nco_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_nco_www/unique_id" years = "1985:1989:2", [climo] diff --git a/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg index 4285a20e..52020a4e 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_only_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_only_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_only_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_only_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_only_www/unique_id" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg index 7c08dcea..5c468282 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_res_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_res_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_res_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_res_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_res_www/unique_id" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg index 30cdb3c1..e6f23006 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/unique_id" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg index f0f9bfdc..832d43cd 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_simultaneous_2_chrysalis.cfg @@ -4,14 +4,14 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/unique_id" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg index 05366919..9b0f1180 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_1_chrysalis.cfg @@ -2,14 +2,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/test_pr697_20250328_try2/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_output/unique_id/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_1_www/unique_id" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg index a117f0c9..046fc76f 100644 --- a/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg +++ b/tests/integration/generated/test_min_case_tc_analysis_v2_simultaneous_2_chrysalis.cfg @@ -4,14 +4,14 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/test_pr697_20250328_try2/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_output/unique_id/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_tc_analysis_simultaneous_2_www/unique_id" years = "1985:1987:2", [tc_analysis] diff --git a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg index 545a4321..01a9f9e4 100644 --- a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg @@ -27,16 +27,16 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051" partition = "compute" qos = "regular" walltime = "07:00:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_bundles_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_bundles_www/unique_id" [bundle] @@ -114,7 +114,7 @@ years = "1985:1989:2", [e3sm_diags] active = True -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' ref_final_yr = 1989 ref_start_yr = 1985 @@ -137,7 +137,7 @@ years = "1985:1989:2", ref_name = "v3.LR.historical_0051" ref_start_yr = 1985 ref_years = "1985-1986", - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" run_type = "model_vs_model" # TODO: Add "tc_analysis" back in after empty dat is resolved. sets = "polar","enso_diags","streamflow", @@ -151,7 +151,7 @@ years = "1985:1989:2", [global_time_series] active = True bundle = "bundle2" -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance" diff --git a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg index 9eb22088..9d605c3d 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg @@ -2,15 +2,15 @@ case = "v2.LR.historical_0201" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" fail_on_dependency_skip = True input = /lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250328_try2/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/unique_id/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v2_www/unique_id" years = "1980:1984:2", [climo] @@ -101,7 +101,7 @@ walltime = "00:30:00" active = True climo_diurnal_frequency = "diurnal_8xdaily" climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -134,7 +134,7 @@ years = "1982:1984:2", partition = "compute" qos = "regular" ref_name = "v2.LR.historical_0201" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250328_try2/v2.LR.historical_0201/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/unique_id/v2.LR.historical_0201/post/atm/180x360_aave/clim" run_type = "model_vs_model" short_ref_name = "same simulation" swap_test_ref = False @@ -151,7 +151,7 @@ years = "1982:1984:2", partition = "compute" qos = "regular" ref_name = "v2.LR.historical_0201" - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/test_pr697_20250328_try2/v2.LR.historical_0201/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v2_output/unique_id/v2.LR.historical_0201/post/lnd/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon_land", short_ref_name = "same simulation" @@ -175,7 +175,7 @@ walltime = "00:30:00" [global_time_series] active = True climo_years ="1980-1984", "1985-1990", -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v2.LR.historical_0201" figstr = "v2.LR.historical_0201" moc_file=mocTimeSeries_1980-1990.nc diff --git a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg index 95e460e9..f7103d1b 100644 --- a/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg @@ -2,17 +2,17 @@ case = "v3.LR.historical_0051" constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "" fail_on_dependency_skip = True infer_path_parameters = False infer_section_parameters = False input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051 input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/test_pr697_20250328_try2" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id" years = "1985:1989:2", [climo] @@ -109,7 +109,7 @@ active = True climo_diurnal_frequency = "diurnal_8xdaily" climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave" climo_subsection = "atm_monthly_180x360_aave" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh" +environment_commands = "source /conda.sh; conda activate " grid = '180x360_aave' multiprocessing = True num_workers = 8 @@ -161,16 +161,16 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/" tag = "model_vs_model" ts_num_years_ref = 2 # Reference paths - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim" # mvm streamflow only gauges_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv" - reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/rof/native/ts/monthly" + reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/rof/native/ts/monthly" # mvm diurnal_cycle only - reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" + reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily" # mvm "enso_diags", "qbo", "area_mean_time_series" - reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly" + reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly" # mvm tropical_subseasonal only - reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily" + reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily" [[ lnd_monthly_mvm_lnd ]] # Test model-vs-model using the same files as the reference @@ -186,7 +186,7 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/" tag = "model_vs_model" ts_num_years_ref = 2 # Reference paths - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim" [mpas_analysis] @@ -205,7 +205,7 @@ walltime = "00:30:00" [global_time_series] active = True climo_years = "1985-1989", "1990-1995", -environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326" +environment_commands = "source /conda.sh; conda activate " experiment_name = "v3.LR.historical_0051" figstr = "v3.LR.historical_0051" moc_file=mocTimeSeries_1985-1995.nc diff --git a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh index fc77ec1a..7efea25b 100755 --- a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh +++ b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh @@ -9,13 +9,13 @@ do # Your output will now become the new expectation. # Copy output so you don't have to rerun zppy to generate the output. if [[ "${test_name,,}" == "comprehensive_v2" ]]; then - cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test_pr697_20250328_try2/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} + cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} else - cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/test_pr697_20250328_try2/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} + cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} fi if [[ "${test_name,,}" == "bundles" ]]; then mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files - cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/test_pr697_20250328_try2/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files + cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files fi zppy_top_level=$(pwd) cd /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name} diff --git a/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg b/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg index 161ce120..678d9908 100644 --- a/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg +++ b/tests/integration/template_min_case_global_time_series_viewers_original_atm_plus_land.cfg @@ -39,7 +39,7 @@ make_viewer = True # We have to set plots_original to the 5 plots that don't require ocean. plots_original="net_toa_flux_restom,global_surface_air_temperature,toa_radiation,net_atm_energy_imbalance,net_atm_water_imbalance" plots_atm = "TREFHT" -plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR" +plots_lnd = "FSH,RH2M,LAISHA,LAISUN" ts_num_years = 5 walltime = "00:30:00" years = "1985-1995", diff --git a/tests/integration/utils.py b/tests/integration/utils.py index 586f4b68..31b5518f 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -7,7 +7,7 @@ from mache import MachineInfo from PIL import Image, ImageChops, ImageDraw -UNIQUE_ID = "test_pr697_20250328_try2" +UNIQUE_ID = "unique_id" # Image checking ########################################################## @@ -171,11 +171,11 @@ def get_chyrsalis_expansions(config): "constraint": "", # To run this test, replace conda environment with your e3sm_diags dev environment # To use default environment_commands, set to "" - "diags_environment_commands": "", + "diags_environment_commands": "source /conda.sh; conda activate ", "diags_walltime": "5:00:00", - "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.11.0rc13_chrysalis.sh", + "environment_commands_test": "", "expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/", - "global_time_series_environment_commands": "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi_plots_lnd_20250326", + "global_time_series_environment_commands": "source /conda.sh; conda activate ", "mpas_analysis_walltime": "00:30:00", "partition_long": "compute", "partition_short": "debug", @@ -404,4 +404,4 @@ def generate_cfgs(unified_testing=False, dry_run=False): if __name__ == "__main__": - generate_cfgs(unified_testing=True, dry_run=False) + generate_cfgs(unified_testing=False, dry_run=False) diff --git a/tests/test_sections.py b/tests/test_sections.py index 218ecc66..9f2ee20d 100644 --- a/tests/test_sections.py +++ b/tests/test_sections.py @@ -98,6 +98,7 @@ def test_sections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U", + "vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR", "walltime": "02:00:00", "www": "WWWW", "years": [""], @@ -163,6 +164,7 @@ def test_sections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT", + "vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0020:5"], @@ -224,6 +226,7 @@ def test_sections(): "ts_num_years": 5, "ts_subsection": "", "vars": "", + "vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0050:50"], @@ -285,6 +288,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U", + "vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR", "walltime": "02:00:00", "www": "WWWW", "years": [""], @@ -366,6 +370,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT", + "vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0020:5"], @@ -413,6 +418,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT", + "vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0020:10"], @@ -490,6 +496,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "", + "vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0050:50"], @@ -534,6 +541,7 @@ def test_subsections(): "ts_num_years": 5, "ts_subsection": "", "vars": "", + "vars_exclude": "H2OSOI,LAKEICEFRAC,O_SCALAR,PCT_LANDUNIT,PCT_NAT_PFT,SOILICE,SOILICE_ICE,SOILLIQ,SOILLIQ_ICE,SOILPSI,T_SCALAR,TLAKE,TSOI,TSOI_ICE,W_SCALAR", "walltime": "02:00:00", "www": "WWWW", "years": ["0001:0100:50"],