fixup simulator fm special casing

Author: Yngve S. Kristiansen

src/ert/run_models/everest_run_model.py

@@ -39,6 +39,7 @@
 )
 from ert.config.ert_config import (
     create_and_hook_workflows,
+    forward_model_step_from_config_contents,
     read_templates,
     uppercase_subkeys_and_stringify_subvalues,
     workflow_jobs_from_dict,
@@ -296,12 +297,19 @@ def create(
 
         user_installed_fm_steps = {}
         for job in everest_config.install_jobs:
-            executable = Path(job.executable)
-            if not executable.is_absolute():
-                executable = everest_config.config_directory / executable
-            user_installed_fm_steps[job.name] = ForwardModelStep(
-                name=job.name, executable=str(executable)
-            )
+            if job.executable is not None:
+                executable = Path(job.executable)
+                if not executable.is_absolute():
+                    executable = everest_config.config_directory / executable
+                user_installed_fm_steps[job.name] = ForwardModelStep(
+                    name=job.name, executable=str(executable)
+                )
+            elif job.source is not None:
+                return forward_model_step_from_config_contents(
+                    config_contents=Path(job.source).read_text(encoding="utf-8"),
+                    config_file=job.source,
+                    name=job.name,
+                )
 
         site_installed_fm_steps = (
             runtime_plugins.installed_forward_model_steps
@@ -364,6 +372,17 @@ def create(
 
         for fm_spec in everest_config.forward_model:
             fm_name, *arglist = fm_spec.job.split()
+            match fm_name:
+                # All three reservoir simulator fm_steps map to
+                # "run_reservoirsimulator" which requires the simulator name
+                # as its first argument.
+                case "eclipse100":
+                    arglist = ["eclipse", *arglist]
+                case "eclipse300":
+                    arglist = ["e300", *arglist]
+                case "flow":
+                    arglist = ["flow", *arglist]
+
             fm_cls = installed_fm_steps.get(fm_name)
             fm_instance = copy.deepcopy(fm_cls)
             fm_instance.arglist = arglist
@@ -374,7 +393,12 @@ def create(
         )
 
         # tmpy tmpy
-        assert forward_model_steps == forward_model_steps_old
+        mismatch_fmsteps = [
+            i
+            for i in range(len(forward_model_steps))
+            if str(forward_model_steps[i]) != str(forward_model_steps_old[i])
+        ]
+        assert not mismatch_fmsteps
         assert env_pr_fm_step == env_pr_fm_step_old
 
         env_vars = {}

src/everest/config/install_job_config.py

@@ -1,12 +1,9 @@
 from __future__ import annotations
 
-from pathlib import Path
 from textwrap import dedent
 
 from pydantic import BaseModel, Field, model_validator
 
-from ert.config import ForwardModelStep, forward_model_step_from_config_contents
-
 
 class InstallJobConfig(BaseModel, extra="forbid"):
     name: str = Field(
@@ -38,18 +35,6 @@ class InstallJobConfig(BaseModel, extra="forbid"):
         ),
     )
 
-    def to_forward_model_step(self) -> ForwardModelStep:
-        if self.executable is not None:
-            return ForwardModelStep(
-                name=self.name, executable=str(Path(self.executable).absolute())
-            )
-        elif self.source is not None:
-            return forward_model_step_from_config_contents(
-                config_contents=Path(self.source).read_text(encoding="utf-8"),
-                config_file=self.source,
-                name=self.name,
-            )
-
     @model_validator(mode="after")
     def validate_source_and_executable(self) -> InstallJobConfig:
         if self.source is None and self.executable is None:

tests/everest/test_logging.py

@@ -18,7 +18,7 @@
 @pytest.mark.timeout(240)  # Simulation might not finish
 @pytest.mark.integration_test
 @pytest.mark.xdist_group(name="starts_everest")
-@pytest.mark.usefixtures("no_plugins")
+@pytest.mark.usefixtures("use_site_configurations_with_no_queue_options")
 def test_logging_setup(copy_math_func_test_data_to_tmp):
     # Ensure no interference with plugins which may set queue system
     config_file = "config_minimal.yml"