Skip to content

Commit 317dcfb

Browse files
forsyth2forsyth2
committed
Clean up code
1 parent ab4b7f6 commit 317dcfb

File tree

5 files changed

+40
-31
lines changed

5 files changed

+40
-31
lines changed

‎tests/integration/generated/test_weekly_comprehensive_v3_chrysalis.cfg‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ infer_section_parameters = False
99
input = /lcrc/group/e3sm2/ac.wlin//E3SMv3/v3.LR.historical_0051
1010
input_subdir = archive/atm/hist
1111
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
12-
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051"
12+
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051"
1313
partition = "debug"
1414
qos = "regular"
15-
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id_pcmdi_diags_20250926"
15+
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_comprehensive_v3_www/unique_id"
1616
years = "1985:1989:2",
1717

1818
[climo]
@@ -26,14 +26,14 @@ walltime = "00:30:00"
2626
vars = ""
2727

2828
[[ atm_monthly_diurnal_8xdaily_180x360_aave ]]
29-
active = False
29+
active = True
3030
frequency = "diurnal_8xdaily"
3131
input_files = "eam.h3"
3232
input_subdir = "archive/atm/hist"
3333
vars = "PRECT"
3434

3535
[[ land_monthly_climo ]]
36-
active = False
36+
active = True
3737
frequency = "monthly"
3838
input_files = "elm.h0"
3939
input_subdir = "archive/lnd/hist"
@@ -51,14 +51,14 @@ walltime = "00:30:00"
5151
years = "1985:1995:2", # Need 10 years for pcmdi_diags task
5252

5353
[[ atm_daily_180x360_aave ]]
54-
active = False
54+
active = True
5555
frequency = "daily"
5656
input_files = "eam.h1"
5757
input_subdir = "archive/atm/hist"
5858
vars = "PRECT"
5959

6060
[[ rof_monthly ]]
61-
active = False
61+
active = True
6262
extra_vars = 'areatotal2'
6363
frequency = "monthly"
6464
input_files = "mosart.h0"
@@ -68,15 +68,15 @@ walltime = "00:30:00"
6868

6969
[[ atm_monthly_glb ]]
7070
# Note global average won't work for 3D variables.
71-
active = False
71+
active = True
7272
frequency = "monthly"
7373
input_files = "eam.h0"
7474
input_subdir = "archive/atm/hist"
7575
mapping_file = "glb"
7676
years = "1985:1995:5",
7777

7878
[[ lnd_monthly_glb ]]
79-
active = False
79+
active = True
8080
frequency = "monthly"
8181
input_files = "elm.h0"
8282
input_subdir = "archive/lnd/hist"
@@ -113,11 +113,11 @@ walltime = "00:30:00"
113113
# walltime = "00:30:00"
114114

115115
[e3sm_diags]
116-
active = False
116+
active = True
117117
climo_diurnal_frequency = "diurnal_8xdaily"
118118
climo_diurnal_subsection = "atm_monthly_diurnal_8xdaily_180x360_aave"
119119
climo_subsection = "atm_monthly_180x360_aave"
120-
environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh"
120+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
121121
grid = '180x360_aave'
122122
multiprocessing = True
123123
num_workers = 8
@@ -169,16 +169,16 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/"
169169
tag = "model_vs_model"
170170
ts_num_years_ref = 2
171171
# Reference paths
172-
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051/post/atm/180x360_aave/clim"
172+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim"
173173
# mvm streamflow only
174174
gauges_path = "/lcrc/group/e3sm/diagnostics/observations/Atm/time-series/GSIM/GSIM_catchment_characteristics_all_1km2.csv"
175-
reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051/post/rof/native/ts/monthly"
175+
reference_data_path_ts_rof = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/rof/native/ts/monthly"
176176
# mvm diurnal_cycle only
177-
reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
177+
reference_data_path_climo_diurnal = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/clim_diurnal_8xdaily"
178178
# mvm "enso_diags", "qbo", "area_mean_time_series"
179-
reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly"
179+
reference_data_path_ts = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/monthly"
180180
# mvm tropical_subseasonal only
181-
reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily"
181+
reference_data_path_ts_daily = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/atm/180x360_aave/ts/daily"
182182

183183
[[ lnd_monthly_mvm_lnd ]]
184184
# Test model-vs-model using the same files as the reference
@@ -194,10 +194,10 @@ tc_obs = "/lcrc/group/e3sm/diagnostics/observations/Atm/tc-analysis/"
194194
tag = "model_vs_model"
195195
ts_num_years_ref = 2
196196
# Reference paths
197-
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
197+
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_weekly_comprehensive_v3_output/unique_id/v3.LR.historical_0051/post/lnd/180x360_aave/clim"
198198

199199
[mpas_analysis]
200-
active = False
200+
active = True
201201
anomalyRefYear = 1985
202202
climo_years = "1985-1989", "1990-1995",
203203
enso_years = "1985-1989", "1990-1995",
@@ -210,9 +210,9 @@ ts_years = "1985-1989", "1985-1995",
210210
walltime = "00:30:00"
211211

