diff --git a/src/ert/job_queue/__init__.py b/src/ert/job_queue/__init__.py index 895174bf70b..19b942ae2d3 100644 --- a/src/ert/job_queue/__init__.py +++ b/src/ert/job_queue/__init__.py @@ -83,20 +83,10 @@ def __init__(self, prototype: str, bind: bool = True) -> None: super().__init__(ResPrototype.lib, prototype, bind=bind) -RES_LIB = ResPrototype.lib - from ecl.util.util import updateAbortSignals # noqa updateAbortSignals() - -def root() -> str: - """ - Will print the filesystem root of the current ert package. - """ - return os.path.abspath(os.path.join(os.path.dirname(__file__), "../")) - - from .driver import Driver # noqa from .job_queue_manager import JobQueueManager # noqa from .job_queue_node import JobQueueNode # noqa diff --git a/src/ert/job_queue/queue.py b/src/ert/job_queue/queue.py index 64bdb34c750..4b6ee5f1638 100644 --- a/src/ert/job_queue/queue.py +++ b/src/ert/job_queue/queue.py @@ -111,7 +111,6 @@ def __init__(self, driver: "Driver", max_submit: int = 2): self.driver = driver self._differ = QueueDiffer() - self._max_job_duration = 0 self._max_submit = max_submit def get_max_running(self) -> int: @@ -120,9 +119,6 @@ def get_max_running(self) -> int: def set_max_running(self, max_running: int) -> None: self.driver.set_max_running(max_running) - def set_max_job_duration(self, max_duration: int) -> None: - self._max_job_duration = max_duration - @property def max_submit(self) -> int: return self._max_submit @@ -459,10 +455,6 @@ def snapshot(self) -> Optional[Dict[int, str]]: """Return the whole state, or None if there was no snapshot.""" return self._differ.snapshot() - def changes_after_transition(self) -> Dict[int, str]: - old_state, new_state = self._differ.transition(self.job_list) - return self._differ.diff_states(old_state, new_state) - def changes_without_transition(self) -> Tuple[Dict[int, str], List[JobStatus]]: old_state, new_state = self._differ.get_old_and_new_state(self.job_list) return self._differ.diff_states(old_state, new_state), new_state diff --git a/src/ert/simulator/simulation_context.py b/src/ert/simulator/simulation_context.py index a4be80dc8d0..422428b79be 100644 --- a/src/ert/simulator/simulation_context.py +++ b/src/ert/simulator/simulation_context.py @@ -97,14 +97,12 @@ def __init__( # pylint: disable=too-many-arguments case_data: List[Tuple[Any, Any]], ): self._ert = ert - max_runtime = ert.analysisConfig().max_runtime self._mask = mask job_queue = JobQueue( Driver.create_driver(ert.get_queue_config()), max_submit=ert.get_queue_config().max_submit, ) - job_queue.set_max_job_duration(max_runtime or 0) self._queue_manager = JobQueueManager(job_queue) # fill in the missing geo_id data global_substitutions = ert.get_context()