ert 17.1.1__py3-none-any.whl → 17.1.3__py3-none-any.whl

ert/config/design_matrix.py

@@ -171,26 +171,33 @@ class DesignMatrix:
 
         for param_cfg in existing_parameters:
             if isinstance(param_cfg, GenKwConfig) and param_cfg.name in design_cfgs:
-                param_cfg.input_source = DataSource(
+                del design_cfgs[param_cfg.name]
+                input_source = DataSource(
                     self.parameter_priority.get(
                         param_cfg.name, DataSource.DESIGN_MATRIX.value
                     )
                 )
-                param_cfg.update = (
-                    param_cfg.input_source == DataSource.SAMPLED and param_cfg.update
-                )
-                param_cfg.distribution = (
-                    RawSettings()
-                    if param_cfg.input_source == DataSource.DESIGN_MATRIX
-                    else param_cfg.distribution
-                )
-                param_cfg.group = (
-                    DataSource.DESIGN_MATRIX.value.upper()
-                    if param_cfg.input_source == DataSource.DESIGN_MATRIX
-                    else param_cfg.group
-                )
-                del design_cfgs[param_cfg.name]
-            new_param_configs += [param_cfg]
+                new_param_configs += [
+                    GenKwConfig(
+                        name=param_cfg.name,
+                        update=(
+                            input_source == DataSource.SAMPLED and param_cfg.update
+                        ),
+                        distribution=(
+                            RawSettings()
+                            if input_source == DataSource.DESIGN_MATRIX
+                            else param_cfg.distribution
+                        ),
+                        group=(
+                            DESIGN_MATRIX_GROUP
+                            if input_source == DataSource.DESIGN_MATRIX
+                            else param_cfg.group
+                        ),
+                        input_source=input_source,
+                    ),
+                ]
+            else:
+                new_param_configs += [param_cfg]
         if design_cfgs.values():
             new_param_configs += list(design_cfgs.values())
         return new_param_configs

ert/config/ert_config.py

@@ -791,6 +791,15 @@ class ErtConfig(BaseModel):
             )
         return self
 
+    @model_validator(mode="after")
+    def log_ensemble_config_contents(self) -> Self:
+        all_parameters = self.parameter_configurations_with_design_matrix
+        parameter_type_count = Counter(parameter.type for parameter in all_parameters)
+        logger.info(
+            f"EnsembleConfig contains parameters of type {dict(parameter_type_count)}"
+        )
+        return self
+
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, ErtConfig):
             return False

ert/config/gen_kw_config.py

@@ -121,7 +121,7 @@ class GenKwConfig(ParameterConfig):
         gen_kw_key = cast(str, config_list[0])
 
         options = cast(dict[str, str], config_list[-1])
-        positional_args = cast(list[str], config_list[:-1])
+        positional_args = cast(list[str | list[str]], config_list[:-1])
         errors = []
         update_parameter = str_to_bool(options.get("UPDATE", "TRUE"))
         if _get_abs_path(options.get("INIT_FILES")):
@@ -186,7 +186,7 @@ class GenKwConfig(ParameterConfig):
                         params[0], params[1], params[2:]
                     ),
                     forward_init=False,
-                    update=update_parameter,
+                    update="CONST" not in params and update_parameter,
                 )
                 for params in distributions_spec
             ]

ert/run_models/_create_run_path.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import json
 import logging
 import os
+import time
 from collections.abc import Iterable, Mapping
 from datetime import UTC, datetime
 from pathlib import Path
