Skip to content

Commit 41cca80

Browse files
committed
Change ahmanalysis to use ensemble.load_scalars()
1 parent cdc0b3c commit 41cca80

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

src/semeio/workflows/ahm_analysis/ahmanalysis.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,10 @@ 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+
prior_data.columns.name = None
185+
prior_data.index.name = "Realization"
186+
prior_data = prior_data.sort_index(axis=1)
184187
try:
185188
raise_if_empty(
186189
dataframes=[
@@ -194,7 +197,7 @@ def _replace(s: str) -> str:
194197
)
195198
except KeyError as err:
196199
raise ValidationError(f"Empty prior ensemble: {err}") from err
197-
200+
prior_data = prior_data.set_index("realization")
198201
ahmanalysis_reports_dir = Path(reports_dir) / "AhmAnalysisJob"
199202
os.makedirs(ahmanalysis_reports_dir, exist_ok=True)
200203

@@ -272,11 +275,16 @@ def _replace(s: str) -> str:
272275
logger.error(f"Analysis failed for: {observations}")
273276
del obs_group_to_obs_keys[obs_group]
274277
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"
278+
279+
ensemble_data = (
280+
target_ensemble.load_scalars().to_pandas().set_index("realization")
278281
)
282+
ensemble_data.columns.name = None
283+
ensemble_data.index.name = "Realization"
284+
ensemble_data = ensemble_data.sort_index(axis=1)
285+
# Get the updated scalar parameter distributions
279286

287+
ensemble_data.to_csv(ahmanalysis_reports_dir / f"{obs_group}.csv")
280288
active_obs.at["ratio", obs_group] = (
281289
str(count_active_observations(df_update_log))
282290
+ " active/"
@@ -297,7 +305,7 @@ def _replace(s: str) -> str:
297305
calc_kolmogorov_smirnov(
298306
dkeysf,
299307
prior_data,
300-
target_ensemble.load_all_gen_kw_data(),
308+
ensemble_data,
301309
)
302310
)
303311
kolmogorov_smirnov_data.set_index("Parameters", inplace=True)

0 commit comments

Comments
 (0)