Skip to content

Commit

Permalink
Add min-case cfg for deprecated parameters (#677)
Browse files Browse the repository at this point in the history
  • Loading branch information
forsyth2 authored Feb 4, 2025
1 parent 7c00c3b commit e022501
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
[default]
case = "v3.LR.historical_0051"
constraint = ""
dry_run = True # Exlcusively testing with dry_run
environment_commands = ""
fail_on_dependency_skip = True
guess_path_parameters = False
guess_section_parameters = False
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
input_subdir = archive/atm/hist
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id"
years = "1985:1989:2",

[ts]
active = True
e3sm_to_cmip_environment_commands = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/650
ts_fmt = "cmip" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/650
walltime = "00:30:00"

[[ atm_monthly_180x360_aave ]]
frequency = "monthly"
input_files = "eam.h0"
input_subdir = "archive/atm/hist"

# TODO: Add "tc_analysis" back in after empty dat is resolved.
# [tc_analysis]
# active = True
# scratch = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
# walltime = "00:30:00"

[global_time_series]
active = True
atmosphere_only = "False" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
climo_years = "1985-1989", "1990-1995",
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
experiment_name = "v3.LR.historical_0051"
figstr = "v3.LR.historical_0051"
moc_file=mocTimeSeries_1985-1995.nc
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"
plot_names = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
ts_num_years = 5
ts_years = "1985-1989", "1985-1995",
walltime = "00:30:00"
years = "1985-1995",
48 changes: 48 additions & 0 deletions tests/integration/template_min_case_deprecated_parameters.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
[default]
case = "#expand case_name#"
constraint = "#expand constraint#"
dry_run = True # Exlcusively testing with dry_run
environment_commands = "#expand environment_commands#"
fail_on_dependency_skip = True
guess_path_parameters = False
guess_section_parameters = False
input = #expand user_input_v3#/E3SMv3/#expand case_name#
input_subdir = archive/atm/hist
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
output = "#expand user_output#zppy_weekly_comprehensive_v3_output/#expand unique_id#/#expand case_name#"
partition = "#expand partition_short#"
qos = "#expand qos_short#"
www = "#expand user_www#zppy_weekly_comprehensive_v3_www/#expand unique_id#"
years = "1985:1989:2",

[ts]
active = True
e3sm_to_cmip_environment_commands = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/650
ts_fmt = "cmip" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/650
walltime = "00:30:00"

[[ atm_monthly_180x360_aave ]]
frequency = "monthly"
input_files = "eam.h0"
input_subdir = "archive/atm/hist"

# TODO: Add "tc_analysis" back in after empty dat is resolved.
# [tc_analysis]
# active = True
# scratch = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
# walltime = "00:30:00"

[global_time_series]
active = True
atmosphere_only = "False" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
climo_years = "1985-1989", "1990-1995",
environment_commands = "#expand global_time_series_environment_commands#"
experiment_name = "#expand case_name#"
figstr = "#expand case_name#"
moc_file=mocTimeSeries_1985-1995.nc
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"
plot_names = "" # DEPRECATED in https://github.com/E3SM-Project/zppy/pull/654
ts_num_years = 5
ts_years = "1985-1989", "1985-1995",
walltime = "00:30:00"
years = "1985-1995",
1 change: 1 addition & 0 deletions tests/integration/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ def generate_cfgs(unified_testing=False, dry_run=False):
cfg_names = [
"min_case_add_dependencies",
"min_case_carryover_dependencies",
"min_case_deprecated_parameters",
"min_case_tc_analysis_simultaneous_1",
"min_case_tc_analysis_simultaneous_2",
"min_case_tc_analysis_v2_simultaneous_1",
Expand Down

0 comments on commit e022501

Please sign in to comment.