Remove duplicate eclbase

equinor · Oct 22, 2024 · 12ffdba · 12ffdba
1 parent 67e1ffc
commit 12ffdba
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/src/ert/config/ensemble_config.py b/src/ert/config/ensemble_config.py
@@ -52,7 +52,6 @@ class EnsembleConfig:
     response_configs: Dict[str, ResponseConfig] = field(default_factory=dict)
     parameter_configs: Dict[str, ParameterConfig] = field(default_factory=dict)
     refcase: Optional[Refcase] = None
-    eclbase: Optional[str] = None
 
     def __post_init__(self) -> None:
         self._check_for_duplicate_names(
@@ -121,17 +120,13 @@ def make_field(field_list: List[str]) -> Field:
                 response_configs.append(instance)
 
         refcase = Refcase.from_config_dict(config_dict)
-        eclbase = config_dict.get("ECLBASE")
-        if eclbase is not None:
-            eclbase = eclbase.replace("%d", "<IENS>")
 
         return cls(
             grid_file=grid_file_path,
             response_configs={response.name: response for response in response_configs},
             parameter_configs={
                 parameter.name: parameter for parameter in parameter_configs
             },
-            eclbase=eclbase,
             refcase=refcase,
         )
 

diff --git a/src/ert/libres_facade.py b/src/ert/libres_facade.py
@@ -141,7 +141,7 @@ def load_from_forward_model(
                 runpath_format=self.config.model_config.runpath_format_string,
                 filename=str(self.config.runpath_file),
                 substitution_list=self.config.substitution_list,
-                eclbase=self.config.ensemble_config.eclbase,
+                eclbase=self.config.model_config.eclbase_format_string,
             ),
             realisations,
             ensemble=ensemble,

diff --git a/src/ert/plugins/hook_implementations/workflows/export_runpath.py b/src/ert/plugins/hook_implementations/workflows/export_runpath.py
@@ -40,7 +40,7 @@ def run(self, ert_config: ErtConfig, workflow_args: List[Any]) -> None:
             runpath_format=ert_config.model_config.runpath_format_string,
             filename=str(ert_config.runpath_file),
             substitution_list=ert_config.substitution_list,
-            eclbase=ert_config.ensemble_config.eclbase,
+            eclbase=ert_config.model_config.eclbase_format_string,
         )
         run_paths.write_runpath_list(
             *self.get_ranges(

diff --git a/src/ert/run_models/base_run_model.py b/src/ert/run_models/base_run_model.py
@@ -178,7 +178,7 @@ def __init__(
             runpath_format=config.model_config.runpath_format_string,
             filename=str(config.runpath_file),
             substitution_list=self.substitution_list,
-            eclbase=config.ensemble_config.eclbase,
+            eclbase=config.model_config.eclbase_format_string,
         )
         self._iter_snapshot: Dict[int, EnsembleSnapshot] = {}
         self._status_queue = status_queue

diff --git a/src/ert/simulator/batch_simulator_context.py b/src/ert/simulator/batch_simulator_context.py
@@ -139,7 +139,7 @@ def __post_init__(self) -> None:
             runpath_format=ert_config.model_config.runpath_format_string,
             filename=str(ert_config.runpath_file),
             substitution_list=global_substitutions,
-            eclbase=ert_config.ensemble_config.eclbase,
+            eclbase=ert_config.model_config.eclbase_format_string,
         )
         self.run_args = create_run_arguments(
             run_paths,