Skip to content

Commit d0cfe41

Browse files
committed
Enable test customization
1 parent c0ea3f9 commit d0cfe41

14 files changed

+226
-166
lines changed

tests/integration/generated/test_weekly_bundles_chrysalis.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ years = "1985:1989:2",
5353
frequency = "monthly"
5454

5555
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
56+
active = True
5657
frequency = "diurnal_8xdaily"
5758
input_files = "eam.h3"
5859
input_subdir = "archive/atm/hist"
@@ -69,6 +70,7 @@ years = "1985:1989:2",
6970
input_subdir = "archive/atm/hist"
7071

7172
[[ atm_monthly_glb ]]
73+
active = True
7274
bundle = "bundle2" # Override bundle1
7375
frequency = "monthly"
7476
input_files = "eam.h0"
@@ -77,6 +79,7 @@ years = "1985:1989:2",
7779
years = "1985:1995:5",
7880

7981
[[ land_monthly ]]
82+
active = True
8083
extra_vars = "landfrac"
8184
frequency = "monthly"
8285
input_files = "elm.h0"
@@ -85,6 +88,7 @@ years = "1985:1989:2",
8588
vars = "LAISHA,LAISUN"
8689

8790
[[ rof_monthly ]]
91+
active = True
8892
bundle = "bundle3" # Override bundle1, let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
8993
extra_vars = 'areatotal2'
9094
frequency = "monthly"

tests/integration/generated/test_weekly_comprehensive_v2_chrysalis.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ walltime = "00:30:00"
2424
vars = ""
2525

2626
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
27+
active = True
2728
frequency = "diurnal_8xdaily"
2829
input_files = "eam.h3"
2930
input_subdir = "archive/atm/hist"
3031
vars = "PRECT"
3132

3233
[[ land_monthly_climo ]]
34+
active = True
3335
frequency = "monthly"
3436
input_files = "elm.h0"
3537
input_subdir = "archive/lnd/hist"
@@ -45,12 +47,14 @@ walltime = "00:30:00"
4547
input_subdir = "archive/atm/hist"
4648

4749
[[ atm_daily_180x360_aave ]]
50+
active = True
4851
frequency = "daily"
4952
input_files = "eam.h1"
5053
input_subdir = "archive/atm/hist"
5154
vars = "PRECT"
5255

5356
[[ rof_monthly ]]
57+
active = True
5458
extra_vars = 'areatotal2'
5559
frequency = "monthly"
5660
input_files = "mosart.h0"
@@ -60,13 +64,15 @@ walltime = "00:30:00"
6064

6165
[[ atm_monthly_glb ]]
6266
# Note global average won't work for 3D variables.
67+
active = True
6368
frequency = "monthly"
6469
input_files = "eam.h0"
6570
input_subdir = "archive/atm/hist"
6671
mapping_file = "glb"
6772
years = "1980:1990:5",
6873

6974
[[ lnd_monthly_glb ]]
75+
active = True
7076
frequency = "monthly"
7177
input_files = "elm.h0"
7278
input_subdir = "archive/lnd/hist"

tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ walltime = "00:30:00"
2626
vars = ""
2727

2828
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
29+
active = True
2930
frequency = "diurnal_8xdaily"
3031
input_files = "eam.h3"
3132
input_subdir = "archive/atm/hist"
3233
vars = "PRECT"
3334

3435
[[ land_monthly_climo ]]
36+
active = True
3537
frequency = "monthly"
3638
input_files = "elm.h0"
3739
input_subdir = "archive/lnd/hist"
@@ -48,12 +50,14 @@ walltime = "00:30:00"
4850
input_subdir = "archive/atm/hist"
4951

5052
[[ atm_daily_180x360_aave ]]
53+
active = True
5154
frequency = "daily"
5255
input_files = "eam.h1"
5356
input_subdir = "archive/atm/hist"
5457
vars = "PRECT"
5558

