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

ert/config/gen_kw_config.py

@@ -217,18 +217,7 @@ class GenKwConfig(ParameterConfig):
         real_nr: int,
         ensemble: Ensemble,
     ) -> dict[str, dict[str, float | str]]:
-        df = ensemble.load_parameters(self.name, real_nr, transformed=True).drop(
-            "realization"
-        )
-
-        assert isinstance(df, pl.DataFrame)
-        if not df.width == 1:
-            raise ValueError(
-                f"GEN_KW {self.group_name}:{self.name} should be a single parameter!"
-            )
-
-        data = df.to_dicts()[0]
-        return {self.group_name: data}
+        raise NotImplementedError
 
     def load_parameters(
         self, ensemble: Ensemble, realizations: npt.NDArray[np.int_]

ert/run_models/_create_run_path.py

@@ -16,6 +16,7 @@ from ert.config import (
     Field,
     ForwardModelStep,
     GenKwConfig,
+    ParameterCardinality,
     ParameterConfig,
     SurfaceConfig,
 )
@@ -115,15 +116,28 @@ def _generate_parameter_files(
         Returns the union of parameters returned by write_to_runpath for each
         parameter_config.
     """
+    # preload scalar parameters for this realization
+    keys = [
+        p.name
+        for p in parameter_configs
+        if p.cardinality == ParameterCardinality.multiple_configs_per_ensemble_dataset
+    ]
+    scalar_data: dict[str, float | str] = {}
+    if keys:
+        df = fs._load_scalar_keys(keys=keys, realizations=iens, transformed=True)
+        scalar_data = df.to_dicts()[0]
     exports: dict[str, dict[str, float | str]] = {}
-
     for param in parameter_configs:
         # For the first iteration we do not write the parameter
         # to run path, as we expect to read if after the forward
         # model has completed.
         if param.forward_init and iteration == 0:
             continue
-        export_values = param.write_to_runpath(Path(run_path), iens, fs)
+        export_values: dict[str, dict[str, float | str]] | None = None
+        if param.name in scalar_data:
+            export_values = {param.group_name: {param.name: scalar_data[param.name]}}
+        else:
+            export_values = param.write_to_runpath(Path(run_path), iens, fs)
         if export_values:
             for group, vals in export_values.items():
                 exports.setdefault(group, {}).update(vals)

ert/shared/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '17.1.0'
-__version_tuple__ = version_tuple = (17, 1, 0)
+__version__ = version = '17.1.1'
+__version_tuple__ = version_tuple = (17, 1, 1)
 
-__commit_id__ = commit_id = 'g30a47503f'
+__commit_id__ = commit_id = 'gf5fff23fc'

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

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

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

@@ -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=IaRC7jHmMnFVRH2HkpwBIxOlhP0S_lu84P8EUzEMbQk,10944
+ert/config/gen_kw_config.py,sha256=sDtmLmPAVgI-eI6OzBMORm6V2EnyqaOb6tKdnNLNIP8,10583
 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=nyISimyYqMPnrwjIb6HxDaeGChafr_zRvQUf9BIRxK4,8381
+ert/run_models/_create_run_path.py,sha256=5CJNFaBbsCnfzb9eoXGWdgFpuJiBXiPTsaHdyJcXbHQ,9007
 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
@@ -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=5_KXIMi5L1bZFOmvED8--mEqIRzGE6ki94tLszsdI_c,714
+ert/shared/version.py,sha256=lWK3GCMvVnSkDONSCqHwX1YrDpQtDsZaza8okvJgVAc,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.0.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-17.1.1.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.0.dist-info/METADATA,sha256=eqM2Dy5iY05nqWJ1jgw_SXLwctTorBv6_dPFEHLsj2M,10005
-ert-17.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ert-17.1.0.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
-ert-17.1.0.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
-ert-17.1.0.dist-info/RECORD,,
+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,,