Export re-scaled controls

Author: verveerpj

src/ert/run_models/everest_run_model.py

@@ -326,9 +326,12 @@ def _init_batch_data(
         control_values: NDArray[np.float64],
         evaluator_context: EvaluatorContext,
         cached_results: dict[int, Any],
+        prefix: str = "",
     ) -> dict[int, dict[str, Any]]:
         def _add_controls(
-            controls_config: list[ControlConfig], values: NDArray[np.float64]
+            controls_config: list[ControlConfig],
+            values: NDArray[np.float64],
+            prefix: str = "",
         ) -> dict[str, Any]:
             batch_data_item: dict[str, Any] = {}
             value_list = values.tolist()
@@ -344,13 +347,27 @@ def _add_controls(
                     else:
                         variable_value = value_list.pop(0)
                     control_dict[variable.name] = variable_value
-                batch_data_item[control.name] = control_dict
+                batch_data_item[prefix + control.name] = control_dict
+            return batch_data_item
+
+        def _add_controls_with_rescaling(
+            controls_config: list[ControlConfig], values: NDArray[np.float64]
+        ) -> dict[str, Any]:
+            batch_data_item = _add_controls(controls_config, values)
+            if self._ropt_transforms.variables is not None:
+                rescaled_values = self._ropt_transforms.variables.backward(values)
+                rescaled_item = _add_controls(
+                    controls_config, rescaled_values, prefix="rescaled-"
+                )
+                batch_data_item.update(rescaled_item)
             return batch_data_item
 
         active = evaluator_context.active
         realizations = evaluator_context.realizations
         return {
-            idx: _add_controls(self._everest_config.controls, control_values[idx, :])
+            idx: _add_controls_with_rescaling(
+                self._everest_config.controls, control_values[idx, :]
+            )
             for idx in range(control_values.shape[0])
             if (
                 idx not in cached_results
@@ -392,7 +409,12 @@ def _check_suffix(
                         f"Key {key} has suffixes, a suffix must be specified"
                     )
 
-        if set(controls.keys()) != set(self._everest_config.control_names):
+        control_names = set(self._everest_config.control_names)
+        if any(control.auto_scale for control in self._everest_config.controls):
+            control_names |= {
+                "rescaled-" + name for name in self._everest_config.control_names
+            }
+        if set(controls.keys()) != control_names:
             err_msg = "Mismatch between initialized and provided control names."
             raise KeyError(err_msg)
 

src/everest/config/control_variable_config.py

@@ -34,24 +34,6 @@ class _ControlVariable(BaseModel):
 initial value.
 """,
     )
-    auto_scale: bool | None = Field(
-        default=None,
-        description="""
-Can be set to true to re-scale variable from the range
-defined by [min, max] to the range defined by scaled_range (default [0, 1])
-""",
-    )
-    scaled_range: Annotated[tuple[float, float] | None, AfterValidator(valid_range)] = (
-        Field(
-            default=None,
-            description="""
-Can be used to set the range of the variable values
-after scaling (default = [0, 1]).
-
-This option has no effect if auto_scale is not set.
-""",
-        )
-    )
     min: float | None = Field(
         default=None,
         description="""

src/everest/config/utils.py

@@ -66,8 +66,6 @@ def _add_variable(
             for key in [
                 "control_type",
                 "enabled",
-                "auto_scale",
-                "scaled_range",
                 "min",
                 "max",
                 "perturbation_magnitude",

src/everest/optimizer/everest2ropt.py

@@ -389,7 +389,7 @@ def everest2ropt(
 
 def get_ropt_transforms(ever_config: EverestConfig) -> Transforms:
     controls = FlattenedControls(ever_config.controls)
-    if any(item is not None for item in controls.auto_scales):
+    if any(controls.auto_scales):
         variable_scaler = ControlScaler(
             controls.lower_bounds,
             controls.upper_bounds,

src/everest/simulator/everest_to_ert.py

@@ -526,5 +526,11 @@ def _get_variables(
             input_keys=_get_variables(control.variables),
             output_file=control.name + ".json",
         )
+        if control.auto_scale:
+            ens_config.parameter_configs["rescaled-" + control.name] = ExtParamConfig(
+                name="rescaled-" + control.name,
+                input_keys=_get_variables(control.variables),
+                output_file="rescaled-" + control.name + ".json",
+            )
 
     return ert_config

tests/everest/test_ropt_initialization.py

@@ -46,20 +46,6 @@ def test_everest2ropt_controls_auto_scale():
     assert numpy.allclose(ropt_config.variables.upper_bounds, 0.7)
 
 
-def test_everest2ropt_variables_auto_scale():
-    config = EverestConfig.load_file(os.path.join(_CONFIG_DIR, _CONFIG_FILE))
-    controls = config.controls
-    controls[0].variables[1].auto_scale = True
-    controls[0].variables[1].scaled_range = [0.3, 0.7]
-    ropt_config = everest2ropt(config, transforms=get_ropt_transforms(config))
-    assert ropt_config.variables.lower_bounds[0] == 0.0
-    assert ropt_config.variables.upper_bounds[0] == 0.1
-    assert ropt_config.variables.lower_bounds[1] == 0.3
-    assert ropt_config.variables.upper_bounds[1] == 0.7
-    assert numpy.allclose(ropt_config.variables.lower_bounds[2:], 0.0)
-    assert numpy.allclose(ropt_config.variables.upper_bounds[2:], 0.1)
-
-
 def test_everest2ropt_controls_input_constraint():
     config = EverestConfig.load_file(
         os.path.join(_CONFIG_DIR, "config_input_constraints.yml")