From 83a1731cf05cb723073f4352acc2521ed32e2132 Mon Sep 17 00:00:00 2001 From: forsyth2 <30700190+forsyth2@users.noreply.github.com> Date: Tue, 29 Aug 2023 09:34:31 -0700 Subject: [PATCH] Testing fixes for Perlmutter (#488) * Testing fixes for Perlmutter * Edit pm test generators --- tests/integration/generated/test_bundles_pm-cpu.cfg | 3 ++- tests/integration/generated/test_complete_run_pm-cpu.cfg | 7 ++++--- tests/integration/template_complete_run.cfg | 2 +- tests/integration/utils.py | 7 +++++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/integration/generated/test_bundles_pm-cpu.cfg b/tests/integration/generated/test_bundles_pm-cpu.cfg index 605f0612..b201a830 100644 --- a/tests/integration/generated/test_bundles_pm-cpu.cfg +++ b/tests/integration/generated/test_bundles_pm-cpu.cfg @@ -1,7 +1,8 @@ [default] case = v2.LR.historical_0201 constraint = "cpu" -environment_commands = "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc9_pm-cpu.sh" +dry_run = "False" +environment_commands = "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc12_pm-cpu.sh" input = "/global/cfs/cdirs/e3sm/forsyth/E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" diff --git a/tests/integration/generated/test_complete_run_pm-cpu.cfg b/tests/integration/generated/test_complete_run_pm-cpu.cfg index bef8fdae..c626e924 100644 --- a/tests/integration/generated/test_complete_run_pm-cpu.cfg +++ b/tests/integration/generated/test_complete_run_pm-cpu.cfg @@ -1,7 +1,8 @@ [default] case = v2.LR.historical_0201 constraint = "cpu" -environment_commands = "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc9_pm-cpu.sh" +dry_run = "False" +environment_commands = "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc12_pm-cpu.sh" input = "/global/cfs/cdirs/e3sm/forsyth//E3SMv2/v2.LR.historical_0201" input_subdir = archive/atm/hist mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc" @@ -92,7 +93,7 @@ years = "1850:1854:2", "1850:1854:4", walltime = "6:00:00" [[ atm_monthly_180x360_aave_environment_commands ]] - environment_commands = "source /global/homes/f/forsyth/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230728" + environment_commands = "source /global/homes/f/forsyth/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816" sets = "qbo", ts_subsection = "atm_monthly_180x360_aave" @@ -133,7 +134,7 @@ parallelTaskCount = 6 partition = "" qos = "regular" ts_years = "1850-1854", "1850-1860", -walltime = "00:30:00" +walltime = "01:00:00" [global_time_series] active = True diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index 847c8001..7d870d9e 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -134,7 +134,7 @@ parallelTaskCount = 6 partition = "#expand partition_long#" qos = "#expand qos_long#" ts_years = "1850-1854", "1850-1860", -walltime = "00:30:00" +walltime = "#expand mpas_analysis_walltime#" [global_time_series] active = True diff --git a/tests/integration/utils.py b/tests/integration/utils.py index cb1f437e..a41a4324 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -138,6 +138,7 @@ def get_chyrsalis_expansions(config): "diags_walltime": "5:00:00", "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/", + "mpas_analysis_walltime": "00:30:00", "partition_long": "compute", "partition_short": "debug", "qos_long": "regular", @@ -162,6 +163,7 @@ def get_compy_expansions(config): "diags_walltime": "03:00:00", "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.9.0rc12_compy.sh", "expected_dir": "/compyfs/www/zppy_test_resources/", + "mpas_analysis_walltime": "00:30:00", "partition_long": "slurm", "partition_short": "short", "qos_long": "regular", @@ -182,10 +184,11 @@ def get_perlmutter_expansions(config): "bundles_walltime": "6:00:00", "constraint": "cpu", # To run this test, replace conda environment with your e3sm_diags dev environment - "diags_environment_commands": "source /global/homes/f/forsyth/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230728", + "diags_environment_commands": "source /global/homes/f/forsyth/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230816", "diags_walltime": "6:00:00", - "environment_commands_test": "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc9_pm-cpu.sh", + "environment_commands_test": "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc12_pm-cpu.sh", "expected_dir": "/global/cfs/cdirs/e3sm/www/zppy_test_resources/", + "mpas_analysis_walltime": "01:00:00", "partition_long": "", "partition_short": "", "qos_long": "regular",