From f7cb09e7b32bd965e287fdc2bce5963931a7652a Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Fri, 19 Dec 2025 10:33:11 -0600 Subject: [PATCH] Test fixes - Make legacy 3.1.0 references consistent with 3.0.0 - Always run land_monthly subtask, as it's needed by e3sm_diags AND ilamb --- .../test_weekly_bundles_chrysalis.cfg | 1 - ..._weekly_legacy_3.1.0_bundles_chrysalis.cfg | 5 +- ...egacy_3.1.0_comprehensive_v2_chrysalis.cfg | 6 +-- ...egacy_3.1.0_comprehensive_v3_chrysalis.cfg | 14 +++--- .../update_weekly_expected_files_chrysalis.sh | 12 +++-- .../template_update_weekly_expected_files.sh | 12 +++-- tests/integration/template_weekly_bundles.cfg | 1 - .../template_weekly_legacy_3.0.0_bundles.cfg | 1 - .../template_weekly_legacy_3.1.0_bundles.cfg | 5 +- ...e_weekly_legacy_3.1.0_comprehensive_v2.cfg | 6 +-- ...e_weekly_legacy_3.1.0_comprehensive_v3.cfg | 14 +++--- tests/integration/test_images.py | 48 +++++++++++++++++-- 12 files changed, 85 insertions(+), 40 deletions(-) diff --git a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg index 1016fe3b..2c872fc0 100644 --- a/tests/integration/generated/test_weekly_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_bundles_chrysalis.cfg @@ -79,7 +79,6 @@ years = "1985:1989:2", years = "1985:1995:5", [[ land_monthly ]] - active = True extra_vars = "landfrac" frequency = "monthly" input_files = "elm.h0" diff --git a/tests/integration/generated/test_weekly_legacy_3.1.0_bundles_chrysalis.cfg b/tests/integration/generated/test_weekly_legacy_3.1.0_bundles_chrysalis.cfg index 1016fe3b..81dc76b3 100644 --- a/tests/integration/generated/test_weekly_legacy_3.1.0_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_legacy_3.1.0_bundles_chrysalis.cfg @@ -32,7 +32,7 @@ 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_legacy_3.1.0_bundles_output/unique_id/v3.LR.historical_0051" partition = "compute" qos = "regular" walltime = "07:00:00" @@ -79,7 +79,6 @@ years = "1985:1989:2", years = "1985:1995:5", [[ land_monthly ]] - active = True extra_vars = "landfrac" frequency = "monthly" input_files = "elm.h0" @@ -141,7 +140,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_legacy_3.1.0_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", diff --git a/tests/integration/generated/test_weekly_legacy_3.1.0_comprehensive_v2_chrysalis.cfg b/tests/integration/generated/test_weekly_legacy_3.1.0_comprehensive_v2_chrysalis.cfg index 12fa232c..68f6ebd0 100644 --- a/tests/integration/generated/test_weekly_legacy_3.1.0_comprehensive_v2_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_legacy_3.1.0_comprehensive_v2_chrysalis.cfg @@ -7,7 +7,7 @@ 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_legacy_3.1.0_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/unique_id" @@ -140,7 +140,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_legacy_3.1.0_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 @@ -157,7 +157,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_legacy_3.1.0_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" diff --git a/tests/integration/generated/test_weekly_legacy_3.1.0_comprehensive_v3_chrysalis.cfg b/tests/integration/generated/test_weekly_legacy_3.1.0_comprehensive_v3_chrysalis.cfg index ecc4c022..6b1e973a 100644 --- a/tests/integration/generated/test_weekly_legacy_3.1.0_comprehensive_v3_chrysalis.cfg +++ b/tests/integration/generated/test_weekly_legacy_3.1.0_comprehensive_v3_chrysalis.cfg @@ -9,7 +9,7 @@ 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_legacy_3.1.0_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/unique_id" @@ -171,16 +171,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_legacy_3.1.0_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/unique_id/v3.LR.historical_0051/post/rof/native/ts/monthly" + reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_legacy_3.1.0_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/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_legacy_3.1.0_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/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly" + reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_legacy_3.1.0_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/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily" + reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_legacy_3.1.0_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 @@ -196,7 +196,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_legacy_3.1.0_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim" [mpas_analysis] active = True diff --git a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh index a1676a23..7c4a6738 100755 --- a/tests/integration/generated/update_weekly_expected_files_chrysalis.sh +++ b/tests/integration/generated/update_weekly_expected_files_chrysalis.sh @@ -6,12 +6,15 @@ # NOTE: in `tests` below, do *not* include the `zppy_weekly_` prefix, as that is added later. # Update all -tests=("comprehensive_v2" "comprehensive_v3" "bundles" "legacy_3.0.0_comprehensive_v2" "legacy_3.0.0_comprehensive_v3" "legacy_3.0.0_bundles") +tests=("comprehensive_v2" "comprehensive_v3" "bundles" "legacy_3.1.0_comprehensive_v2" "legacy_3.1.0_comprehensive_v3" "legacy_3.1.0_bundles" "legacy_3.0.0_comprehensive_v2" "legacy_3.0.0_comprehensive_v3" "legacy_3.0.0_bundles") # Update regular only #tests=("comprehensive_v2" "comprehensive_v3" "bundles") -# Update legacy only +# Update legacy 3.1.0 only +#tests=("legacy_3.1.0_comprehensive_v2" "legacy_3.1.0_comprehensive_v3" "legacy_3.1.0_bundles") + +# Update legacy 3.0.0 only #tests=("legacy_3.0.0_comprehensive_v2" "legacy_3.0.0_comprehensive_v3" "legacy_3.0.0_bundles") for test_name in "${tests[@]}" @@ -20,9 +23,10 @@ do # # expected_dir = /lcrc/group/e3sm/public_html/zppy_test_resources/ # - # There are 6 subdirectories relevant to image checking: + # There are 9 subdirectories relevant to image checking: # 1-3. expected_bundles, expected_comprehensive_v2, expected_comprehensive_v3 - # 4-6. expected_legacy_3.0.0_bundles, expected_legacy_3.0.0_comprehensive_v2, expected_legacy_3.0.0_comprehensive_v3 + # 4-6. expected_legacy_3.1.0_bundles, expected_legacy_3.1.0_comprehensive_v2, expected_legacy_3.1.0_comprehensive_v3 + # 7-9. expected_legacy_3.0.0_bundles, expected_legacy_3.0.0_comprehensive_v2, expected_legacy_3.0.0_comprehensive_v3 # Notice the subdirectories do *not* include the `zppy_weekly` prefix. # # Each of those subdirectories has a corresponding image list of the form: diff --git a/tests/integration/template_update_weekly_expected_files.sh b/tests/integration/template_update_weekly_expected_files.sh index d3a93d13..c1a8e29f 100755 --- a/tests/integration/template_update_weekly_expected_files.sh +++ b/tests/integration/template_update_weekly_expected_files.sh @@ -6,12 +6,15 @@ # NOTE: in `tests` below, do *not* include the `zppy_weekly_` prefix, as that is added later. # Update all -tests=("comprehensive_v2" "comprehensive_v3" "bundles" "legacy_3.0.0_comprehensive_v2" "legacy_3.0.0_comprehensive_v3" "legacy_3.0.0_bundles") +tests=("comprehensive_v2" "comprehensive_v3" "bundles" "legacy_3.1.0_comprehensive_v2" "legacy_3.1.0_comprehensive_v3" "legacy_3.1.0_bundles" "legacy_3.0.0_comprehensive_v2" "legacy_3.0.0_comprehensive_v3" "legacy_3.0.0_bundles") # Update regular only #tests=("comprehensive_v2" "comprehensive_v3" "bundles") -# Update legacy only +# Update legacy 3.1.0 only +#tests=("legacy_3.1.0_comprehensive_v2" "legacy_3.1.0_comprehensive_v3" "legacy_3.1.0_bundles") + +# Update legacy 3.0.0 only #tests=("legacy_3.0.0_comprehensive_v2" "legacy_3.0.0_comprehensive_v3" "legacy_3.0.0_bundles") for test_name in "${tests[@]}" @@ -20,9 +23,10 @@ do # # expected_dir = /lcrc/group/e3sm/public_html/zppy_test_resources/ # - # There are 6 subdirectories relevant to image checking: + # There are 9 subdirectories relevant to image checking: # 1-3. expected_bundles, expected_comprehensive_v2, expected_comprehensive_v3 - # 4-6. expected_legacy_3.0.0_bundles, expected_legacy_3.0.0_comprehensive_v2, expected_legacy_3.0.0_comprehensive_v3 + # 4-6. expected_legacy_3.1.0_bundles, expected_legacy_3.1.0_comprehensive_v2, expected_legacy_3.1.0_comprehensive_v3 + # 7-9. expected_legacy_3.0.0_bundles, expected_legacy_3.0.0_comprehensive_v2, expected_legacy_3.0.0_comprehensive_v3 # Notice the subdirectories do *not* include the `zppy_weekly` prefix. # # Each of those subdirectories has a corresponding image list of the form: diff --git a/tests/integration/template_weekly_bundles.cfg b/tests/integration/template_weekly_bundles.cfg index 4b403b6f..9fc24d9c 100644 --- a/tests/integration/template_weekly_bundles.cfg +++ b/tests/integration/template_weekly_bundles.cfg @@ -79,7 +79,6 @@ years = "1985:1989:2", years = "1985:1995:5", [[ land_monthly ]] - active = #expand active_e3sm_diags# extra_vars = "landfrac" frequency = "monthly" input_files = "elm.h0" diff --git a/tests/integration/template_weekly_legacy_3.0.0_bundles.cfg b/tests/integration/template_weekly_legacy_3.0.0_bundles.cfg index e1813be7..937d19b5 100644 --- a/tests/integration/template_weekly_legacy_3.0.0_bundles.cfg +++ b/tests/integration/template_weekly_legacy_3.0.0_bundles.cfg @@ -79,7 +79,6 @@ years = "1985:1989:2", years = "1985:1995:5", [[ land_monthly ]] - active = #expand active_e3sm_diags# extra_vars = "landfrac" frequency = "monthly" input_files = "elm.h0" diff --git a/tests/integration/template_weekly_legacy_3.1.0_bundles.cfg b/tests/integration/template_weekly_legacy_3.1.0_bundles.cfg index 4b403b6f..7c7e8812 100644 --- a/tests/integration/template_weekly_legacy_3.1.0_bundles.cfg +++ b/tests/integration/template_weekly_legacy_3.1.0_bundles.cfg @@ -32,7 +32,7 @@ input = #expand user_input_v3#/E3SMv3/#expand case_name# 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 = "#expand user_output#zppy_weekly_bundles_output/#expand unique_id#/#expand case_name#" +output = "#expand user_output#zppy_weekly_legacy_3.1.0_bundles_output/#expand unique_id#/#expand case_name#" partition = "#expand partition_long#" qos = "#expand qos_short#" walltime = "#expand bundles_walltime#" @@ -79,7 +79,6 @@ years = "1985:1989:2", years = "1985:1995:5", [[ land_monthly ]] - active = #expand active_e3sm_diags# extra_vars = "landfrac" frequency = "monthly" input_files = "elm.h0" @@ -141,7 +140,7 @@ years = "1985:1989:2", ref_name = "#expand case_name#" ref_start_yr = 1985 ref_years = "1985-1986", - reference_data_path = "#expand user_output#zppy_weekly_bundles_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim" + reference_data_path = "#expand user_output#zppy_weekly_legacy_3.1.0_bundles_output/#expand unique_id#/#expand case_name#/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/template_weekly_legacy_3.1.0_comprehensive_v2.cfg b/tests/integration/template_weekly_legacy_3.1.0_comprehensive_v2.cfg index 22a40b8c..7bdff58c 100644 --- a/tests/integration/template_weekly_legacy_3.1.0_comprehensive_v2.cfg +++ b/tests/integration/template_weekly_legacy_3.1.0_comprehensive_v2.cfg @@ -7,7 +7,7 @@ fail_on_dependency_skip = True input = #expand user_input_v2#/E3SMv2/#expand case_name_v2# input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" -output = "#expand user_output#zppy_weekly_comprehensive_v2_output/#expand unique_id#/#expand case_name_v2#" +output = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v2_output/#expand unique_id#/#expand case_name_v2#" partition = "#expand partition_short#" qos = "#expand qos_short#" www = "#expand user_www#zppy_weekly_comprehensive_v2_www/#expand unique_id#" @@ -140,7 +140,7 @@ years = "1982:1984:2", partition = "#expand partition_long#" qos = "#expand qos_long#" ref_name = "#expand case_name_v2#" - reference_data_path = "#expand user_output#zppy_weekly_comprehensive_v2_output/#expand unique_id#/#expand case_name_v2#/post/atm/180x360_aave/clim" + reference_data_path = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v2_output/#expand unique_id#/#expand case_name_v2#/post/atm/180x360_aave/clim" run_type = "model_vs_model" short_ref_name = "same simulation" swap_test_ref = False @@ -157,7 +157,7 @@ years = "1982:1984:2", partition = "#expand partition_long#" qos = "#expand qos_long#" ref_name = "#expand case_name_v2#" - reference_data_path = "#expand user_output#zppy_weekly_comprehensive_v2_output/#expand unique_id#/#expand case_name_v2#/post/lnd/180x360_aave/clim" + reference_data_path = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v2_output/#expand unique_id#/#expand case_name_v2#/post/lnd/180x360_aave/clim" run_type = "model_vs_model" sets = "lat_lon_land", short_ref_name = "same simulation" diff --git a/tests/integration/template_weekly_legacy_3.1.0_comprehensive_v3.cfg b/tests/integration/template_weekly_legacy_3.1.0_comprehensive_v3.cfg index effd9c41..b1c8c662 100644 --- a/tests/integration/template_weekly_legacy_3.1.0_comprehensive_v3.cfg +++ b/tests/integration/template_weekly_legacy_3.1.0_comprehensive_v3.cfg @@ -9,7 +9,7 @@ infer_section_parameters = False 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_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#" +output = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v3_output/#expand unique_id#/#expand case_name#" partition = "#expand partition_short#" qos = "#expand qos_short#" www = "#expand user_www#zppy_weekly_comprehensive_v3_www/#expand unique_id#" @@ -171,16 +171,16 @@ tc_obs = "#expand diagnostics_base_path#/observations/Atm/tc-analysis/" tag = "model_vs_model" ts_num_years_ref = 2 # Reference paths - reference_data_path = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim" + reference_data_path = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim" # mvm streamflow only gauges_path = "#expand diagnostics_base_path#/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv" - reference_data_path_ts_rof = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/rof/native/ts/monthly" + reference_data_path_ts_rof = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/rof/native/ts/monthly" # mvm diurnal_cycle only - reference_data_path_climo_diurnal = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim_diurnal_8xdaily" + reference_data_path_climo_diurnal = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/clim_diurnal_8xdaily" # mvm "enso_diags", "qbo", "area_mean_time_series" - reference_data_path_ts = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/ts/monthly" + reference_data_path_ts = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/ts/monthly" # mvm tropical_subseasonal only - reference_data_path_ts_daily = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/ts/daily" + reference_data_path_ts_daily = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/atm/180x360_aave/ts/daily" [[ lnd_monthly_mvm_lnd ]] # Test model-vs-model using the same files as the reference @@ -196,7 +196,7 @@ tc_obs = "#expand diagnostics_base_path#/observations/Atm/tc-analysis/" tag = "model_vs_model" ts_num_years_ref = 2 # Reference paths - reference_data_path = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/lnd/180x360_aave/clim" + reference_data_path = "#expand user_output#zppy_weekly_legacy_3.1.0_comprehensive_v3_output/#expand unique_id#/#expand case_name#/post/lnd/180x360_aave/clim" [mpas_analysis] active = #expand active_mpas_analysis# diff --git a/tests/integration/test_images.py b/tests/integration/test_images.py index 470cc2c1..a374440d 100644 --- a/tests/integration/test_images.py +++ b/tests/integration/test_images.py @@ -28,7 +28,7 @@ def prepare_test_configs( """Prepare test configurations based on expansions.""" test_configs = [] - # Weekly comprehensive tests + # Weekly tests print("Preparing weekly cfg tests") if "weekly_comprehensive_v2" in expansions["cfgs_to_run"]: available_tasks = ["e3sm_diags", "mpas_analysis", "global_time_series", "ilamb"] @@ -77,8 +77,50 @@ def prepare_test_configs( ) ) - # Legacy comprehensive tests - print("Preparing legacy cfg tests") + # Legacy 3.1.0 comprehensive tests + print("Preparing legacy 3.1.0 cfg tests") + if "weekly_legacy_3.1.0_comprehensive_v2" in expansions["cfgs_to_run"]: + available_tasks = ["e3sm_diags", "mpas_analysis", "global_time_series", "ilamb"] + tasks_to_run = intersect_tasks(available_tasks, requested_tasks) + test_configs.append( + ( + "legacy_3.1.0_comprehensive_v2", + V2_CASE_NAME, + expansions, + diff_dir_suffix, + tasks_to_run, + ) + ) + + if "weekly_legacy_3.1.0_comprehensive_v3" in expansions["cfgs_to_run"]: + available_tasks = ["e3sm_diags", "mpas_analysis", "global_time_series", "ilamb"] + tasks_to_run = intersect_tasks(available_tasks, requested_tasks) + test_configs.append( + ( + "legacy_3.1.0_comprehensive_v3", + V3_CASE_NAME, + expansions, + diff_dir_suffix, + tasks_to_run, + ) + ) + + if "weekly_legacy_3.1.0_bundles" in expansions["cfgs_to_run"]: + # No mpas_analysis + available_tasks = ["e3sm_diags", "global_time_series", "ilamb"] + tasks_to_run = intersect_tasks(available_tasks, requested_tasks) + test_configs.append( + ( + "legacy_3.1.0_bundles", + V3_CASE_NAME, + expansions, + diff_dir_suffix, + tasks_to_run, + ) + ) + + # Legacy 3.0.0 comprehensive tests + print("Preparing legacy 3.0.0 cfg tests") if "weekly_legacy_3.0.0_comprehensive_v2" in expansions["cfgs_to_run"]: available_tasks = ["e3sm_diags", "mpas_analysis", "global_time_series", "ilamb"] tasks_to_run = intersect_tasks(available_tasks, requested_tasks)