WIP more

Author: xjules

src/ert/config/__init__.py

@@ -34,6 +34,7 @@
 from .parsing.observations_parser import ObservationType
 from .queue_config import QueueConfig
 from .response_config import InvalidResponseFile, ResponseConfig
+from .scalar_parameter import ScalarParameter
 from .summary_config import SummaryConfig
 from .summary_observation import SummaryObservation
 from .surface_config import SurfaceConfig
@@ -76,6 +77,7 @@
     "QueueConfig",
     "QueueSystem",
     "ResponseConfig",
+    "ScalarParameter",
     "SummaryConfig",
     "SummaryObservation",
     "SurfaceConfig",

src/ert/config/ensemble_config.py

@@ -16,6 +16,7 @@
 from .parsing import ConfigDict, ConfigKeys, ConfigValidationError
 from .refcase import Refcase
 from .response_config import ResponseConfig
+from .scalar_parameter import ScalarParameter
 from .summary_config import SummaryConfig
 from .surface_config import SurfaceConfig
 
@@ -124,7 +125,8 @@ def make_field(field_list: list[str]) -> FieldConfig:
             return FieldConfig.from_config_list(grid_file_path, dims, field_list)
 
         parameter_configs = (
-            [GenKwConfig.from_config_list(g) for g in gen_kw_list]
+            ScalarParameter.from_config_list(g)
+            for g in gen_kw_list
             + [SurfaceConfig.from_config_list(s) for s in surface_list]
             + [make_field(f) for f in field_list]
         )

src/ert/config/scalar_parameter.py

@@ -4,7 +4,7 @@
 from dataclasses import dataclass
 from enum import StrEnum
 from pathlib import Path
-from typing import Any, Literal, Self, overload
+from typing import Any, Literal, overload
 
 import numpy as np
 from scipy.stats import norm
@@ -227,8 +227,23 @@ class ScalarParameter:
     input_source: DataSource
     # dataset_file: PolarsData | None
 
+    # return cls(
+    #     name=gen_kw_key,
+    #     forward_init=forward_init,
+    #     template_file=template_file,
+    #     output_file=output_file,
+    #     forward_init_file=init_file,
+    #     transform_function_definitions=transform_function_definitions,
+    #     update=update_parameter,
+    # )
+
+
+@dataclass
+class ScalarParameters:
+    scalar_params: dict[DataSource, list[ScalarParameter]]
+
     @classmethod
-    def from_config_list(cls, gen_kw: list[str]) -> list[Self]:
+    def from_config_list(cls, gen_kw: list[str]) -> list[ScalarParameter]:
         gen_kw_key = gen_kw[0]
 
         positional_args, options = parse_config(gen_kw, 4)
@@ -303,7 +318,7 @@ def from_config_list(cls, gen_kw: list[str]) -> list[Self]:
         if errors:
             raise ConfigValidationError.from_collected(errors)
 
-        parameter_configuration: list[Self] = []
+        parameter_configuration: list[ScalarParameter] = []
         with open(parameter_file, encoding="utf-8") as file:
             for line_number, item in enumerate(file):
                 item = item.split("--")[0]  # remove comments
@@ -318,7 +333,7 @@ def from_config_list(cls, gen_kw: list[str]) -> list[Self]:
                         )
                     else:
                         parameter_configuration.append(
-                            cls(
+                            ScalarParameter(
                                 param_name=items[1],
                                 input_source=DataSource.SAMPLED,
                                 group_name=gen_kw_key,
@@ -327,6 +342,9 @@ def from_config_list(cls, gen_kw: list[str]) -> list[Self]:
                                 output_file=output_file,
                             )
                         )
+                        # cls.all_scalar_params[DataSource.SAMPLED] += (
+                        #     parameter_configuration
+                        # )
 
         if errors:
             raise ConfigValidationError.from_collected(errors)
@@ -339,13 +357,3 @@ def from_config_list(cls, gen_kw: list[str]) -> list[Self]:
                 gen_kw[0],
             )
         return parameter_configuration
-
-        # return cls(
-        #     name=gen_kw_key,
-        #     forward_init=forward_init,
-        #     template_file=template_file,
-        #     output_file=output_file,
-        #     forward_init_file=init_file,
-        #     transform_function_definitions=transform_function_definitions,
-        #     update=update_parameter,
-        # )

src/ert/enkf_main.py

@@ -19,7 +19,13 @@
 from ert.config.model_config import ModelConfig
 from ert.substitutions import Substitutions, substitute_runpath_name
 
-from .config import ExtParamConfig, Field, GenKwConfig, ParameterConfig, SurfaceConfig
+from .config import (
+    ExtParamConfig,
+    Field,
+    GenKwConfig,
+    ParameterConfig,
+    SurfaceConfig,
+)
 from .config.design_matrix import DESIGN_MATRIX_GROUP
 from .run_arg import RunArg
 from .runpaths import Runpaths