Save design matrix parameters in sample_prior

src/ert/config/design_matrix.py

@@ -81,7 +81,11 @@ def merge_with_existing_parameters(
             return
 
         new_param_config: List[ParameterConfig] = []
-        design_keys = self.parameter_configuration[DESIGN_MATRIX_GROUP].getKeyWords()
+        if isinstance(self.parameter_configuration[DESIGN_MATRIX_GROUP], GenKwConfig):
+            design_keys = self.parameter_configuration[
+                DESIGN_MATRIX_GROUP
+            ].getKeyWords()
+
         design_group_added = False
         for genkw_group in existing_parameters:
             if not isinstance(genkw_group, GenKwConfig):
@@ -161,7 +165,7 @@ def read_design_matrix(
             output_file=None,
             transform_function_definitions=transform_function_definitions,
             update=False,
-            disabled=True,
+            design_matrix=self,
         )
 
         design_matrix_df.columns = pd.MultiIndex.from_product(

src/ert/config/gen_kw_config.py

@@ -34,6 +34,8 @@
 
     from ert.storage import Ensemble
 
+    from .design_matrix import DesignMatrix
+
 _logger = logging.getLogger(__name__)
 
 
@@ -73,6 +75,7 @@ class GenKwConfig(ParameterConfig):
     transform_function_definitions: List[TransformFunctionDefinition]
     forward_init_file: Optional[str] = None
     disabled: Optional[bool] = False
+    design_matrix: Optional[DesignMatrix] = None
 
     def __post_init__(self) -> None:
         self.transform_functions: List[TransformFunction] = []

src/ert/enkf_main.py

@@ -190,7 +190,13 @@ def sample_prior(
         config_node = parameter_configs[parameter]
         if config_node.forward_init:
             continue
-        if isinstance(config_node, GenKwConfig) and config_node.disabled:
+        if (
+            isinstance(config_node, GenKwConfig)
+            and config_node.design_matrix is not None
+        ):
+            save_design_matrix_to_ensemble(
+                config_node.design_matrix, ensemble, active_realizations
+            )
             continue
 
         for realization_nr in active_realizations:

src/ert/run_models/ensemble_experiment.py

@@ -6,7 +6,7 @@
 
 import numpy as np
 
-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, Experiment, Storage
 
@@ -102,16 +102,7 @@ def run_experiment(
             np.array(self.active_realizations, dtype=bool),
             ensemble=self.ensemble,
         )
-        if (
-            self.ert_config.analysis_config.design_matrix is not None
-            and self.ert_config.analysis_config.design_matrix.design_matrix_df
-            is not None
-        ):
-            save_design_matrix_to_ensemble(
-                self.ert_config.analysis_config.design_matrix,
-                self.ensemble,
-                np.where(self.active_realizations)[0],
-            )
+
         sample_prior(
             self.ensemble,
             np.where(self.active_realizations)[0],

src/ert/storage/local_experiment.py

@@ -12,12 +12,7 @@
 import xtgeo
 from pydantic import BaseModel
 
-from ert.config import (
-    ExtParamConfig,
-    Field,
-    GenKwConfig,
-    SurfaceConfig,
-)
+from ert.config import ExtParamConfig, Field, GenKwConfig, SurfaceConfig
 from ert.config.parsing.context_values import ContextBoolEncoder
 from ert.config.response_config import ResponseConfig
 from ert.storage.mode import BaseMode, Mode, require_write