ert 17.1.7__py3-none-any.whl → 17.1.9__py3-none-any.whl

ert/analysis/_enif_update.py

@@ -160,10 +160,14 @@ def analysis_EnIF(
         Y=S.T,
         verbose_level=5,
     )
-
+    updated_parameters = [
+        p
+        for p, config in source_ensemble.experiment.parameter_configuration.items()
+        if config.update
+    ]
     # Learn the precision matrix block-sparse over parameter groups
     Prec_u = sp.sparse.csc_matrix((0, 0), dtype=float)
-    for param_group in parameters:
+    for param_group in updated_parameters:
         config_node = source_ensemble.experiment.parameter_configuration[param_group]
         X_local = source_ensemble.load_parameters_numpy(param_group, iens_active_index)
         X_local_scaler = StandardScaler()
@@ -215,7 +219,7 @@ def analysis_EnIF(
 
     # Iterate over parameters to store the updated ensemble
     parameters_updated = 0
-    for param_group in parameters:
+    for param_group in updated_parameters:
         log_msg = f"Storing data for {param_group}.."
         logger.info(log_msg)
         progress_callback(AnalysisStatusEvent(msg=log_msg))
@@ -241,7 +245,7 @@ def analysis_EnIF(
         )
     _copy_unupdated_parameters(
         list(source_ensemble.experiment.parameter_configuration.keys()),
-        parameters,
+        updated_parameters,
         iens_active_index,
         source_ensemble,
         target_ensemble,

ert/analysis/_update_commons.py

@@ -331,11 +331,12 @@ def _all_parameters(
 ) -> npt.NDArray[np.float64]:
     """Return all parameters in assimilation problem"""
 
-    param_groups = list(ensemble.experiment.parameter_configuration.keys())
-
+    groups_to_update = [
+        k for k, v in ensemble.experiment.parameter_configuration.items() if v.update
+    ]
     param_arrays = [
         ensemble.load_parameters_numpy(param_group, iens_active_index)
-        for param_group in param_groups
+        for param_group in groups_to_update
     ]
 
     return np.vstack(param_arrays)

ert/run_models/_create_run_path.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import json
 import logging
+import math
 import os
 import time
 from collections.abc import Iterable, Mapping
@@ -22,6 +23,7 @@ from ert.config import (
     SurfaceConfig,
 )
 from ert.config.design_matrix import DESIGN_MATRIX_GROUP
+from ert.config.distribution import LogNormalSettings, LogUnifSettings
 from ert.config.ert_config import create_forward_model_json
 from ert.substitutions import Substitutions, substitute_runpath_name
 from ert.utils import log_duration
@@ -128,6 +130,7 @@ def _generate_parameter_files(
         df = fs._load_scalar_keys(keys=keys, realizations=iens, transformed=True)
         scalar_data = df.to_dicts()[0]
     exports: dict[str, dict[str, float | str]] = {}
+    log_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
@@ -135,16 +138,34 @@ def _generate_parameter_files(
         if param.forward_init and iteration == 0:
             continue
         export_values: dict[str, dict[str, float | str]] | None = None
+        log_export_values: dict[str, dict[str, float | str]] | None = {}
         if param.name in scalar_data:
-            export_values = {param.group_name: {param.name: scalar_data[param.name]}}
+            scalar_value = scalar_data[param.name]
+            export_values = {param.group_name: {param.name: scalar_value}}
+            if isinstance(param, GenKwConfig) and isinstance(
+                param.distribution, (LogNormalSettings, LogUnifSettings)
+            ):
+                if isinstance(scalar_value, float) and scalar_value > 0:
+                    log_value = math.log10(scalar_value)
+                    log_export_values = {
+                        f"LOG10_{param.group_name}": {param.name: log_value}
+                    }
+                else:
+                    logger.warning(
+                        "Could not export the log10 value of "
+                        f"{scalar_value} as it is invalid"
+                    )
         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)
+        if log_export_values:
+            for group, vals in log_export_values.items():
+                log_exports.setdefault(group, {}).update(vals)
         continue
 
-    _value_export_txt(run_path, export_base_name, exports)
+    _value_export_txt(run_path, export_base_name, exports | log_exports)
     _value_export_json(run_path, export_base_name, exports)
     return exports
 

ert/shared/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '17.1.7'
-__version_tuple__ = version_tuple = (17, 1, 7)
+__version__ = version = '17.1.9'
+__version_tuple__ = version_tuple = (17, 1, 9)
 
-__commit_id__ = commit_id = 'gf916ce03e'
+__commit_id__ = commit_id = 'g37d22236c'

{ert-17.1.7.dist-info → ert-17.1.9.dist-info}/METADATA

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

{ert-17.1.7.dist-info → ert-17.1.9.dist-info}/RECORD

@@ -31,9 +31,9 @@ ert/substitutions.py,sha256=k3dMj0-GWmE1F-kuVPkK36ekvmoPAx5NdxdcxhUrQSo,4561
 ert/trace.py,sha256=m2ZjKd1nf7LjBM2lL0fk1cNF04HnQs8blZhQbTXgcB0,1274
 ert/workflow_runner.py,sha256=veKEZBRnyMoErFpABRKLreMJvgVoN7UENbJssqmKW7w,7298
 ert/analysis/__init__.py,sha256=NNLGQG9gex6lJ8IZjEg_tXTfSeJceRA9zjOek-UeY0Y,591
-ert/analysis/_enif_update.py,sha256=Mc3Uztn70atfB9T96ZEch4hsGsrhjywInVwLmToBGl8,7479
+ert/analysis/_enif_update.py,sha256=Oh9oUiMLbBT8o3TPl9x3ZR24gqBpIn6nFPwrOjMNtnY,7654
 ert/analysis/_es_update.py,sha256=tav1ku3uqPBPDqDfVzsMS1gi5Zn0lRk_oXqt2LZolPs,16592
-ert/analysis/_update_commons.py,sha256=W6S9Z3_aP9QmzaNE0cofSETqJNbQM0nYczJoq5A-SAg,12010
+ert/analysis/_update_commons.py,sha256=2kf7e9iFs_jBO_qGur6gvoolK2zrnIs9GRwTvCVhcSo,12054
 ert/analysis/event.py,sha256=vBYqtTl5DXePPWHTLX9bROmGTD2ixcrQh4K07g-UikM,2248
 ert/analysis/misfit_preprocessor.py,sha256=2MjlL2yIg5KQpqWiD3675-hoy_5QM49pWQ7VXK4rous,8001
 ert/analysis/snapshots.py,sha256=rLMxg4y5dlA_GZ2ETnZilfmggsqDm3O8Fiuq2xpshz8,2106
@@ -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=MyIBDCm7lE_DGJioGhGWe58LeKwPsJlkv4vh-0pKLgM,10138
+ert/run_models/_create_run_path.py,sha256=sLOfSigHWRYuwec4Fm9nP1uYfmd4u7LSgGyzDJ1e9Mo,11178
 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=fXOW6VMQi7T8Efn9Lx5oAa2f_53xPi_6VQ4Z4G4bQZQ,714
+ert/shared/version.py,sha256=uJeJEMKM6ycEOGW1VQzG0q2Pqrjz4rEMC4JjzCXVs28,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
@@ -449,13 +449,13 @@ 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.7.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-17.1.9.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
 everest/strings.py,sha256=byT2Su4swYFcyyB36pCVvaMqxNnu8kyYfCOg8sv6LkA,1016
 everest/api/__init__.py,sha256=_me3w2C92NQpPX2RrJ28IfQiXNif5-f2dN9Qg4HzbgY,86
-everest/api/everest_data_api.py,sha256=HHXx7oFpXLsRwqFdoyHJ_rkvbNmmXDYMrOBhZisBeTQ,9881
+everest/api/everest_data_api.py,sha256=-W_Qot75zJ6xl2M7S3SyL1SXGLcgpeopmMUSS8jSmHg,10333
 everest/assets/everest_logo.svg,sha256=1GDy-tJYQSean8f_WWTlcKPhv1Wsb_xhFzXe3Gguke4,12048
 everest/bin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 everest/bin/config_branch_script.py,sha256=qrSOqCYsiCi24k_Gj_Xg2s_QH3tqaPxmx-IrDAaiWQE,5138
@@ -516,8 +516,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.7.dist-info/METADATA,sha256=RR7uZP5bXW_XAw5maynJglQYQcplgis6AcTLcYgdzVE,10005
-ert-17.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ert-17.1.7.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
-ert-17.1.7.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
-ert-17.1.7.dist-info/RECORD,,
+ert-17.1.9.dist-info/METADATA,sha256=ICE3O9TkVJ-T6JK2CeeROGZG0TCL9mLKUpx69TfH0YU,10005
+ert-17.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ert-17.1.9.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
+ert-17.1.9.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
+ert-17.1.9.dist-info/RECORD,,

everest/api/everest_data_api.py

@@ -224,6 +224,8 @@ class EverestDataAPI:
         assert self._config.storage_dir
         storage = open_storage(self._config.storage_dir, "r")
         experiment = next(storage.experiments)
+        identical_columns_in_all_batches: bool = True
+        summary_columns: list[str] | None = None
         for batch_id in batches:
             try:
                 ensemble = experiment.get_ensemble_by_name(f"batch_{batch_id}")
@@ -238,6 +240,10 @@ class EverestDataAPI:
                 summary = summary.pivot(
                     on="response_key", index=["realization", "time"], sort_columns=True
                 )
+                if summary_columns is None:
+                    summary_columns = summary.columns
+                identical_columns_in_all_batches &= summary_columns == summary.columns
+
                 # The 'Realization' column exported by ert are
                 # the 'simulations' of everest.
                 summary = summary.rename({"time": "date", "realization": "simulation"})
@@ -265,7 +271,14 @@ class EverestDataAPI:
 
                 data_frames.append(summary)
         storage.close()
-        return pl.concat(data_frames) if data_frames else pl.DataFrame()
+        return (
+            pl.concat(
+                data_frames,
+                how="vertical" if identical_columns_in_all_batches else "diagonal",
+            )
+            if data_frames
+            else pl.DataFrame()
+        )
 
     @property
     def output_folder(self) -> str: