Skip to content

Enable test customization #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forsyth2 merged 2 commits into from
Sep 16, 2025
Merged

Enable test customization #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0cfe41
Enable test customization
forsyth2 Sep 4, 2025
093ae2f
Improve parameter names
forsyth2 Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tests/integration/generated/test_weekly_bundles_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ years = "1985:1989:2",
frequency = "monthly"

[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
active = True
frequency = "diurnal_8xdaily"
input_files = "eam.h3"
input_subdir = "archive/atm/hist"
Expand All @@ -69,6 +70,7 @@ years = "1985:1989:2",
input_subdir = "archive/atm/hist"

[[ atm_monthly_glb ]]
active = True
bundle = "bundle2" # Override bundle1
frequency = "monthly"
input_files = "eam.h0"
Expand All @@ -77,6 +79,7 @@ years = "1985:1989:2",
years = "1985:1995:5",

[[ land_monthly ]]
active = True
extra_vars = "landfrac"
frequency = "monthly"
input_files = "elm.h0"
Expand All @@ -85,6 +88,7 @@ years = "1985:1989:2",
vars = "LAISHA,LAISUN"

[[ rof_monthly ]]
active = True
bundle = "bundle3" # Override bundle1, let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
extra_vars = 'areatotal2'
frequency = "monthly"
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ walltime = "00:30:00"
vars = ""

[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
active = True
frequency = "diurnal_8xdaily"
input_files = "eam.h3"
input_subdir = "archive/atm/hist"
vars = "PRECT"

[[ land_monthly_climo ]]
active = True
frequency = "monthly"
input_files = "elm.h0"
input_subdir = "archive/lnd/hist"
Expand All @@ -45,12 +47,14 @@ walltime = "00:30:00"
input_subdir = "archive/atm/hist"

[[ atm_daily_180x360_aave ]]
active = True
frequency = "daily"
input_files = "eam.h1"
input_subdir = "archive/atm/hist"
vars = "PRECT"

[[ rof_monthly ]]
active = True
extra_vars = 'areatotal2'
frequency = "monthly"
input_files = "mosart.h0"
Expand All @@ -60,13 +64,15 @@ walltime = "00:30:00"

[[ atm_monthly_glb ]]
# Note global average won't work for 3D variables.
active = True
frequency = "monthly"
input_files = "eam.h0"
input_subdir = "archive/atm/hist"
mapping_file = "glb"
years = "1980:1990:5",

[[ lnd_monthly_glb ]]
active = True
frequency = "monthly"
input_files = "elm.h0"
input_subdir = "archive/lnd/hist"
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ walltime = "00:30:00"
vars = ""

[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
active = True
frequency = "diurnal_8xdaily"
input_files = "eam.h3"
input_subdir = "archive/atm/hist"
vars = "PRECT"

[[ land_monthly_climo ]]
active = True
frequency = "monthly"
input_files = "elm.h0"
input_subdir = "archive/lnd/hist"
Expand All @@ -48,12 +50,14 @@ walltime = "00:30:00"
input_subdir = "archive/atm/hist"

[[ atm_daily_180x360_aave ]]
active = True
frequency = "daily"
input_files = "eam.h1"
input_subdir = "archive/atm/hist"
vars = "PRECT"

[[ rof_monthly ]]
active = True
extra_vars = 'areatotal2'
frequency = "monthly"
input_files = "mosart.h0"
Expand All @@ -63,13 +67,15 @@ walltime = "00:30:00"

[[ atm_monthly_glb ]]
# Note global average won't work for 3D variables.
active = True
frequency = "monthly"
input_files = "eam.h0"
input_subdir = "archive/atm/hist"
mapping_file = "glb"
years = "1985:1995:5",

[[ lnd_monthly_glb ]]
active = True
frequency = "monthly"
input_files = "elm.h0"
input_subdir = "archive/lnd/hist"
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/generated/test_weekly_legacy_3.0.0_bundles_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ years = "1985:1989:2",
frequency = "monthly"

[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
active = True
frequency = "diurnal_8xdaily"
input_files = "eam.h3"
input_subdir = "archive/atm/hist"
Expand All @@ -69,6 +70,7 @@ years = "1985:1989:2",
input_subdir = "archive/atm/hist"

[[ atm_monthly_glb ]]
active = True
bundle = "bundle2" # Override bundle1
frequency = "monthly"
input_files = "eam.h0"
Expand All @@ -77,6 +79,7 @@ years = "1985:1989:2",
years = "1985:1995:5",

[[ land_monthly ]]
active = True
extra_vars = "landfrac"
frequency = "monthly"
input_files = "elm.h0"
Expand All @@ -85,6 +88,7 @@ years = "1985:1989:2",
vars = "LAISHA,LAISUN"

[[ rof_monthly ]]
active = True
bundle = "bundle3" # Override bundle1, let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
extra_vars = 'areatotal2'
frequency = "monthly"
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/generated/test_weekly_legacy_3.0.0_comprehensive_v2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ walltime = "00:30:00"
vars = ""

[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
active = True
frequency = "diurnal_8xdaily"
input_files = "eam.h3"
input_subdir = "archive/atm/hist"
vars = "PRECT"

[[ land_monthly_climo ]]
active = True
frequency = "monthly"
input_files = "elm.h0"
input_subdir = "archive/lnd/hist"
Expand All @@ -45,12 +47,14 @@ walltime = "00:30:00"
input_subdir = "archive/atm/hist"

[[ atm_daily_180x360_aave ]]
active = True
frequency = "daily"
input_files = "eam.h1"
input_subdir = "archive/atm/hist"
vars = "PRECT"

[[ rof_monthly ]]
active = True
extra_vars = 'areatotal2'
frequency = "monthly"
input_files = "mosart.h0"
Expand All @@ -60,13 +64,15 @@ walltime = "00:30:00"

[[ atm_monthly_glb ]]
# Note global average won't work for 3D variables.
active = True
frequency = "monthly"
input_files = "eam.h0"
input_subdir = "archive/atm/hist"
mapping_file = "glb"
years = "1980:1990:5",

[[ lnd_monthly_glb ]]
active = True
frequency = "monthly"
input_files = "elm.h0"
input_subdir = "archive/lnd/hist"
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/generated/test_weekly_legacy_3.0.0_comprehensive_v3_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ walltime = "00:30:00"
vars = ""

[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
active = True
frequency = "diurnal_8xdaily"
input_files = "eam.h3"
input_subdir = "archive/atm/hist"
vars = "PRECT"

[[ land_monthly_climo ]]
active = True
frequency = "monthly"
input_files = "elm.h0"
input_subdir = "archive/lnd/hist"
Expand All @@ -48,12 +50,14 @@ walltime = "00:30:00"
input_subdir = "archive/atm/hist"

[[ atm_daily_180x360_aave ]]
active = True
frequency = "daily"
input_files = "eam.h1"
input_subdir = "archive/atm/hist"
vars = "PRECT"

[[ rof_monthly ]]
active = True
extra_vars = 'areatotal2'
frequency = "monthly"
input_files = "mosart.h0"
Expand All @@ -63,13 +67,15 @@ walltime = "00:30:00"

[[ atm_monthly_glb ]]
# Note global average won't work for 3D variables.
active = True
frequency = "monthly"
input_files = "eam.h0"
input_subdir = "archive/atm/hist"
mapping_file = "glb"
years = "1985:1995:5",

[[ lnd_monthly_glb ]]
active = True
frequency = "monthly"
input_files = "elm.h0"
input_subdir = "archive/lnd/hist"
Expand Down
12 changes: 8 additions & 4 deletions tests/integration/template_weekly_bundles.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ years = "1985:1989:2",
frequency = "monthly"

[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
active = #expand active_e3sm_diags#
frequency = "diurnal_8xdaily"
input_files = "eam.h3"
input_subdir = "archive/atm/hist"
Expand All @@ -69,6 +70,7 @@ years = "1985:1989:2",
input_subdir = "archive/atm/hist"

[[ atm_monthly_glb ]]
active = #expand active_global_time_series#
bundle = "bundle2" # Override bundle1
frequency = "monthly"
input_files = "eam.h0"
Expand All @@ -77,6 +79,7 @@ years = "1985:1989:2",
years = "1985:1995:5",

[[ land_monthly ]]
active = #expand active_e3sm_diags#
extra_vars = "landfrac"
frequency = "monthly"
input_files = "elm.h0"
Expand All @@ -85,6 +88,7 @@ years = "1985:1989:2",
vars = "LAISHA,LAISUN"

[[ rof_monthly ]]
active = #expand active_e3sm_diags#
bundle = "bundle3" # Override bundle1, let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
extra_vars = 'areatotal2'
frequency = "monthly"
Expand All @@ -94,7 +98,7 @@ years = "1985:1989:2",
vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"

[e3sm_to_cmip]
active = True
active = #expand active_e3sm_to_cmip#
bundle = "bundle1"
frequency = "monthly"
ts_num_years = 2
Expand All @@ -113,7 +117,7 @@ years = "1985:1989:2",
# years = "1985:1989:2",

[e3sm_diags]
active = True
active = #expand active_e3sm_diags#
environment_commands = "#expand diags_environment_commands#"
grid = '180x360_aave'
ref_final_yr = 1989
Expand Down Expand Up @@ -149,7 +153,7 @@ years = "1985:1989:2",
years = "1987-1988"

[global_time_series]
active = True
active = #expand active_global_time_series#
bundle = "bundle2"
environment_commands = "#expand global_time_series_environment_commands#"
experiment_name = "#expand case_name#"
Expand All @@ -160,7 +164,7 @@ walltime = "00:30:00" # bundle2 should take walltime from "ts: atm_monthly_glb",
years = "1985-1995",

[ilamb]
active = True
active = #expand active_ilamb#
# No bundle, let bundle1 finish first because "ilamb" requires "ts: atm_monthly_180x360_aave" and "ts: land_monthly"
grid = '180x360_aave'
short_name = "#expand case_name#"
Expand Down
Loading
Loading