Skip to content

Commit abb5adf

Browse files
committed
Refactor arm_diags_plot.py
- Rename functions to denote private and reorder based on call in `arm_diags_driver.py` - Add typestrings and annotations - Separate logically related blocks of code with comments - Add `_save_plots()` function to replace repeated I/O across functions
1 parent 43319e2 commit abb5adf

File tree

2 files changed

+497
-331
lines changed

2 files changed

+497
-331
lines changed

e3sm_diags/driver/arm_diags_driver.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def _run_diag_diurnal_cycle(parameter: ARMDiagsParameter) -> ARMDiagsParameter:
149149
parameter.var_name = ds_test[var].long_name
150150
parameter.var_units = ds_test[var].units
151151

152-
arm_diags_plot.plot_diurnal_cycle(var, vars_to_data[season], parameter)
152+
arm_diags_plot._plot_diurnal_cycle(parameter, vars_to_data[season])
153153

154154
return parameter
155155

@@ -238,9 +238,7 @@ def _run_diag_diurnal_cycle_zt(parameter: ARMDiagsParameter) -> ARMDiagsParamete
238238
parameter.var_name = ds_test[var].long_name
239239
parameter.var_units = ds_test[var].units
240240

241-
arm_diags_plot.plot_diurnal_cycle_zt(
242-
var, vars_to_data[season], parameter
243-
)
241+
arm_diags_plot._plot_diurnal_cycle_zt(parameter, vars_to_data[season])
244242

245243
return parameter
246244

@@ -325,7 +323,7 @@ def _run_diag_annual_cycle(parameter: ARMDiagsParameter) -> ARMDiagsParameter:
325323
parameter.var_units = da_test.units
326324

327325
if season == "ANNUALCYCLE":
328-
arm_diags_plot.plot_annual_cycle(var, vars_to_data[season], parameter)
326+
arm_diags_plot._plot_annual_cycle(parameter, var, vars_to_data[season])
329327

330328
return parameter
331329

@@ -380,8 +378,8 @@ def _run_diag_convection_onset(parameter: ARMDiagsParameter) -> ARMDiagsParamete
380378
time_coords = xc.get_dim_coords(ds_test_pr, axis="T")
381379
parameter.time_interval = int(time_coords[1].dt.hour - time_coords[0].dt.hour)
382380

383-
arm_diags_plot.plot_convection_onset_statistics(
384-
test_pr, test_prw, ref_pr, ref_prw, parameter, region
381+
arm_diags_plot._plot_convection_onset_statistics(
382+
parameter, region, test_pr, test_prw, ref_pr, ref_prw
385383
)
386384

387385
return parameter
@@ -437,8 +435,8 @@ def _run_diag_aerosol_activation(parameter: ARMDiagsParameter) -> ARMDiagsParame
437435
parameter.output_file = "-".join(
438436
[ref_name, "aerosol-activation", region, variable]
439437
)
440-
arm_diags_plot.plot_aerosol_activation(
441-
test_a_num, test_ccn, ref_a_num, ref_ccn, parameter, region, variable
438+
arm_diags_plot._plot_aerosol_activation(
439+
parameter, region, variable, test_a_num, test_ccn, ref_a_num, ref_ccn
442440
)
443441

444442
return parameter

0 commit comments

Comments
 (0)