From c939071a3adafb3efb1db5ee889cab52a9c27452 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Thu, 3 Aug 2023 19:19:40 -0500 Subject: [PATCH] Remove e3sm_to_cmip_environment_commands --- tests/integration/generated/test_bundles_chrysalis.cfg | 1 - tests/integration/generated/test_complete_run_chrysalis.cfg | 1 - tests/integration/template_bundles.cfg | 1 - tests/integration/template_complete_run.cfg | 1 - tests/integration/utils.py | 3 --- tests/test_sections.py | 5 ----- zppy/templates/default.ini | 1 - zppy/templates/ts.bash | 2 -- 8 files changed, 15 deletions(-) diff --git a/tests/integration/generated/test_bundles_chrysalis.cfg b/tests/integration/generated/test_bundles_chrysalis.cfg index 14299c3c..0698a9a2 100644 --- a/tests/integration/generated/test_bundles_chrysalis.cfg +++ b/tests/integration/generated/test_bundles_chrysalis.cfg @@ -36,7 +36,6 @@ years = "1850:1854:2", "1850:1854:4", [ts] active = True bundle = "bundle1" -e3sm_to_cmip_environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_to_cmip_fix_np" years = "1850:1854:2", [[ atm_monthly_180x360_aave ]] diff --git a/tests/integration/generated/test_complete_run_chrysalis.cfg b/tests/integration/generated/test_complete_run_chrysalis.cfg index 7fcb626d..6f3a21a1 100644 --- a/tests/integration/generated/test_complete_run_chrysalis.cfg +++ b/tests/integration/generated/test_complete_run_chrysalis.cfg @@ -28,7 +28,6 @@ years = "1850:1854:2", "1850:1854:4", [ts] active = True -e3sm_to_cmip_environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_to_cmip_fix_np" walltime = "00:30:00" years = "1850:1854:2", diff --git a/tests/integration/template_bundles.cfg b/tests/integration/template_bundles.cfg index 91fd57fa..2c28be4e 100644 --- a/tests/integration/template_bundles.cfg +++ b/tests/integration/template_bundles.cfg @@ -36,7 +36,6 @@ years = "1850:1854:2", "1850:1854:4", [ts] active = True bundle = "bundle1" -e3sm_to_cmip_environment_commands = "#expand e3sm_to_cmip_environment_commands#" years = "1850:1854:2", [[ atm_monthly_180x360_aave ]] diff --git a/tests/integration/template_complete_run.cfg b/tests/integration/template_complete_run.cfg index 088f9d47..847c8001 100644 --- a/tests/integration/template_complete_run.cfg +++ b/tests/integration/template_complete_run.cfg @@ -28,7 +28,6 @@ years = "1850:1854:2", "1850:1854:4", [ts] active = True -e3sm_to_cmip_environment_commands = "#expand e3sm_to_cmip_environment_commands#" walltime = "00:30:00" years = "1850:1854:2", diff --git a/tests/integration/utils.py b/tests/integration/utils.py index b20e4aa2..b1715edf 100644 --- a/tests/integration/utils.py +++ b/tests/integration/utils.py @@ -136,7 +136,6 @@ def get_chyrsalis_expansions(config): # 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_walltime": "2:00:00", - "e3sm_to_cmip_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_to_cmip_fix_np", "environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc9_chrysalis.sh", "expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/", "partition_long": "compute", @@ -161,7 +160,6 @@ def get_compy_expansions(config): # To run this test, replace conda environment with your e3sm_diags dev environment "diags_environment_commands": "source /qfs/people/fors729/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_dev_20220722", "diags_walltime": "03:00:00", - "e3sm_to_cmip_environment_commands": "", "environment_commands_test": "source /share/apps/E3SM/conda_envs/test_e3sm_unified_1.8.0rc6_compy.sh", "expected_dir": "/compyfs/www/zppy_test_resources/", "partition_long": "slurm", @@ -186,7 +184,6 @@ def get_perlmutter_expansions(config): # 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_walltime": "6:00:00", - "e3sm_to_cmip_environment_commands": "", "environment_commands_test": "source /global/common/software/e3sm/anaconda_envs/test_e3sm_unified_1.9.0rc9_pm-cpu.sh", "expected_dir": "/global/cfs/cdirs/e3sm/www/zppy_test_resources/", "partition_long": "", diff --git a/tests/test_sections.py b/tests/test_sections.py index 23fb4937..b4959838 100644 --- a/tests/test_sections.py +++ b/tests/test_sections.py @@ -100,7 +100,6 @@ def test_sections(self): "area_nm": "area", "cmip_metadata": "e3sm_to_cmip/default_metadata.json", "dpf": 30, - "e3sm_to_cmip_environment_commands": "", "extra_vars": "", "mapping_file": "MAPPING_FILE_TS", "tpd": 1, @@ -124,7 +123,6 @@ def test_sections(self): "debug": False, "dpf": 30, "dry_run": False, - "e3sm_to_cmip_environment_commands": "", "environment_commands": "", "extra_vars": "", "frequency": "monthly", @@ -255,7 +253,6 @@ def test_subsections(self): "area_nm": "area", "cmip_metadata": "e3sm_to_cmip/default_metadata.json", "dpf": 30, - "e3sm_to_cmip_environment_commands": "", "extra_vars": "", "tpd": 1, "ts_fmt": "ts_only", @@ -297,7 +294,6 @@ def test_subsections(self): "debug": False, "dpf": 30, "dry_run": False, - "e3sm_to_cmip_environment_commands": "", "environment_commands": "", "extra_vars": "", "frequency": "monthly", @@ -335,7 +331,6 @@ def test_subsections(self): "debug": False, "dpf": 30, "dry_run": False, - "e3sm_to_cmip_environment_commands": "", "environment_commands": "", "extra_vars": "", "frequency": "monthly", diff --git a/zppy/templates/default.ini b/zppy/templates/default.ini index d2ebf352..3a4a9f40 100644 --- a/zppy/templates/default.ini +++ b/zppy/templates/default.ini @@ -89,7 +89,6 @@ area_nm = string(default="area") cmip_metadata = string(default="e3sm_to_cmip/default_metadata.json") # Days per file dpf = integer(default=30) -e3sm_to_cmip_environment_commands = string(default="") extra_vars = string(default="") # Time-steps per day tpd = integer(default=1) diff --git a/zppy/templates/ts.bash b/zppy/templates/ts.bash index 19cca1a9..ee9f82dc 100644 --- a/zppy/templates/ts.bash +++ b/zppy/templates/ts.bash @@ -148,7 +148,6 @@ EOF input_dir={{ output }}/post/{{ component }}/{{ grid }}/ts/{{ frequency }}/{{ '%dyr' % (ypf) }} dest_cmip={{ output }}/post/{{ component }}/{{ grid }}/cmip_ts/{{ frequency }} mkdir -p ${dest_cmip} - {{ e3sm_to_cmip_environment_commands }} srun -N 1 e3sm_to_cmip \ --output-path \ ${dest_cmip}/${tmp_dir} \ @@ -179,7 +178,6 @@ EOF exit 4 fi - {{ environment_commands }} # Move output ts files to final destination mv ${dest_cmip}/${tmp_dir}/CMIP6/CMIP/*/*/*/*/*/*/*/*/*.nc ${dest_cmip} if [ $? != 0 ]; then