Skip to content

Commit e022501

Browse files
authored
Add min-case cfg for deprecated parameters (#677)
1 parent 7c00c3b commit e022501

File tree

3 files changed

+97
-0
lines changed

3 files changed

+97
-0
lines changed
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
[default]
2+
case = "v3.LR.historical_0051"
3+
constraint = ""
4+
dry_run = True # Exlcusively testing with dry_run
5+
environment_commands = ""
6+
fail_on_dependency_skip = True
7+
guess_path_parameters = False
8+
guess_section_parameters = False
9+
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
10+
input_subdir = archive/atm/hist
11+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
12+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051"
13+
partition = "debug"
14+
qos = "regular"
15+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id"
16+
years = "1985:1989:2",
17+
18+
[ts]
19+
active = True
20+
e3sm_to_cmip_environment_commands = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/650
21+
ts_fmt = "cmip" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/650
22+
walltime = "00:30:00"
23+
24+
[[ atm_monthly_180x360_aave ]]
25+
frequency = "monthly"
26+
input_files = "eam.h0"
27+
input_subdir = "archive/atm/hist"
28+
29+
# TODO: Add "tc_analysis" back in after empty dat is resolved.
30+
# [tc_analysis]
31+
# active = True
32+
# scratch = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
33+
# walltime = "00:30:00"
34+
35+
[global_time_series]
36+
active = True
37+
atmosphere_only = "False" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
38+
climo_years = "1985-1989", "1990-1995",
39+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
40+
experiment_name = "v3.LR.historical_0051"
41+
figstr = "v3.LR.historical_0051"
42+
moc_file=mocTimeSeries_1985-1995.nc
43+
plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
44+
plot_names = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
45+
ts_num_years = 5
46+
ts_years = "1985-1989", "1985-1995",
47+
walltime = "00:30:00"
48+
years = "1985-1995",
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
[default]
2+
case = "#expand case_name#"
3+
constraint = "#expand constraint#"
4+
dry_run = True # Exlcusively testing with dry_run
5+
environment_commands = "#expand environment_commands#"
6+
fail_on_dependency_skip = True
7+
guess_path_parameters = False
8+
guess_section_parameters = False
9+
input = #expand user_input_v3#/E3SMv3/#expand case_name#
10+
input_subdir = archive/atm/hist
11+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
12+
output = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#"
13+
partition = "#expand partition_short#"
14+
qos = "#expand qos_short#"
15+
www = "#expand user_www#zppy_weekly_comprehensive_v3_www/#expand unique_id#"
16+
years = "1985:1989:2",
17+
18+
[ts]
19+
active = True
20+
e3sm_to_cmip_environment_commands = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/650
21+
ts_fmt = "cmip" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/650
22+
walltime = "00:30:00"
23+
24+
[[ atm_monthly_180x360_aave ]]
25+
frequency = "monthly"
26+
input_files = "eam.h0"
27+
input_subdir = "archive/atm/hist"
28+
29+
# TODO: Add "tc_analysis" back in after empty dat is resolved.
30+
# [tc_analysis]
31+
# active = True
32+
# scratch = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
33+
# walltime = "00:30:00"
34+
35+
[global_time_series]
36+
active = True
37+
atmosphere_only = "False" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
38+
climo_years = "1985-1989", "1990-1995",
39+
environment_commands = "#expand global_time_series_environment_commands#"
40+
experiment_name = "#expand case_name#"
41+
figstr = "#expand case_name#"
42+
moc_file=mocTimeSeries_1985-1995.nc
43+
plots_lnd = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILWATER_10CM,TSA,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
44+
plot_names = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
45+
ts_num_years = 5
46+
ts_years = "1985-1989", "1985-1995",
47+
walltime = "00:30:00"
48+
years = "1985-1995",

tests/integration/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ def generate_cfgs(unified_testing=False, dry_run=False):
307307
cfg_names = [
308308
"min_case_add_dependencies",
309309
"min_case_carryover_dependencies",
310+
"min_case_deprecated_parameters",
310311
"min_case_tc_analysis_simultaneous_1",
311312
"min_case_tc_analysis_simultaneous_2",
312313
"min_case_tc_analysis_v2_simultaneous_1",

0 commit comments

Comments
 (0)