212212
[global_time_series]
213-
active = False
213+
active = True
214214
climo_years = "1985-1989", "1990-1995",
215-
environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh"
215+
environment_commands = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
216216
experiment_name = "v3.LR.historical_0051"
217217
figstr = "v3.LR.historical_0051"
218218
moc_file=mocTimeSeries_1985-1995.nc
@@ -223,7 +223,7 @@ walltime = "00:30:00"
223223
years = "1985-1995",
224224

225225
[ilamb]
226-
active = False
226+
active = True
227227
e3sm_to_cmip_atm_subsection = "atm_monthly_180x360_aave"
228228
e3sm_to_cmip_land_subsection = "land_monthly"
229229
ilamb_obs = "/lcrc/group/e3sm/diagnostics/ilamb_data"
@@ -238,7 +238,7 @@ years = "1985:1989:4"
238238

239239
[pcmdi_diags]
240240
active = True
241-
environment_commands_secondary = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20250925"
241+
environment_commands_secondary = "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>"
242242
walltime = "2:00:00"
243243
figure_format = "png"
244244
run_type = "model_vs_obs"

‎tests/integration/generated/update_weekly_expected_files_chrysalis.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ do
3535
# Copy output so you don't have to rerun zppy to generate the output.
3636
if [[ "${test_name,,}" =~ "v2" ]]; then
3737
# We need the v2 case name
38-
cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id_pcmdi_diags_20250926/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
38+
cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id/v2.LR.historical_0201 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
3939
else
4040
# We need the v3 case name
41-
cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
41+
cp -r /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_weekly_${test_name}_www/unique_id/v3.LR.historical_0051 /lcrc/group/e3sm/public_html/zppy_test_resources/expected_${test_name}
4242
fi
4343

4444
# test_bundles.py also needs the bash files transferred.
4545
# Note that for legacy cfgs, we're only testing test_images.py
4646
if [[ "${test_name,,}" == "bundles" ]]; then
4747
mkdir -p /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
48-
cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id_pcmdi_diags_20250926/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
48+
cp -r /lcrc/group/e3sm/ac.forsyth2/zppy_weekly_bundles_output/unique_id/v3.LR.historical_0051/post/scripts/bundle*.bash /lcrc/group/e3sm/public_html/zppy_test_resources/expected_bundles/bundle_files
4949
fi
5050

5151
zppy_top_level=$(pwd)

‎tests/integration/utils.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,25 @@
1212
# pytest tests/integration/test_*.py
1313

1414
TEST_SPECIFICS: Dict[str, Any] = {
15-
"diags_environment_commands": "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh",
16-
"global_time_series_environment_commands": "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh",
17-
"pcmdi_diags_environment_commands": "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20250925",
15+
"diags_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
16+
"global_time_series_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
17+
"pcmdi_diags_environment_commands": "source <INSERT PATH TO CONDA>/conda.sh; conda activate <INSERT ENV NAME>",
1818
"cfgs_to_run": [
19+
"weekly_bundles",
20+
"weekly_comprehensive_v2",
1921
"weekly_comprehensive_v3",
22+
"weekly_legacy_3.0.0_bundles",
23+
"weekly_legacy_3.0.0_comprehensive_v2",
24+
"weekly_legacy_3.0.0_comprehensive_v3",
2025
],
2126
"tasks_to_run": [
27+
"e3sm_diags",
28+
"mpas_analysis",
29+
"global_time_series",
30+
"ilamb",
2231
"pcmdi_diags",
2332
],
24-
"unique_id": "unique_id_pcmdi_diags_20250926",
33+
"unique_id": "unique_id",
2534
}
2635

2736
# Multi-machine testing #########################################################

‎tests/test_sections.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def test_sections():
9898
"ts_land_subsection": "",
9999
"ts_num_years": 5,
100100
"ts_subsection": "",
101-
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U",
101+
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U,PSL",
102102
"walltime": "02:00:00",
103103
"www": "WWWW",
104104
"years": [""],
@@ -288,7 +288,7 @@ def test_subsections():
288288
"ts_land_subsection": "",
289289
"ts_num_years": 5,
290290
"ts_subsection": "",
291-
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U",
291+
"vars": "FSNTOA,FLUT,FSNT,FLNT,FSNS,FLNS,SHFLX,QFLX,TAUX,TAUY,PRECC,PRECL,PRECSC,PRECSL,TS,TREFHT,CLDTOT,CLDHGH,CLDMED,CLDLOW,U,PSL",
292292
"walltime": "02:00:00",
293293
"www": "WWWW",
294294
"years": [""],

‎tests/test_zppy_pcmdi_diags.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def test_check_parameters_for_pcmdi():
169169
check_parameters_for_pcmdi(c)
170170
assert c["cmip_clim_dir"] == "diags/post/pcmdi_data/metrics_data/mean_climate"
171171
assert c["cmip_movs_dir"] == "diags/post/pcmdi_data/metrics_data/variability_modes"
172-
assert c["cmip_enso_dir"] == ""
172+
assert c["cmip_enso_dir"] == "placeholder_dir"
173173

174174
c = {
175175
"current_set": "mean_climate",

0 commit comments

Comments
 (0)