Skip to content
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

Add e3sm_to_cmip task #650

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Add e3sm_to_cmip task #650

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e99178b
Add e3sm_to_cmip task
forsyth2 Dec 7, 2024
7fc7e2b
Add dependency handling
forsyth2 Dec 10, 2024
3a8dc06
Update defaults
forsyth2 Dec 10, 2024
e7d43e1
Fix cmortables_dir
forsyth2 Dec 10, 2024
f92ad22
Currently testing on v3
forsyth2 Dec 11, 2024
2cbc136
Image check tests passing
forsyth2 Dec 12, 2024
e93a577
Clean up code
forsyth2 Dec 12, 2024
5812010
Address comments
forsyth2 Dec 12, 2024
44c93e0
Update parameters
forsyth2 Dec 12, 2024
6e37e19
Handle ts dependency and output
forsyth2 Dec 13, 2024
c1116e9
Unit tests passing
forsyth2 Dec 13, 2024
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
6 changes: 3 additions & 3 deletions tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ environment_commands = ""
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_min_case_add_dependencies_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_add_dependencies_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
# ts is in 5 year increments
ts_num_years = 5
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_add_dependencies_www/test-650-20241210"
# We want to produce diagnostics for 10 years.
years = "1985:1995:10",

Expand Down Expand Up @@ -81,7 +81,7 @@ years = "1985:1995:5"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/generated/test_min_case_carryover_dependencies_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ environment_commands = ""
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_min_case_carryover_dependencies_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_carryover_dependencies_www/test-650-20241210"
years = "1985:1989:2",

[climo]
Expand Down Expand Up @@ -110,7 +110,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand Down Expand Up @@ -143,7 +143,7 @@ years = "1987:1989:2"
partition = "compute"
qos = "regular"
ref_name = "v3.LR.historical_0051"
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_carryover_dependencies_output/test-650-20241210/v3.LR.historical_0051/post/atm/180x360_aave/clim"
run_type = "model_vs_model"
sets = "lat_lon",
short_ref_name = "same simulation"
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_depend_on_climo_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_www/test-650-20241210"
years = "1985:1989:4",

[climo]
Expand All @@ -24,7 +24,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_1_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_depend_on_climo_mvm_1_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_www/test-650-20241210"
years = "1985:1989:4",

[climo]
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_depend_on_climo_mvm_2_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_2_www/test-650-20241210"
years = "1995:1999:4",

[climo]
Expand All @@ -24,7 +24,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand All @@ -42,7 +42,7 @@ walltime = "5:00:00"
ref_start_yr = 1985
ref_years = "1985-1988",
# Use _1 as reference
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_climo_mvm_1_output/test-650-20241210/v3.LR.historical_0051/post/atm/180x360_aave/clim"
run_type = "model_vs_model"
sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget",
short_ref_name = "v3.LR.historical_0051"
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_depend_on_ts_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_www/test-650-20241210"
years = "1985:1989:4",

[ts]
Expand All @@ -25,7 +25,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_1_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_depend_on_ts_mvm_1_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_www/test-650-20241210"
years = "1985:1989:4",

[ts]
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_depend_on_ts_mvm_2_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_2_www/test-650-20241210"
years = "1995:1999:4",

[ts]
Expand All @@ -25,7 +25,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand All @@ -44,7 +44,7 @@ walltime = "5:00:00"
ref_start_yr = 1985
ref_years = "1985-1988",
# Use _1 as reference
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_depend_on_ts_mvm_1_output/test-650-20241210/v3.LR.historical_0051/post/atm/180x360_aave/clim"
run_type = "model_vs_model"
sets = "enso_diags","qbo",
short_ref_name = "v3.LR.historical_0051"
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_diurnal_cycle_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_www/test-650-20241210"
years = "1985:1989:4",

[climo]
Expand All @@ -24,7 +24,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_1_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_www/test-650-20241210"
years = "1985:1989:4",

[climo]
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_2_www/test-650-20241210"
years = "1995:1999:4",

[climo]
Expand All @@ -24,7 +24,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand All @@ -40,7 +40,7 @@ walltime = "5:00:00"
ref_name = "v3.LR.historical_0051"
ref_years = "1985-1988",
# Use _1 as reference
reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_diurnal_cycle_mvm_1_output/test-650-20241210/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
run_type = "model_vs_model"
sets = "diurnal_cycle",
short_ref_name = "v3.LR.historical_0051"
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_1_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_lat_lon_land_mvm_1_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_www/test-650-20241210"
years = "1985:1989:4",

[climo]
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_lat_lon_land_mvm_2_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_2_www/test-650-20241210"
years = "1995:1999:4",

[climo]
Expand All @@ -24,7 +24,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand All @@ -41,7 +41,7 @@ walltime = "5:00:00"
ref_start_yr = 1985
ref_years = "1985-1988",
# Use _1 as reference
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_lat_lon_land_mvm_1_output/test-650-20241210/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
run_type = "model_vs_model"
sets = "lat_lon_land",
short_ref_name = "v3.LR.historical_0051"
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_streamflow_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_www/test-650-20241210"
years = "1985:1989:4",

[ts]
Expand All @@ -27,7 +27,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_1_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_streamflow_mvm_1_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_www/test-650-20241210"
years = "1985:1989:4",

[ts]
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/generated/test_min_case_e3sm_diags_streamflow_mvm_2_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ environment_commands = ""
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_min_case_e3sm_diags_streamflow_mvm_2_output/unique_id/v3.LR.historical_0051"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_output/test-650-20241210/v3.LR.historical_0051"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_2_www/test-650-20241210"
years = "1995:1999:4",

[ts]
Expand All @@ -27,7 +27,7 @@ walltime = "00:30:00"

[e3sm_diags]
active = True
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
environment_commands = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate e3sm_diags_main_20241210"
grid = '180x360_aave'
multiprocessing = True
num_workers = 8
Expand All @@ -45,7 +45,7 @@ walltime = "5:00:00"
ref_start_yr = 1985
ref_years = "1985-1988",
# Use _1 as reference
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_streamflow_mvm_1_output/test-650-20241210/v3.LR.historical_0051/post/atm/180x360_aave/clim"
# reference_data_path_ts_rof determined automatically
run_type = "model_vs_model"
sets="streamflow"
Expand Down
Loading
Loading