Skip to content

Commit e6cf105

Browse files
committed
Change ahmanalysis to use ensemble.load_scalars()
1 parent 7880b65 commit e6cf105

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

src/semeio/workflows/ahm_analysis/ahmanalysis.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ def _replace(s: str) -> str:
180180
if target_name == "<ANALYSIS_CASE_NAME>":
181181
target_name = "analysis_case"
182182

183-
prior_data = prior_ensemble.load_all_gen_kw_data()
183+
prior_data = prior_ensemble.load_scalars().to_pandas()
184+
184185
try:
185186
raise_if_empty(
186187
dataframes=[
@@ -194,7 +195,10 @@ def _replace(s: str) -> str:
194195
)
195196
except KeyError as err:
196197
raise ValidationError(f"Empty prior ensemble: {err}") from err
197-
198+
prior_data.columns.name = None
199+
prior_data.index.name = "Realization"
200+
prior_data = prior_data.sort_index(axis=1)
201+
prior_data = prior_data.set_index("realization")
198202
ahmanalysis_reports_dir = Path(reports_dir) / "AhmAnalysisJob"
199203
os.makedirs(ahmanalysis_reports_dir, exist_ok=True)
200204

@@ -272,11 +276,16 @@ def _replace(s: str) -> str:
272276
logger.error(f"Analysis failed for: {observations}")
273277
del obs_group_to_obs_keys[obs_group]
274278
continue
275-
# Get the updated scalar parameter distributions
276-
target_ensemble.load_all_gen_kw_data().to_csv(
277-
ahmanalysis_reports_dir / f"{obs_group}.csv"
279+
280+
ensemble_data = (
281+
target_ensemble.load_scalars().to_pandas().set_index("realization")
278282
)
283+
ensemble_data.columns.name = None
284+
ensemble_data.index.name = "Realization"
285+
ensemble_data = ensemble_data.sort_index(axis=1)
286+
# Get the updated scalar parameter distributions
279287

288+
ensemble_data.to_csv(ahmanalysis_reports_dir / f"{obs_group}.csv")
280289
active_obs.at["ratio", obs_group] = (
281290
str(count_active_observations(df_update_log))
282291
+ " active/"
@@ -297,7 +306,7 @@ def _replace(s: str) -> str:
297306
calc_kolmogorov_smirnov(
298307
dkeysf,
299308
prior_data,
300-
target_ensemble.load_all_gen_kw_data(),
309+
ensemble_data,
301310
)
302311
)
303312
kolmogorov_smirnov_data.set_index("Parameters", inplace=True)

0 commit comments

Comments
 (0)