Skip to content

Commit d88734e

Browse files
committed
Testing
1 parent 4c6779c commit d88734e

20 files changed

+271
-17
lines changed

tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ years = "1985:1995:5"
8181

8282
[e3sm_diags]
8383
active = True
84-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
84+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
8585
grid = '180x360_aave'
8686
multiprocessing = True
8787
num_workers = 8
Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
[default]
2+
case = "v3.LR.historical_0051"
3+
constraint = ""
4+
dry_run = "False"
5+
environment_commands = ""
6+
input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/v3.LR.historical_0051
7+
input_subdir = archive/atm/hist
8+
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
9+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_cdat_migrated_output/unique_id/v3.LR.historical_0051"
10+
partition = "debug"
11+
qos = "regular"
12+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_min_case_e3sm_diags_cdat_migrated_www/unique_id"
13+
years = "1985:1989:2",
14+
15+
[climo]
16+
active = True
17+
walltime = "00:30:00"
18+
19+
[[ atm_monthly_180x360_aave ]]
20+
frequency = "monthly"
21+
input_files = "eam.h0"
22+
input_subdir = "archive/atm/hist"
23+
vars = ""
24+
25+
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
26+
frequency = "diurnal_8xdaily"
27+
input_files = "eam.h3"
28+
input_subdir = "archive/atm/hist"
29+
vars = "PRECT"
30+
31+
[[ land_monthly_climo ]]
32+
frequency = "monthly"
33+
input_files = "elm.h0"
34+
input_subdir = "archive/lnd/hist"
35+
mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
36+
vars = ""
37+
38+
[ts]
39+
active = True
40+
e3sm_to_cmip_environment_commands = ""
41+
walltime = "00:30:00"
42+
43+
[[ atm_monthly_180x360_aave ]]
44+
frequency = "monthly"
45+
input_files = "eam.h0"
46+
input_subdir = "archive/atm/hist"
47+
ts_fmt = "cmip"
48+
49+
[[ rof_monthly ]]
50+
extra_vars = 'areatotal2'
51+
frequency = "monthly"
52+
input_files = "mosart.h0"
53+
input_subdir = "archive/rof/hist"
54+
mapping_file = ""
55+
vars = "RIVER_DISCHARGE_OVER_LAND_LIQ"
56+
57+
[[ land_monthly ]]
58+
extra_vars = "landfrac"
59+
frequency = "monthly"
60+
input_files = "elm.h0"
61+
input_subdir = "archive/lnd/hist"
62+
mapping_file = "map_r05_to_cmip6_180x360_aave.20231110.nc"
63+
ts_fmt = "cmip"
64+
vars = "FSH,RH2M,LAISHA,LAISUN,QINTR,QOVER,QRUNOFF,QSOIL,QVEGE,QVEGT,SOILICE,SOILLIQ,SOILWATER_10CM,TSA,TSOI,H2OSNO,TOTLITC,CWDC,SOIL1C,SOIL2C,SOIL3C,SOIL4C,WOOD_HARVESTC,TOTVEGC,NBP,GPP,AR,HR"
65+
66+
[tc_analysis]
67+
active = True
68+
scratch = "/lcrc/globalscratch/ac.forsyth2/zppy_weekly_comprehensive_v3_scratch/unique_id/v3.LR.historical_0051"
69+
walltime = "00:30:00"
70+
71+
[e3sm_diags]
72+
active = True
73+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
74+
grid = '180x360_aave'
75+
multiprocessing = True
76+
num_workers = 8
77+
partition = "compute"
78+
qos = "regular"
79+
ref_final_yr = 1986
80+
ref_start_yr = 1985
81+
ref_years = "1985-1986",
82+
# Also lat_lon_land for mvm
83+
sets="lat_lon","lat_lon_river","cosp_histogram","zonal_mean_xy","zonal_mean_2d","zonal_mean_2d_stratosphere","aerosol_aeronet","polar","meridional_mean_2d","area_mean_time_series","aerosol_budget","annual_cycle_zonal_mean","diurnal_cycle",
84+
short_name = "v3.LR.historical_0051"
85+
ts_num_years = 2
86+
walltime = "5:00:00"
87+
years = "1987:1989:2"
88+
89+
[[ atm_monthly_180x360_aave ]]
90+
climo_diurnal_frequency = "diurnal_8xdaily"
91+
climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
92+
climo_subsection = "atm_monthly_180x360_aave"
93+
dc_obs_climo = '/lcrc/group/e3sm/public_html/e3sm_diags_test_data/unit_test_complete_run/obs/climatology'
94+
95+
[[ atm_monthly_180x360_aave_mvm ]]
96+
# Test model-vs-model using the same files as the reference
97+
climo_diurnal_frequency = "diurnal_8xdaily"
98+
climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
99+
climo_subsection = "atm_monthly_180x360_aave"
100+
diff_title = "Difference"
101+
partition = "compute"
102+
qos = "regular"
103+
ref_name = "v3.LR.historical_0051"
104+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_cdat_migrated_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
105+
run_type = "model_vs_model"
106+
short_ref_name = "same simulation"
107+
swap_test_ref = False
108+
tag = "model_vs_model"
109+
ts_num_years_ref = 2
110+
ts_subsection = "atm_monthly_180x360_aave"
111+
112+
[[ lnd_monthly_mvm_lnd ]]
113+
# Test model-vs-model using the same files as the reference
114+
climo_subsection = "land_monthly_climo"
115+
diff_title = "Difference"
116+
partition = "compute"
117+
qos = "regular"
118+
ref_name = "v3.LR.historical_0051"
119+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_min_case_e3sm_diags_cdat_migrated_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
120+
run_type = "model_vs_model"
121+
sets = "lat_lon_land",
122+
short_ref_name = "same simulation"
123+
swap_test_ref = False
124+
tag = "model_vs_model"
125+
ts_num_years_ref = 2

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ walltime = "00:30:00"
2424

