Skip to content

Commit 331dd91

Browse files
committed
Fix _annual_global_rmse
This was missed when #1746 was merged in.
1 parent 2c96dfd commit 331dd91

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

ext/land_sim_vis/leaderboard/rmse_boxplots.jl

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,23 @@ function _annual_global_rmse(
150150
data_source;
151151
spin_up_months = 12,
152152
)
153-
sim_var_dict = get_sim_var_dict(diagnostics_folder_path)
154-
obs_var_dict = get_obs_var_dict(data_source)
155-
mask_dict = get_mask_dict(data_source)
153+
sim_dir = ClimaAnalysis.SimDir(diagnostics_folder_path)
154+
data_loader =
155+
uppercase(data_source) == "ERA5" ? ERA5DataLoader() : ILAMBDataLoader()
156+
mask_dict = get_mask_dict(data_loader)
156157
available = ClimaAnalysis.available_vars(
157158
ClimaAnalysis.SimDir(diagnostics_folder_path),
158159
)
159-
(
160-
short_name in keys(sim_var_dict) &&
161-
short_name in keys(obs_var_dict) &&
162-
short_name in available
163-
) || return NaN
160+
(short_name in available_vars(data_loader) && short_name in available) ||
161+
return NaN
162+
163+
sim_var = get(sim_dir, short_name)
164+
obs_var = get(data_loader, short_name)
165+
166+
# Preprocess sim var to match conventions of data loaders
167+
sim_var = preprocess_sim_var(sim_var)
164168

165-
sim_var = sim_var_dict[short_name]()
166-
obs_var = obs_var_dict[short_name](sim_var.attributes["start_date"])
169+
ClimaAnalysis.set_reference_date!(obs_var, sim_var.attributes["start_date"])
167170

168171
spinup_cutoff = spin_up_months * 31 * 86400.0
169172
if ClimaAnalysis.times(sim_var)[end] >= spinup_cutoff

0 commit comments

Comments
 (0)