From 9ae400cda12326eac03ebe4ad41fb63c6f1289a3 Mon Sep 17 00:00:00 2001 From: "Yngve S. Kristiansen" Date: Mon, 28 Oct 2024 09:40:37 +0100 Subject: [PATCH] HAS_DATA -> RESPONSES_LOADED --- src/ert/storage/local_ensemble.py | 8 ++++---- src/ert/storage/realization_storage_state.py | 2 +- tests/ert/unit_tests/storage/test_local_storage.py | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/ert/storage/local_ensemble.py b/src/ert/storage/local_ensemble.py index 91734c5e13b..672fa790d68 100644 --- a/src/ert/storage/local_ensemble.py +++ b/src/ert/storage/local_ensemble.py @@ -226,7 +226,7 @@ def get_realization_mask_with_parameters(self) -> npt.NDArray[np.bool_]: bool( { RealizationStorageState.PARAMETERS_LOADED, - RealizationStorageState.HAS_DATA, + RealizationStorageState.RESPONSES_LOADED, }.intersection(state) ) for state in self.get_ensemble_state() @@ -252,7 +252,7 @@ def get_realization_mask_with_responses( return np.array( [ - RealizationStorageState.HAS_DATA in state + RealizationStorageState.RESPONSES_LOADED in state for state in self.get_ensemble_state() ] ) @@ -512,7 +512,7 @@ def _find_state(realization: int) -> Set[RealizationStorageState]: assert failure _state.add(failure.type) if _responses_exist_for_realization(realization): - _state.add(RealizationStorageState.HAS_DATA) + _state.add(RealizationStorageState.RESPONSES_LOADED) if _parameters_exist_for_realization(realization): _state.add(RealizationStorageState.PARAMETERS_LOADED) @@ -906,7 +906,7 @@ def get_response_state( ) -> Dict[str, RealizationStorageState]: path = self._realization_dir(realization) return { - e: RealizationStorageState.HAS_DATA + e: RealizationStorageState.RESPONSES_LOADED if (path / f"{e}.parquet").exists() else RealizationStorageState.UNDEFINED for e in self.experiment.response_configuration diff --git a/src/ert/storage/realization_storage_state.py b/src/ert/storage/realization_storage_state.py index 0819b517384..af56fbd07e3 100644 --- a/src/ert/storage/realization_storage_state.py +++ b/src/ert/storage/realization_storage_state.py @@ -4,6 +4,6 @@ class RealizationStorageState(Enum): UNDEFINED = 1 PARAMETERS_LOADED = 2 - HAS_DATA = 4 + RESPONSES_LOADED = 4 LOAD_FAILURE = 8 PARENT_FAILURE = 16 diff --git a/tests/ert/unit_tests/storage/test_local_storage.py b/tests/ert/unit_tests/storage/test_local_storage.py index 01e5d2f1a6c..ef782f8f275 100644 --- a/tests/ert/unit_tests/storage/test_local_storage.py +++ b/tests/ert/unit_tests/storage/test_local_storage.py @@ -413,7 +413,8 @@ def test_ensemble_no_parameters(storage): name="prior", ) assert all( - RealizationStorageState.HAS_DATA in s for s in ensemble.get_ensemble_state() + RealizationStorageState.RESPONSES_LOADED in s + for s in ensemble.get_ensemble_state() ) @@ -1005,7 +1006,9 @@ def create_ensemble_from_prior(self, prior: Ensemble): # If expecting no responses, i.e., it has empty .keys in all response # configs, it will be a HAS_DATA even if no responses were ever saved if not is_expecting_responses: - assert RealizationStorageState.HAS_DATA in edited_posterior_state + assert ( + RealizationStorageState.RESPONSES_LOADED in edited_posterior_state + ) else: assert self.iens_to_edit not in prior.failure_messages assert RealizationStorageState.UNDEFINED in edited_posterior_state