2525
[e3sm_diags]
2626
active = True
27-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
27+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
2828
grid = '180x360_aave'
2929
multiprocessing = True
3030
num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_climo_mvm_2_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ walltime = "00:30:00"
2424

2525
[e3sm_diags]
2626
active = True
27-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
27+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
2828
grid = '180x360_aave'
2929
multiprocessing = True
3030
num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ walltime = "00:30:00"
2525

2626
[e3sm_diags]
2727
active = True
28-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
28+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
2929
grid = '180x360_aave'
3030
multiprocessing = True
3131
num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_depend_on_ts_mvm_2_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ walltime = "00:30:00"
2525

2626
[e3sm_diags]
2727
active = True
28-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
28+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
2929
grid = '180x360_aave'
3030
multiprocessing = True
3131
num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ walltime = "00:30:00"
2424

2525
[e3sm_diags]
2626
active = True
27-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
27+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
2828
grid = '180x360_aave'
2929
multiprocessing = True
3030
num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_diurnal_cycle_mvm_2_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ walltime = "00:30:00"
2424

2525
[e3sm_diags]
2626
active = True
27-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
27+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
2828
grid = '180x360_aave'
2929
multiprocessing = True
3030
num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_lat_lon_land_mvm_2_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ walltime = "00:30:00"
2424

2525
[e3sm_diags]
2626
active = True
27-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
27+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
2828
grid = '180x360_aave'
2929
multiprocessing = True
3030
num_workers = 8

tests/integration/generated/test_min_case_e3sm_diags_streamflow_chrysalis.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ walltime = "00:30:00"
2727

2828
[e3sm_diags]
2929
active = True
30-
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240731"
30+
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_cdat_branch_20240731"
3131
grid = '180x360_aave'
3232
multiprocessing = True
3333
num_workers = 8

0 commit comments

Comments
 (0)