5659
[[ rof_monthly ]]
60+
active = True
5761
extra_vars = 'areatotal2'
5862
frequency = "monthly"
5963
input_files = "mosart.h0"
@@ -63,13 +67,15 @@ walltime = "00:30:00"
6367

6468
[[ atm_monthly_glb ]]
6569
# Note global average won't work for 3D variables.
70+
active = True
6671
frequency = "monthly"
6772
input_files = "eam.h0"
6873
input_subdir = "archive/atm/hist"
6974
mapping_file = "glb"
7075
years = "1985:1995:5",
7176

7277
[[ lnd_monthly_glb ]]
78+
active = True
7379
frequency = "monthly"
7480
input_files = "elm.h0"
7581
input_subdir = "archive/lnd/hist"

tests/integration/generated/test_weekly_legacy_3.0.0_bundles_chrysalis.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ years = "1985:1989:2",
5353
frequency = "monthly"
5454

5555
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
56+
active = True
5657
frequency = "diurnal_8xdaily"
5758
input_files = "eam.h3"
5859
input_subdir = "archive/atm/hist"
@@ -69,6 +70,7 @@ years = "1985:1989:2",
6970
input_subdir = "archive/atm/hist"
7071

7172
[[ atm_monthly_glb ]]
73+
active = True
7274
bundle = "bundle2" # Override bundle1
7375
frequency = "monthly"
7476
input_files = "eam.h0"
@@ -77,6 +79,7 @@ years = "1985:1989:2",
7779
years = "1985:1995:5",
7880

7981
[[ land_monthly ]]
82+
active = True
8083
extra_vars = "landfrac"
8184
frequency = "monthly"
8285
input_files = "elm.h0"
@@ -85,6 +88,7 @@ years = "1985:1989:2",
8588
vars = "LAISHA,LAISUN"
8689

8790
[[ rof_monthly ]]
91+
active = True
8892
bundle = "bundle3" # Override bundle1, let bundle1 finish first because "e3sm_diags: atm_monthly_180x360_aave_mvm" requires "ts: atm_monthly_180x360_aave"
8993
extra_vars = 'areatotal2'
9094
frequency = "monthly"

tests/integration/generated/test_weekly_legacy_3.0.0_comprehensive_v2_chrysalis.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ walltime = "00:30:00"
2424
vars = ""
2525

2626
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
27+
active = True
2728
frequency = "diurnal_8xdaily"
2829
input_files = "eam.h3"
2930
input_subdir = "archive/atm/hist"
3031
vars = "PRECT"
3132

3233
[[ land_monthly_climo ]]
34+
active = True
3335
frequency = "monthly"
3436
input_files = "elm.h0"
3537
input_subdir = "archive/lnd/hist"
@@ -45,12 +47,14 @@ walltime = "00:30:00"
4547
input_subdir = "archive/atm/hist"
4648

4749
[[ atm_daily_180x360_aave ]]
50+
active = True
4851
frequency = "daily"
4952
input_files = "eam.h1"
5053
input_subdir = "archive/atm/hist"
5154
vars = "PRECT"
5255

5356
[[ rof_monthly ]]
57+
active = True
5458
extra_vars = 'areatotal2'
5559
frequency = "monthly"
5660
input_files = "mosart.h0"
@@ -60,13 +64,15 @@ walltime = "00:30:00"
6064

6165
[[ atm_monthly_glb ]]
6266
# Note global average won't work for 3D variables.
67+
active = True
6368
frequency = "monthly"
6469
input_files = "eam.h0"
6570
input_subdir = "archive/atm/hist"
6671
mapping_file = "glb"
6772
years = "1980:1990:5",
6873

6974
[[ lnd_monthly_glb ]]
75+
active = True
7076
frequency = "monthly"
7177
input_files = "elm.h0"
7278
input_subdir = "archive/lnd/hist"

tests/integration/generated/test_weekly_legacy_3.0.0_comprehensive_v3_chrysalis.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ walltime = "00:30:00"
2626
vars = ""
2727

