Refactor Slurm error-handling

yngve-sk · Sep 10, 2024 · e0e9d97 · e0e9d97
1 parent c020e8c
commit e0e9d97
Showing 1 changed file with 13 additions and 20 deletions.
diff --git a/src/ert/config/queue_config.py b/src/ert/config/queue_config.py
@@ -328,26 +328,19 @@ def from_dict(cls, config_dict: ConfigDict) -> QueueConfig:
                     "MEMORY_PER_JOB",
                     selected_queue_system == QueueSystem.TORQUE,
                 )
-            if (
-                isinstance(_queue_vals, SlurmQueueOptions)
-                and _queue_vals.memory
-                and realization_memory
-            ):
-                _throw_error_or_warning(
-                    "Do not specify both REALIZATION_MEMORY and SLURM option MEMORY",
-                    "MEMORY",
-                    selected_queue_system == QueueSystem.SLURM,
-                )
-            if (
-                isinstance(_queue_vals, SlurmQueueOptions)
-                and _queue_vals.memory_per_cpu
-                and realization_memory
-            ):
-                _throw_error_or_warning(
-                    "Do not specify both REALIZATION_MEMORY and SLURM option MEMORY_PER_CPU",
-                    "MEMORY_PER_CPU",
-                    selected_queue_system == QueueSystem.SLURM,
-                )
+            if isinstance(_queue_vals, SlurmQueueOptions) and realization_memory:
+                if _queue_vals.memory:
+                    _throw_error_or_warning(
+                        "Do not specify both REALIZATION_MEMORY and SLURM option MEMORY",
+                        "MEMORY",
+                        selected_queue_system == QueueSystem.SLURM,
+                    )
+                if _queue_vals.memory_per_cpu:
+                    _throw_error_or_warning(
+                        "Do not specify both REALIZATION_MEMORY and SLURM option MEMORY_PER_CPU",
+                        "MEMORY_PER_CPU",
+                        selected_queue_system == QueueSystem.SLURM,
+                    )
 
         return QueueConfig(
             job_script,