From 603441d48cdf5a71caa82541173c7f5e6d986b9c Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Fri, 18 Aug 2023 19:56:09 -0500 Subject: [PATCH] Testing fixes for Chrysalis --- tests/integration/generated/test_bundles_chrysalis.cfg | 8 +++++--- .../integration/generated/test_complete_run_chrysalis.cfg | 6 +++--- tests/integration/utils.py | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/integration/generated/test_bundles_chrysalis.cfg b/tests/integration/generated/test_bundles_chrysalis.cfg index 0698a9a2..a50e9f5f 100644 --- a/tests/integration/generated/test_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_bundles_chrysalis.cfg @@ -2,15 +2,17 @@ case = v2.LR.historical_0201 constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc9_chrysalis.sh" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc12_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" # 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/v2.LR.historical_0201" -partition = "debug" +# Need compute to run for 7 hours +partition = "compute" qos = "regular" -walltime = "02:00:00" +# E3SM Diags needed a 3-hour extension (under 5 hours to run) for complete_run, so adding 5 hours: +walltime = "07:00:00" www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www" [bundle] diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index 6f3a21a1..2f8e7280 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -2,7 +2,7 @@ case = v2.LR.historical_0201 constraint = "" dry_run = "False" -environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc9_chrysalis.sh" +environment_commands = "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc12_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" @@ -90,10 +90,10 @@ years = "1850:1854:2", "1850:1854:4", partition = "compute" qos = "regular" sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere", - walltime = "2:00:00" + walltime = "8:00:00" [[ atm_monthly_180x360_aave_environment_commands ]] - environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230731" + environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816" sets = "qbo", ts_subsection = "atm_monthly_180x360_aave" diff --git a/tests/integration/utils.py b/tests/integration/utils.py index b1715edf..b1012a37 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -134,9 +134,9 @@ def get_chyrsalis_expansions(config): "bundles_walltime": "02:00:00", "constraint": "", # To run this test, replace conda environment with your e3sm_diags dev environment - "diags_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230731", + "diags_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816", "diags_walltime": "2:00:00", - "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc9_chrysalis.sh", + "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc12_chrysalis.sh", "expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/", "partition_long": "compute", "partition_short": "debug",