Use ensemble evaluator in everest in place of BatchSimulator

* Use ensemble evaluator in everest in place of BatchSimulator * Fix test_simulator_cache Co-authored-by: Peter Verveer <[email protected]>
equinor · Dec 2, 2024 · b5a1805 · b5a1805
1 parent 0d1430e
commit b5a1805
Show file tree

Hide file tree

Showing 26 changed files with 565 additions and 2,069 deletions.
diff --git a/src/ert/__init__.py b/src/ert/__init__.py
@@ -15,22 +15,18 @@
 )
 from .data import MeasuredData
 from .libres_facade import LibresFacade
-from .simulator import BatchSimulator, BatchContext, JobStatus
 from .workflow_runner import WorkflowRunner
 from .plugins import plugin
 from .scheduler import JobState
 
 __all__ = [
-    "BatchContext",
-    "BatchSimulator",
     "ErtScript",
     "ForwardModelStepDocumentation",
     "ForwardModelStepJSON",
     "ForwardModelStepPlugin",
     "ForwardModelStepValidationError",
     "ForwardModelStepWarning",
     "JobState",
-    "JobStatus",
     "LibresFacade",
     "MeasuredData",
     "WorkflowRunner",

diff --git a/src/ert/run_models/base_run_model.py b/src/ert/run_models/base_run_model.py
@@ -413,6 +413,12 @@ def _get_number_of_finished_realizations_from_reruns(self) -> int:
             False
         ) - self._initial_realizations_mask.count(False)
 
+    def get_current_snapshot(self) -> EnsembleSnapshot:
+        if self._iter_snapshot.keys():
+            current_iter = max(list(self._iter_snapshot.keys()))
+            return self._iter_snapshot[current_iter]
+        return EnsembleSnapshot()
+
     def get_memory_consumption(self) -> int:
         max_memory_consumption: int = 0
         if self._iter_snapshot.keys():