Skip to content

Commit 0820d07

Browse files
committed
Integration tests passing
1 parent 302f3a5 commit 0820d07

File tree

43 files changed

+210
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+210
-170
lines changed

tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ environment_commands = ""
1414
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
1515
input_subdir = archive/atm/hist
1616
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
17-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test-pr628-20241011v6/v3.LR.historical_0051"
17+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test-pr628-20241011v12/v3.LR.historical_0051"
1818
partition = "debug"
1919
qos = "regular"
2020
# ts is in 5 year increments
2121
ts_num_years = 5
22-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test-pr628-20241011v6"
22+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test-pr628-20241011v12"
2323
# We want to produce diagnostics for 10 years.
2424
years = "1985:1995:10",
2525

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test-pr628-20241011v12"
1313
years = "1985:1989:4",
1414

1515
[climo]

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test-pr628-20241011v12"
1313
years = "1985:1989:4",
1414

1515
[climo]

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test-pr628-20241011v12"
1313
years = "1995:1999:4",
1414

1515
[climo]
@@ -42,7 +42,7 @@ walltime = "5:00:00"
4242
ref_start_yr = 1985
4343
ref_years = "1985-1988",
4444
# Use _1 as reference
45-
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
45+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
4646
run_type = "model_vs_model"
4747
sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere",
4848
short_ref_name = "v3.LR.historical_0051"

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test-pr628-20241011v12"
1313
years = "1985:1989:4",
1414

1515
[ts]

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test-pr628-20241011v12"
1313
years = "1985:1989:4",
1414

1515
[ts]

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test-pr628-20241011v12"
1313
years = "1995:1999:4",
1414

1515
[ts]
@@ -44,7 +44,7 @@ walltime = "5:00:00"
4444
ref_start_yr = 1985
4545
ref_years = "1985-1988",
4646
# Use _1 as reference
47-
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim"
47+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim"
4848
run_type = "model_vs_model"
4949
sets = "enso_diags","qbo",
5050
short_ref_name = "v3.LR.historical_0051"

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test-pr628-20241011v12"
1313
years = "1985:1989:4",
1414

1515
[climo]

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test-pr628-20241011v12"
1313
years = "1985:1989:4",
1414

1515
[climo]

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ environment_commands = ""
66
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
77
input_subdir = archive/atm/hist
88
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test-pr628-20241011v6/v3.LR.historical_0051"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test-pr628-20241011v12/v3.LR.historical_0051"
1010
partition = "debug"
1111
qos = "regular"
12-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test-pr628-20241011v6"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test-pr628-20241011v12"
1313
years = "1995:1999:4",
1414

1515
[climo]
@@ -40,7 +40,7 @@ walltime = "5:00:00"
4040
ref_name = "v3.LR.historical_0051"
4141
ref_years = "1985-1988",
4242
# Use _1 as reference
43-
reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-pr628-20241011v6/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
43+
reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-pr628-20241011v12/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
4444
run_type = "model_vs_model"
4545
sets = "diurnal_cycle",
4646
short_ref_name = "v3.LR.historical_0051"

0 commit comments

Comments
 (0)