Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/semeio/workflows/ahm_analysis/ahmanalysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ def _replace(s: str) -> str:
if target_name == "<ANALYSIS_CASE_NAME>":
target_name = "analysis_case"

prior_data = prior_ensemble.load_all_gen_kw_data()
prior_data = prior_ensemble.load_scalars().to_pandas()

try:
raise_if_empty(
dataframes=[
Expand All @@ -194,7 +195,10 @@ def _replace(s: str) -> str:
)
except KeyError as err:
raise ValidationError(f"Empty prior ensemble: {err}") from err

prior_data.columns.name = None
prior_data.index.name = "Realization"
prior_data = prior_data.sort_index(axis=1)
prior_data = prior_data.set_index("realization")
Comment on lines +198 to +201

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the logic that differed between load_scalarsand load_all_gen_kw_data. In the first round, we will just move it here, but the next one should rewrite this to polars instead of keeping pandas.

ahmanalysis_reports_dir = Path(reports_dir) / "AhmAnalysisJob"
os.makedirs(ahmanalysis_reports_dir, exist_ok=True)

Expand Down Expand Up @@ -272,11 +276,16 @@ def _replace(s: str) -> str:
logger.error(f"Analysis failed for: {observations}")
del obs_group_to_obs_keys[obs_group]
continue
# Get the updated scalar parameter distributions
target_ensemble.load_all_gen_kw_data().to_csv(
ahmanalysis_reports_dir / f"{obs_group}.csv"

ensemble_data = (
target_ensemble.load_scalars().to_pandas().set_index("realization")
)
ensemble_data.columns.name = None
ensemble_data.index.name = "Realization"
ensemble_data = ensemble_data.sort_index(axis=1)
# Get the updated scalar parameter distributions

ensemble_data.to_csv(ahmanalysis_reports_dir / f"{obs_group}.csv")
active_obs.at["ratio", obs_group] = (
str(count_active_observations(df_update_log))
+ " active/"
Expand All @@ -297,7 +306,7 @@ def _replace(s: str) -> str:
calc_kolmogorov_smirnov(
dkeysf,
prior_data,
target_ensemble.load_all_gen_kw_data(),
ensemble_data,
)
)
kolmogorov_smirnov_data.set_index("Parameters", inplace=True)
Expand Down
Loading