@@ -189,12 +190,18 @@ def create_run_path(
     if context_env is None:
         context_env = {}
     runpaths.set_ert_ensemble(ensemble.name)
-
+    timings = {
+        "generate_parameter_files": 0.0,
+        "substitute_parameters": 0.0,
+        "substitute_real_iter": 0.0,
+        "result_file_to_target": 0.0,
+    }
     substituter = Substitutions(substitutions)
     for run_arg in run_args:
         run_path = Path(run_arg.runpath)
         if run_arg.active:
             run_path.mkdir(parents=True, exist_ok=True)
+            start_time = time.perf_counter()
             param_data = _generate_parameter_files(
                 ensemble.experiment.parameter_configuration.values(),
                 parameters_file,
@@ -203,10 +210,12 @@ def create_run_path(
                 ensemble,
                 ensemble.iteration,
             )
+            timings["generate_parameter_files"] += time.perf_counter() - start_time
             for (
                 source_file_content,
                 target_file,
             ) in ensemble.experiment.templates_configuration:
+                start_time = time.perf_counter()
                 target_file = substituter.substitute_real_iter(
                     target_file, run_arg.iens, ensemble.iteration
                 )
@@ -215,10 +224,14 @@ def create_run_path(
                     run_arg.iens,
                     ensemble.iteration,
                 )
+                timings["substitute_real_iter"] += time.perf_counter() - start_time
+                start_time = time.perf_counter()
                 result = substituter.substitute_parameters(
                     result,
                     param_data,
                 )
+                timings["substitute_parameters"] += time.perf_counter() - start_time
+                start_time = time.perf_counter()
                 target = run_path / target_file
                 if not target.parent.exists():
                     os.makedirs(
@@ -226,10 +239,13 @@ def create_run_path(
                         exist_ok=True,
                     )
                 target.write_text(result)
+                timings["result_file_to_target"] += time.perf_counter() - start_time
 
             path = run_path / "jobs.json"
+            start_time = time.perf_counter()
             _backup_if_existing(path)
-
+            timings["backup_if_existing"] = time.perf_counter() - start_time
+            start_time = time.perf_counter()
             forward_model_output = create_forward_model_json(
                 context=substitutions,
                 forward_model_steps=forward_model_steps,
@@ -246,12 +262,15 @@ def create_run_path(
                     option=orjson.OPT_NON_STR_KEYS | orjson.OPT_INDENT_2,
                 )
             )
+            timings["jobs_to_json"] = time.perf_counter() - start_time
             # Write MANIFEST file to runpath use to avoid NFS sync issues
+            start_time = time.perf_counter()
             data = _manifest_to_json(ensemble, run_arg.iens, run_arg.itr)
             Path(run_path / "manifest.json").write_bytes(
                 orjson.dumps(data, option=orjson.OPT_NON_STR_KEYS | orjson.OPT_INDENT_2)
             )
-
+            timings["manifest_to_json"] = time.perf_counter() - start_time
+    logger.info(f"_create_run_path durations: {timings}")
     runpaths.write_runpath_list(
         [ensemble.iteration], [real.iens for real in run_args if real.active]
     )

ert/run_models/manual_update.py

@@ -19,6 +19,7 @@ logger = logging.getLogger(__name__)
 
 class ManualUpdate(UpdateRunModel):
     ensemble_id: str
+    ert_templates: list[tuple[str, str]]
 
     _prior: Ensemble = PrivateAttr()
 
@@ -49,7 +50,7 @@ class ManualUpdate(UpdateRunModel):
             observations=prior_experiment.observations,
             simulation_arguments=prior_experiment.metadata,
             name=f"Manual update of {self._prior.name}",
-            templates=self._prior.experiment.templates_configuration,
+            templates=self.ert_templates,
         )
         self.update(
             self._prior,

ert/run_models/model_factory.py

@@ -287,6 +287,7 @@ def _setup_manual_update(
         substitutions=config.substitutions,
         hooked_workflows=config.hooked_workflows,
         log_path=config.analysis_config.log_path,
+        ert_templates=config.ert_templates,
         observations=config.observations,
     )
 

ert/shared/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '17.1.1'
-__version_tuple__ = version_tuple = (17, 1, 1)
+__version__ = version = '17.1.3'
+__version_tuple__ = version_tuple = (17, 1, 3)
 
-__commit_id__ = commit_id = 'gf5fff23fc'
+__commit_id__ = commit_id = 'gd2561a7a0'

{ert-17.1.1.dist-info → ert-17.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ert
-Version: 17.1.1
+Version: 17.1.3
 Summary: Ensemble based Reservoir Tool (ERT)
 Author-email: Equinor ASA <fg_sib-scout@equinor.com>
 License: GPL-3.0

{ert-17.1.1.dist-info → ert-17.1.3.dist-info}/RECORD

@@ -51,10 +51,10 @@ ert/config/_str_to_bool.py,sha256=AxNCJAuTtKF-562CRh7HgjQIyM7N-jjSlRJKvpCNk9I,85
 ert/config/analysis_config.py,sha256=v-ZppIlP_NkmhtuYuxm31m2V3eA7YjvC3rDsMXm5qPk,8646
 ert/config/analysis_module.py,sha256=TLluRobz_0NNMDSGFdM4L2t9agfvHyhoN-b1Rg8MAE4,2070
 ert/config/capture_validation.py,sha256=8HGEbJ2z9FXeEaxSewejP7NtEh4LLomPwcdpC0CJlko,1252
-ert/config/design_matrix.py,sha256=cJTvvUVKo9h5OPGjQDcq-cK0Pl3mm3P63RDKvK_n0xU,16993
+ert/config/design_matrix.py,sha256=yyAFBppTwZXt4OeN6kxRmLk16jF8bntQWLHU_-rDQn4,17236
 ert/config/distribution.py,sha256=MdLQEnWZqDaAwbKI1maXxlurYousirlZbA8AIk6GITw,12734
 ert/config/ensemble_config.py,sha256=8IgQOdzhczslScJJuVYlWKzALw6_IsqvZzSvMkiE8go,7438
-ert/config/ert_config.py,sha256=pYi1qywb95rtA1Kro-hoDHOucrUJCvSWiPTnAAmArt0,54231
+ert/config/ert_config.py,sha256=at5T2E393aikjZMSswP2hp7LvS9VvKknF_9ip9eYTb8,54618
 ert/config/ert_plugin.py,sha256=hENwrc9FfhqUYjVpFYcmy66jDLgU_gagOJFBcYjxe6A,458
 ert/config/ert_script.py,sha256=64FZ-dMI8DZtRLHWReC19KY-ZOsBhdgYkwAe9ZWLc_I,8405
 ert/config/everest_constraints_config.py,sha256=vlsoXHGyoCoESZ4eFdsKlFWL0aEctRR0caBFwcuF1xk,3099
@@ -64,7 +64,7 @@ ert/config/external_ert_script.py,sha256=7htQDv1P7ykoj4Bz51xOWIDbs7P4z7HIft67Bab
 ert/config/field.py,sha256=BDaBni_aQ2y1GpG37KodrmlBcG17bXgZLOzR72Llxmo,12093
 ert/config/forward_model_step.py,sha256=v35ieiGdE5OA764q1eri2MGSNDEUtOlweBp2Vx56EpI,9926
 ert/config/gen_data_config.py,sha256=Vuh3wGPL_R2jktPhX_dAR_SjYu0LADdRQJjn1H7VVV8,8554
-ert/config/gen_kw_config.py,sha256=sDtmLmPAVgI-eI6OzBMORm6V2EnyqaOb6tKdnNLNIP8,10583
+ert/config/gen_kw_config.py,sha256=5Dq6YhusvHgFBpDPNKanSghyE7oj2NFRU36J8Krnpv4,10621
 ert/config/lint_file.py,sha256=DZv2j2OzhArtr7oDDUin6lJRwP6Ww620b7Yh-0SHUFc,671
 ert/config/model_config.py,sha256=puFBesPfksWM9Yp1qKa1gu_y7r2drZf9etJUBqGspu4,5056
 ert/config/parameter_config.py,sha256=pZz0PstN_Mm4e2w3S_CxuXHZK11KeNjLAUhJIUqMXYg,6035
@@ -367,7 +367,7 @@ ert/resources/workflows/jobs/shell/MOVE_DIRECTORY,sha256=Lh_u0-eCr5Usa8Xien44d6q
 ert/resources/workflows/jobs/shell/MOVE_FILE,sha256=MET6aPtDTVaoEDiTZqKqx_hRayJP3Gn-yubdwrJqpjw,48
 ert/resources/workflows/jobs/shell/SYMLINK,sha256=P6wYoLM6y7IqzJQE5ZWkKEj7ERfK9VTRJa6N1pKigeg,46
 ert/run_models/__init__.py,sha256=MWZL_nWbAarzw8Ltuy1kU0LyZpxP07Nk86wGHwOQEv8,936
-ert/run_models/_create_run_path.py,sha256=5CJNFaBbsCnfzb9eoXGWdgFpuJiBXiPTsaHdyJcXbHQ,9007
+ert/run_models/_create_run_path.py,sha256=MyIBDCm7lE_DGJioGhGWe58LeKwPsJlkv4vh-0pKLgM,10138
 ert/run_models/ensemble_experiment.py,sha256=dUOSNh8a8jKNoBesirvQU0qUUvZ1jcaCTCS1T4s0KCY,2833
 ert/run_models/ensemble_information_filter.py,sha256=CN-yX3DJlRI7qMaLcEdTgpJMptVjU8d4c7o9HX61PQ0,1039
 ert/run_models/ensemble_smoother.py,sha256=CEdcGSAo_yW3Sfvh3OjQjnhGcwwErDkq7aFZBkKsNOo,3623
@@ -375,8 +375,8 @@ ert/run_models/evaluate_ensemble.py,sha256=OPpHzJCkh66exOUpvQLa7FSsPN0rE6Tw2A4DC
 ert/run_models/event.py,sha256=s7Nij_M_OLcODSZ0ALg03fFin2lRCYalKMoJujTa6sg,3249
 ert/run_models/everest_run_model.py,sha256=vkHezGoQ2n2wix3lufd-zgfUTb6BAEoyTh-1R7OrxJ4,44259
 ert/run_models/initial_ensemble_run_model.py,sha256=Kjl7cSRNT_yiHcXw-0RhwGn9ggSlWs3zq2nQGIVwNDA,3720
-ert/run_models/manual_update.py,sha256=uhzeQnIL7QKUjKSzGM_Oby8PrQLqpsLEEJbM3k_EAIc,2929
-ert/run_models/model_factory.py,sha256=3TbIjpFqooCYB3QoLjqkw9m-xnwvt3H12rSnfKAHUmA,18588
+ert/run_models/manual_update.py,sha256=r8UAJKgCf6RqTfcFwCbW7hDPHqpGW_m7YQGgzdmR-fY,2942
+ert/run_models/model_factory.py,sha256=y5eOrnH3U6-c1yVfE0mcwbZXGYtAf0UaMoJvkyjAQyU,18632
 ert/run_models/multiple_data_assimilation.py,sha256=pJa1X55dLBpDn13ukQR1W769qVPPQEiUAl1fjq6ArS4,8214
 ert/run_models/run_model.py,sha256=ZhX1C2_NQRFe-i4wx7qaV4w8-BXmb6vHnz4p0ZhuFsQ,30234
 ert/run_models/single_test_run.py,sha256=4MJeyZAN9uX5RdIni5vb3uymUexG3JtZBtERMUCjqPE,922
@@ -397,7 +397,7 @@ ert/services/storage_service.py,sha256=3hiQ5MVDD1ozFgndcy6HadK0qPVS1FAmL4P5p2LFf
 ert/services/webviz_ert_service.py,sha256=J5vznqb_-DjlDMOze7tdvuBE4GWEPgJ5dIIXvRLKd0Y,650
 ert/shared/__init__.py,sha256=OwgL-31MxA0fabETJ5Svw0tqJpHi569CZDRFHdHiqA0,644
 ert/shared/net_utils.py,sha256=DDHIZLHdBnh7ZZ--1s-FUlsoNTSJJsfHmLQE44E2JqU,5324
-ert/shared/version.py,sha256=lWK3GCMvVnSkDONSCqHwX1YrDpQtDsZaza8okvJgVAc,714
+ert/shared/version.py,sha256=_zSQoyIoRuk0INbUivlXAy8q9dNiaMXxPHOdBzoCEBQ,714
 ert/shared/_doc_utils/__init__.py,sha256=zSl-NUpWLF167PVTvfjn0T50gExjvyWPw5OGq5Bt2Dc,983
 ert/shared/_doc_utils/ert_jobs.py,sha256=425Ol3pk-rIjyQxoopAijKV-YiAESJy3yyoukBQle4s,8116
 ert/shared/_doc_utils/everest_jobs.py,sha256=uBDN7tIwlBJIZVZ6ZFL1tkewEJJGDLoeVrFIIrJznvM,2081
@@ -448,7 +448,7 @@ ert/validation/validation_status.py,sha256=f47_B7aS-9DEh6uaVzKxD97pXienkyTVVCqTy
 ert/warnings/__init__.py,sha256=IBwQVkdD7Njaad9PAB-9K-kr15wnA4EBKboxyqgu9NA,214
 ert/warnings/_warnings.py,sha256=7qhNZ0W4nnljzoOx6AXX7VlMv5pa34Ek5M5n1Ep0Kak,189
 ert/warnings/specific_warning_handler.py,sha256=5dVXtOhzcMmtPBGx4AOddXNPfzTFOPA7RVtdH8hLv68,932
-ert-17.1.1.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-17.1.3.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
 everest/__init__.py,sha256=8_f50f6H3-onqaiuNCwC0Eiotdl9JuTxhwyF_54MVvU,306
 everest/config_file_loader.py,sha256=7cOcT0nwsZ_bhqDkyZ60sIvh1kL2sG1gURqF3IHQ4hc,5287
 everest/everest_storage.py,sha256=nfaTdab9kPlXZQiZWRR-Y7Zb-2kyQNhF0B914bU1IDQ,42269
@@ -515,8 +515,8 @@ everest/templates/well_drill.tmpl,sha256=9iLexmBHMsMQNXyyRK4GlmVuVpVIxRcCHpy1av5
 everest/templates/well_order.tmpl,sha256=XJ1eVRkeyTdLu5sLsltJSSK6BDLN7rFOAqLdM3ZZy3w,75
 everest/util/__init__.py,sha256=xEYLz6pUtgkH8VHer1RfoCwKiO70dBnuhHonsOPaOx0,1359
 everest/util/forward_models.py,sha256=JPxHhLI6TrmQJwW50wwGBmw57TfRd8SG2svYhXFHrc8,1617
-ert-17.1.1.dist-info/METADATA,sha256=YHNXoero9qqe9HSG_R5PEILZft2LmJOcWAyHrS3m6Yk,10005
-ert-17.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ert-17.1.1.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
-ert-17.1.1.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
-ert-17.1.1.dist-info/RECORD,,
+ert-17.1.3.dist-info/METADATA,sha256=Cvndc9K997C9xnMkhQjfIm3gyKV33dDzxMd48eK-UOo,10005
+ert-17.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ert-17.1.3.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
+ert-17.1.3.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
+ert-17.1.3.dist-info/RECORD,,