Skip to content

Commit

Permalink
Get measured data using active realizations (#6188)
Browse files Browse the repository at this point in the history
* Get measured data using active realizations

This bug caused misfit_preprocessor to fail on cases
with failed realizations.

(cherry picked from commit 0b8b74a)

* Test that measured data work with failed reals

This caused the misfit preprocessor to fail when run
on cases that have failed realizations.

(cherry picked from commit b756eba)
  • Loading branch information
dafeda authored Sep 27, 2023
1 parent 33178ef commit 866a308
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/ert/data/_measured_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import numpy as np
import pandas as pd

from ert.realization_state import RealizationState

if TYPE_CHECKING:
import numpy.typing as npt

Expand Down Expand Up @@ -103,10 +105,13 @@ def _get_data(
group, obs = observations.get_dataset(key)
try:
response = ensemble.load_response(
group, tuple(range(self._facade.get_ensemble_size()))
group, tuple(ensemble.realization_list(RealizationState.HAS_DATA))
)
except KeyError:
raise ResponseError(f"No response loaded for observation key: {key}")
_msg = f"No response loaded for observation key: {key}"
if not response:
raise ResponseError(_msg)
except KeyError as e:
raise ResponseError(_msg) from e
ds = obs.merge(
response,
join="left",
Expand Down
4 changes: 4 additions & 0 deletions tests/unit_tests/gui/test_full_manual_update_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from qtpy.QtCore import Qt, QTimer
from qtpy.QtWidgets import QApplication, QComboBox, QMessageBox, QPushButton, QWidget

from ert.data import MeasuredData
from ert.gui.ertwidgets.caselist import CaseList
from ert.gui.simulation.ensemble_experiment_panel import EnsembleExperimentPanel
from ert.gui.simulation.run_dialog import RunDialog
Expand Down Expand Up @@ -129,6 +130,9 @@ def handle_dialog():
df_prior = facade.load_all_gen_kw_data(storage.get_ensemble_by_name("iter-0"))
df_posterior = facade.load_all_gen_kw_data(storage.get_ensemble_by_name("iter-1"))

# Making sure measured data works with failed realizations
MeasuredData(facade, storage.get_ensemble_by_name("iter-0"), ["POLY_OBS"])

# We expect that ERT's update step lowers the
# generalized variance for the parameters.
assert (
Expand Down

0 comments on commit 866a308

Please sign in to comment.