From 51e41e00d7d32066149fff423c8b18804594fd29 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Tue, 9 Jul 2024 16:43:45 -0500 Subject: [PATCH] Update --- tests/integration/generated/test_bundles_chrysalis.cfg | 4 ++-- .../integration/generated/test_complete_run_chrysalis.cfg | 8 ++++---- tests/integration/generated/test_debug_chrysalis.cfg | 4 ++-- .../generated/update_bundles_expected_files_chrysalis.sh | 4 ++-- .../update_complete_run_expected_files_chrysalis.sh | 2 +- tests/integration/utils.py | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/integration/generated/test_bundles_chrysalis.cfg b/tests/integration/generated/test_bundles_chrysalis.cfg index 70bbb052..b837a4fa 100644 --- a/tests/integration/generated/test_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_bundles_chrysalis.cfg @@ -7,11 +7,11 @@ 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" # 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_test_bundles_output/issue-421-post-600v3/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/issue-421-post-600-both-commits/v2.LR.historical_0201" partition = "compute" qos = "regular" walltime = "07:00:00" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue-421-post-600v3" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue-421-post-600-both-commits" [bundle] diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index df9ff12c..c1d9cfb4 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -7,10 +7,10 @@ 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" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_complete_run.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue-421-post-600v3/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue-421-post-600-both-commits/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue-421-post-600v3" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue-421-post-600-both-commits" [climo] active = True @@ -134,7 +134,7 @@ years = "1850:1854:2", "1850:1854:4", ref_name = "v2.LR.historical_0201" ref_start_yr = 1850 ref_years = "1850-1851", - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue-421-post-600v3/v2.LR.historical_0201/post/atm/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue-421-post-600-both-commits/v2.LR.historical_0201/post/atm/180x360_aave/clim" run_type = "model_vs_model" short_ref_name = "v2.LR.historical_0201" swap_test_ref = False @@ -155,7 +155,7 @@ years = "1850:1854:2", "1850:1854:4", ref_name = "v2.LR.historical_0201" ref_start_yr = 1850 ref_years = "1850-1851", - reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue-421-post-600v3/v2.LR.historical_0201/post/lnd/180x360_aave/clim" + reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue-421-post-600-both-commits/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_debug_chrysalis.cfg b/tests/integration/generated/test_debug_chrysalis.cfg index 05839d11..9917da31 100644 --- a/tests/integration/generated/test_debug_chrysalis.cfg +++ b/tests/integration/generated/test_debug_chrysalis.cfg @@ -13,10 +13,10 @@ 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" # To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_complete_run.py -output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_debug_output/issue-421-post-600v3/v2.LR.historical_0201" +output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_debug_output/issue-421-post-600-both-commits/v2.LR.historical_0201" partition = "debug" qos = "regular" -www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_debug_www/issue-421-post-600v3" +www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_debug_www/issue-421-post-600-both-commits" [ts] active = True diff --git a/tests/integration/generated/update_bundles_expected_files_chrysalis.sh b/tests/integration/generated/update_bundles_expected_files_chrysalis.sh index 467dc69b..567c94ac 100755 --- a/tests/integration/generated/update_bundles_expected_files_chrysalis.sh +++ b/tests/integration/generated/update_bundles_expected_files_chrysalis.sh @@ -6,9 +6,9 @@ rm -rf /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles # Your output will now become the new expectation. # Copy output so you don't have to rerun zppy to generate the output. -cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue-421-post-600v3/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles +cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue-421-post-600-both-commits/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files -cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/issue-421-post-600v3/v2.LR.historical_0201/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files +cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/issue-421-post-600-both-commits/v2.LR.historical_0201/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files zppy_top_level=$(pwd) cd /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles # Remove the image check failures, so they don't end up in the expected files. diff --git a/tests/integration/generated/update_complete_run_expected_files_chrysalis.sh b/tests/integration/generated/update_complete_run_expected_files_chrysalis.sh index 912ccc32..01b264b1 100755 --- a/tests/integration/generated/update_complete_run_expected_files_chrysalis.sh +++ b/tests/integration/generated/update_complete_run_expected_files_chrysalis.sh @@ -6,7 +6,7 @@ rm -rf /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run # Your output will now become the new expectation. # Copy output so you don't have to rerun zppy to generate the output. -cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue-421-post-600v3/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run +cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue-421-post-600-both-commits/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run zppy_top_level=$(pwd) cd /lcrc/group/e3sm/public_html/zppy_test_resources/expected_complete_run # Remove the image check failures, so they don't end up in the expected files. diff --git a/tests/integration/utils.py b/tests/integration/utils.py index b27f4dee..18190db6 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 = "issue-421-post-600v3" +UNIQUE_ID = "issue-421-post-600-both-commits" # Image checking ##########################################################