Finish removing deprecated parameters (#657)

E3SM-Project · Jan 14, 2025 · ccbf4dd · ccbf4dd
1 parent 57c0891
commit ccbf4dd
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 10 deletions.
diff --git a/docs/source/post.mysimulation.cfg b/docs/source/post.mysimulation.cfg
@@ -74,7 +74,6 @@ years = "1:100:10",
 [tc_analysis]
 active = boolean(default=True)
 years = "1:100:20", "1:100:50",
-scratch = <scratch directory>
 
 # E3SM Diags every 20 and 50 years
 [e3sm_diags]

diff --git a/tests/integration/test_bash_generation.cfg b/tests/integration/test_bash_generation.cfg
@@ -57,7 +57,6 @@ years = "1:20:10",
 
 [tc_analysis]
 active = True
-scratch = "..."
 years = "1:20:10", "1:20:20",
 
 [e3sm_diags]

diff --git a/tests/integration/test_campaign_cryosphere.cfg b/tests/integration/test_campaign_cryosphere.cfg
@@ -41,7 +41,6 @@ years = "1:20:10",
 
 [tc_analysis]
 active = True
-scratch = "..."
 years = "1:20:10",
 
 [e3sm_diags]

diff --git a/tests/integration/test_campaign_none.cfg b/tests/integration/test_campaign_none.cfg
@@ -41,7 +41,6 @@ years = "1:20:10",
 
 [tc_analysis]
 active = True
-scratch = "..."
 years = "1:20:10",
 
 [e3sm_diags]

diff --git a/tests/integration/test_campaign_water_cycle.cfg b/tests/integration/test_campaign_water_cycle.cfg
@@ -41,7 +41,6 @@ years = "1:20:10",
 
 [tc_analysis]
 active = True
-scratch = "..."
 years = "1:20:10",
 
 [e3sm_diags]

diff --git a/tests/integration/test_defaults.cfg b/tests/integration/test_defaults.cfg
@@ -37,7 +37,6 @@ years = "1:20:10",
 
 [tc_analysis]
 active = True
-scratch = "..."
 years= "1:20:20",
 
 [mpas_analysis]

diff --git a/tests/integration/test_last_year.cfg b/tests/integration/test_last_year.cfg
@@ -57,7 +57,6 @@ years = "1:20:10",
 
 [tc_analysis]
 active = True
-scratch = "..."
 years = "1:20:10", "1:20:20",
 
 [e3sm_diags]

diff --git a/tests/integration/utils.py b/tests/integration/utils.py
@@ -174,7 +174,6 @@ def get_chyrsalis_expansions(config):
         "partition_short": "debug",
         "qos_long": "regular",
         "qos_short": "regular",
-        "scratch": f"/lcrc/globalscratch/{username}/",
         "user_input": "/lcrc/group/e3sm/ac.forsyth2/",
         "user_output": f"/lcrc/group/e3sm/{username}/",
         "user_www": f"{web_base_path}/{username}/",
@@ -203,7 +202,6 @@ def get_compy_expansions(config):
         "partition_short": "short",
         "qos_long": "regular",
         "qos_short": "regular",
-        "scratch": f"/qfs/people/{username}/",
         "user_input": "/compyfs/fors729/",
         "user_output": f"/compyfs/{username}/",
         "user_www": f"{web_base_path}/{username}/",
@@ -232,7 +230,6 @@ def get_perlmutter_expansions(config):
         "partition_short": "",
         "qos_long": "regular",
         "qos_short": "regular",  # debug walltime too short?
-        "scratch": f"/pscratch/sd/{username[0]}/{username}/",
         # Use CFS for large datasets
         "user_input": "/global/cfs/cdirs/e3sm/forsyth/",
         "user_output": f"/global/cfs/cdirs/e3sm/{username}/",