Skip to content

Commit

Permalink
Commitin
Browse files Browse the repository at this point in the history
  • Loading branch information
dafeda committed Aug 21, 2024
1 parent c04f722 commit 370383a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 9 deletions.
1 change: 1 addition & 0 deletions src/ert/storage/migration/block_fs.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ def migrate_case(storage: Storage, path: Path, stack: ExitStack) -> None:
parameters=parameter_configs,
responses=response_configs,
observations=ert_config.observations,
name="migrate-case",
)
ensemble = experiment.create_ensemble(
name=path.name,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ def test_surface_param_update(tmpdir):
"config.ert",
)
with open_storage(tmpdir / "storage") as storage:
prior = storage.get_ensemble_by_name("iter-0")
posterior = storage.get_ensemble_by_name("iter-1")
experiment = storage.get_experiment_by_name("es")
prior = experiment.get_ensemble_by_name("iter-0")
posterior = experiment.get_ensemble_by_name("iter-1")
prior_param = (
prior.load_parameters("MY_PARAM", range(5))["values"]
.values.reshape(5, 2 * 3)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ def test_exclude_parameter_from_update():
"poly.ert",
)
with open_storage("storage", "r") as storage:
experiment = storage.get_experiment_by_name("2024-08-21")
experiment = storage.get_experiment_by_name("es")
prior = experiment.get_ensemble_by_name("iter-0")
posterior = experiment.get_ensemble_by_name("iter-1")
assert prior.load_parameters(
Expand Down
7 changes: 4 additions & 3 deletions tests/unit_tests/gui/test_full_manual_update_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ def test_manual_analysis_workflow(ensemble_experiment_has_run, qtbot):
simulation_settings._ensemble_selector.setCurrentIndex(idx)

storage = gui.notifier.storage
ensemble_prior = storage.get_ensemble_by_name("iter-0")
experiment = storage.get_experiment_by_name("ensemble_experiment")
ensemble_prior = experiment.get_ensemble_by_name("iter-0")
active_reals = list(ensemble_prior.get_realization_mask_with_responses())
# Assert that some realizations failed
assert not all(active_reals)
Expand All @@ -92,11 +93,11 @@ def test_manual_analysis_workflow(ensemble_experiment_has_run, qtbot):
)

df_prior = ensemble_prior.load_all_gen_kw_data()
ensemble_posterior = storage.get_ensemble_by_name("iter-0_1")
ensemble_posterior = experiment.get_ensemble_by_name("iter-0_1")
df_posterior = ensemble_posterior.load_all_gen_kw_data()

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

# We expect that ERT's update step lowers the
# generalized variance for the parameters.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ def test_sensitivity_restart(open_gui, qtbot, run_experiment):
simulation_settings._ensemble_selector.setCurrentIndex(idx)

storage = gui.notifier.storage
ensemble_prior = storage.get_ensemble_by_name("iter-0")
experiment = storage.get_experiment_by_name("ensemble_experiment")
ensemble_prior = experiment.get_ensemble_by_name("iter-0")
success = ensemble_prior.get_realization_mask_without_failure()
# Assert that some realizations failed
assert not all(success)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ def test_migrate_case(data, storage, enspath):
with ExitStack() as stack:
bf.migrate_case(storage, enspath / "default", stack)

ensemble = storage.get_ensemble_by_name("default")
experiment = storage.get_experiment_by_name("migrate-case")
ensemble = experiment.get_ensemble_by_name("default")
for real_key, real_group in data.groups.items():
real_index = int(re.match(r"REAL_(\d+)", real_key)[1])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ def test_migrate_case(data, storage, tmp_path, enspath, ens_config, name, iter):
with ExitStack() as stack:
bf.migrate_case(storage, tmp_path / name, stack)

ensemble = storage.get_ensemble_by_name(name)
experiment = storage.get_experiment_by_name("migrate-case")
ensemble = experiment.get_ensemble_by_name(name)
assert ensemble.iteration == iter
for real_key, var in data.groups.items():
index = int(re.match(r"REAL_(\d+)", real_key)[1])
Expand Down

0 comments on commit 370383a

Please sign in to comment.