2828
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
29+
active = True
2930
frequency = "diurnal_8xdaily"
3031
input_files = "eam.h3"
3132
input_subdir = "archive/atm/hist"
3233
vars = "PRECT"
3334

3435
[[ land_monthly_climo ]]
36+
active = True
3537
frequency = "monthly"
3638
input_files = "elm.h0"
3739
input_subdir = "archive/lnd/hist"
@@ -48,12 +50,14 @@ walltime = "00:30:00"
4850
input_subdir = "archive/atm/hist"
4951

5052
[[ atm_daily_180x360_aave ]]
53+
active = True
5154
frequency = "daily"
5255
input_files = "eam.h1"
5356
input_subdir = "archive/atm/hist"
5457
vars = "PRECT"
5558

5659
[[ rof_monthly ]]
60+
active = True
5761
extra_vars = 'areatotal2'
5862
frequency = "monthly"
5963
input_files = "mosart.h0"
@@ -63,13 +67,15 @@ walltime = "00:30:00"
6367

6468
[[ atm_monthly_glb ]]
6569
# Note global average won't work for 3D variables.
70+
active = True
6671
frequency = "monthly"
6772
input_files = "eam.h0"
6873
input_subdir = "archive/atm/hist"
6974
mapping_file = "glb"
7075
years = "1985:1995:5",
7176

7277
[[ lnd_monthly_glb ]]
78+
active = True
7379
frequency = "monthly"
7480
input_files = "elm.h0"
7581
input_subdir = "archive/lnd/hist"

tests/integration/template_weekly_bundles.cfg

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ years = "1985:1989:2",
5353
frequency = "monthly"
5454

5555
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
56+
active = #expand active_e3sm_diags#
5657
frequency = "diurnal_8xdaily"
5758
input_files = "eam.h3"
5859
input_subdir = "archive/atm/hist"
@@ -69,6 +70,7 @@ years = "1985:1989:2",
6970
input_subdir = "archive/atm/hist"
7071

7172
[[ atm_monthly_glb ]]
73+
active = #expand active_global_time_series#
7274
bundle = "bundle2" # Override bundle1
7375
frequency = "monthly"
7476
input_files = "eam.h0"
@@ -77,6 +79,7 @@ years = "1985:1989:2",
7779
years = "1985:1995:5",
7880

7981
[[ land_monthly ]]
82+
active = #expand active_e3sm_diags#
8083
extra_vars = "landfrac"
8184
frequency = "monthly"
8285
input_files = "elm.h0"
@@ -85,6 +88,7 @@ years = "1985:1989:2",
8588
vars = "LAISHA,LAISUN"
8689

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

96100
[e3sm_to_cmip]
97-
active = True
101+
active = #expand active_e3sm_to_cmip#
98102
bundle = "bundle1"
99103
frequency = "monthly"
100104
ts_num_years = 2
@@ -113,7 +117,7 @@ years = "1985:1989:2",
113117
# years = "1985:1989:2",
114118

115119
[e3sm_diags]
116-
active = True
120+
active = #expand active_e3sm_diags#
117121
environment_commands = "#expand diags_environment_commands#"
118122
grid = '180x360_aave'
119123
ref_final_yr = 1989
@@ -149,7 +153,7 @@ years = "1985:1989:2",
149153
years = "1987-1988"
150154

151155
[global_time_series]
152-
active = True
156+
active = #expand active_global_time_series#
153157
bundle = "bundle2"
154158
environment_commands = "#expand global_time_series_environment_commands#"
155159
experiment_name = "#expand case_name#"
@@ -160,7 +164,7 @@ walltime = "00:30:00" # bundle2 should take walltime from "ts: atm_monthly_glb",
160164
years = "1985-1995",
161165

162166
[ilamb]
163-
active = True
167+
active = #expand active_ilamb#
164168
# No bundle, let bundle1 finish first because "ilamb" requires "ts: atm_monthly_180x360_aave" and "ts: land_monthly"
165169
grid = '180x360_aave'
166170
short_name = "#expand case_name#"

0 commit comments

Comments
 (0)