Sync with main

Author: xjules

src/ert/config/ert_config.py

@@ -36,7 +36,6 @@
     ForwardModelStepPlugin,
     ForwardModelStepValidationError,
 )
-from .gen_kw_config import GenKwConfig
 from .model_config import ModelConfig
 from .observation_vector import ObsVector
 from .observations import EnkfObs
@@ -57,19 +56,16 @@
     parse_contents,
     read_file,
 )
-from .parsing import (
-    parse as parse_config,
-)
+from .parsing import parse as parse_config
 from .parsing.observations_parser import (
     GenObsValues,
     HistoryValues,
     ObservationConfigError,
     SummaryValues,
 )
-from .parsing.observations_parser import (
-    parse as parse_observations,
-)
+from .parsing.observations_parser import parse as parse_observations
 from .queue_config import QueueConfig
+from .scalar_parameter import ScalarParameters
 from .workflow import Workflow
 from .workflow_job import ErtScriptLoadFailure, WorkflowJob
 
@@ -849,17 +845,14 @@ def from_dict(cls, config_dict) -> Self:
             raise ConfigValidationError.from_collected(errors)
 
         if dm := analysis_config.design_matrix:
-            dm_params = [
-                x.name
-                for x in dm.parameter_configuration.transform_function_definitions
-            ]
+            dm_params = [x.param_name for x in dm.scalars]
             for group_name, config in ensemble_config.parameter_configs.items():
                 overlapping = []
-                if not isinstance(config, GenKwConfig):
+                if not isinstance(config, ScalarParameters):
                     continue
-                for transform_definition in config.transform_function_definitions:
-                    if transform_definition.name in dm_params:
-                        overlapping.append(transform_definition.name)
+                for param in config.scalars:
+                    if param.param_name in dm_params:
+                        overlapping.append(param.param_name)
                 if overlapping:
                     ConfigWarning.warn(
                         f"Parameters {overlapping} from GEN_KW group '{group_name}' "

src/ert/config/scalar_parameter.py

@@ -367,7 +367,7 @@ def sample_or_load(
             )
             params["realization"] = real
             if design_matrix_df is not None:
-                row = design_matrix_df.loc[real]["DESIGN_MATRIX"]
+                row = design_matrix_df.loc[real]
                 for parameter in self.scalars:
                     if parameter.input_source == DataSource.DESIGN_MATRIX:
                         value = row[parameter.param_name]

src/ert/run_models/ensemble_experiment.py

@@ -102,7 +102,6 @@ def run_experiment(
                 else:
                     parameters_config.append(param)
             self._parameter_configuration = parameters_config
-        parameters_config = self._parameter_configuration
         if not restart:
             self.run_workflows(
                 HookRuntime.PRE_EXPERIMENT,

src/ert/run_models/multiple_data_assimilation.py

@@ -8,9 +8,16 @@
 
 import numpy as np
 
-from ert.config import ErtConfig, ESSettings, HookRuntime, UpdateSettings
+from ert.config import (
+    ErtConfig,
+    ESSettings,
+    HookRuntime,
+    ParameterConfig,
+    ScalarParameters,
+    UpdateSettings,
+)
 from ert.config.parsing.config_errors import ConfigValidationError
-from ert.enkf_main import sample_prior, save_design_matrix_to_ensemble
+from ert.enkf_main import sample_prior
 from ert.ensemble_evaluator import EvaluatorServerConfig
 from ert.storage import Ensemble, Storage
 from ert.trace import tracer
@@ -103,14 +110,21 @@ def run_experiment(
 
         parameters_config = self._parameter_configuration
         design_matrix = self._design_matrix
-        design_matrix_group = None
+        parameters_config: list[ParameterConfig] = []
+        design_matrix = self._design_matrix
         if design_matrix is not None:
-            try:
-                parameters_config, design_matrix_group = (
-                    design_matrix.merge_with_existing_parameters(parameters_config)
-                )
-            except ConfigValidationError as exc:
-                raise ErtRunError(str(exc)) from exc
+            for param in self._parameter_configuration:
+                if isinstance(param, ScalarParameters):
+                    try:
+                        new_scalar_config = (
+                            design_matrix.merge_with_existing_parameters(param)
+                        )
+                        parameters_config.append(new_scalar_config)
+                    except ConfigValidationError as exc:
+                        raise ErtRunError(str(exc)) from exc
+                else:
+                    parameters_config.append(param)
+            self._parameter_configuration = parameters_config
 
         self.restart = restart
         if self.restart_run:
@@ -138,8 +152,7 @@ def run_experiment(
             )
             sim_args = {"weights": self._relative_weights}
             experiment = self._storage.create_experiment(
-                parameters=parameters_config
-                + ([design_matrix_group] if design_matrix_group else []),
+                parameters=parameters_config,
                 observations=self._observations,
                 responses=self._response_configuration,
                 simulation_arguments=sim_args,
@@ -164,15 +177,13 @@ def run_experiment(
                 prior,
                 np.where(self.active_realizations)[0],
                 random_seed=self.random_seed,
+                design_matrix_df=(
+                    design_matrix.design_matrix_df
+                    if design_matrix is not None
+                    else None
+                ),
             )
 
-            if design_matrix_group is not None and design_matrix is not None:
-                save_design_matrix_to_ensemble(
-                    design_matrix.design_matrix_df,
-                    prior,
-                    np.where(self.active_realizations)[0],
-                    design_matrix_group.name,
-                )
             self._evaluate_and_postprocess(
                 prior_args,
                 prior,