Make everest pass flowbase as eclbase to ert

Author: yngve-sk

src/everest/config/everest_config.py

@@ -231,6 +231,20 @@ class EverestConfig(BaseModel):
     config_path: Path = Field()
     model_config = ConfigDict(extra="forbid", frozen=True)
 
+    @model_validator(mode="after")
+    def validate_eclbase_flowbase(self) -> Self:  # pylint: disable=E0213
+        if self.definitions is None:
+            return self
+
+        if "eclbase" in self.definitions and "flowbase" in self.definitions:
+            raise ValueError(
+                "Found both eclbase and flowbase in definitions config. "
+                "Please use only one to point to the directory containing "
+                "reservoir simulator files."
+            )
+
+        return self
+
     @model_validator(mode="after")
     def validate_queue_system(self) -> Self:  # pylint: disable=E0213
         assert self.server is not None

src/everest/simulator/everest_to_ert.py

@@ -172,12 +172,8 @@ def inject_default(key: str, value: Any) -> None:
         if key not in ert_config:
             ert_config[key] = value
 
-    inject_default(
-        "ECLBASE",
-        (ever_config.definitions if ever_config.definitions is not None else {}).get(
-            "eclbase", "eclipse/ECL"
-        ),
-    )
+    defs = ever_config.definitions if ever_config.definitions is not None else {}
+    inject_default("ECLBASE", defs.get("eclbase", defs.get("flowbase", "eclipse/ECL")))
 
 
 def _extract_simulator(ever_config: EverestConfig, ert_config: dict[str, Any]) -> None:

tests/everest/test_config_validation.py

@@ -1186,3 +1186,10 @@ def test_export_deprecated_keys(key, value, min_config, change_to_tmpdir):
     )
     with pytest.warns(ConfigWarning, match=match_msg):
         EverestConfig.load_file_with_argparser("config.yml", parser)
+
+
+def test_that_definitions_eclbase_flowbase_are_mutually_exclusive():
+    with pytest.raises(
+        ValueError, match="Found both eclbase and flowbase in definitions config"
+    ):
+        EverestConfig.with_defaults(definitions={"eclbase": "heh", "flowbase": "hah"})

tests/everest/test_res_initialization.py

@@ -391,6 +391,13 @@ def test_user_config_jobs_precedence(tmp_path, monkeypatch):
     assert installed_forward_model_steps_new.get(existing_job).executable == "echo"
 
 
+def test_that_definitions_passthrough_flowbase():
+    ever_config = EverestConfig.with_defaults(definitions={"flowbase": "blargh"})
+
+    ert_config_dict = everest_to_ert_config_dict(ever_config)
+    assert ert_config_dict["ECLBASE"] == "blargh"
+
+
 def test_that_definitions_passthrough_eclbase():
     ever_config = EverestConfig.with_defaults(definitions={"eclbase": "blorgh"})