webviz-subsurface 0.2.40__py3-none-any.whl → 0.2.42__py3-none-any.whl

webviz_subsurface/plugins/{_co2_leakage → _co2_migration}/_utilities/initialization.py

@@ -17,24 +17,26 @@ from webviz_subsurface._providers.ensemble_polygon_provider import PolygonServer
 from webviz_subsurface._providers.ensemble_surface_provider._surface_discovery import (
     discover_per_realization_surface_files,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.containment_data_provider import (
+from webviz_subsurface.plugins._co2_migration._utilities.containment_data_provider import (
     ContainmentDataProvider,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.ensemble_well_picks import (
+from webviz_subsurface.plugins._co2_migration._utilities.ensemble_well_picks import (
     EnsembleWellPicks,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.generic import (
+from webviz_subsurface.plugins._co2_migration._utilities.generic import (
     BoundarySettings,
     FilteredMapAttribute,
     GraphSource,
     MapAttribute,
     MapNamingConvention,
+    MapType,
     MenuOptions,
+    PhasesScenario,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.polygon_handler import (
+from webviz_subsurface.plugins._co2_migration._utilities.polygon_handler import (
     PolygonHandler,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.unsmry_data_provider import (
+from webviz_subsurface.plugins._co2_migration._utilities.unsmry_data_provider import (
     UnsmryDataProvider,
 )
 
@@ -46,6 +48,25 @@ LOGGER_TO_SUPPRESS.setLevel(logging.ERROR)  # We replace the given warning with
 WARNING_THRESHOLD_CSV_FILE_SIZE_MB = 100.0
 
 
+def resolve_mapattribute_name(
+    attr_value: str, scenario: PhasesScenario
+) -> Optional[str]:
+    candidates = [
+        name
+        for name, member in MapNamingConvention.__members__.items()
+        if member.value == attr_value
+    ]
+    if not candidates:
+        return None
+    if len(candidates) == 1:
+        return candidates[0]
+    if scenario == PhasesScenario.THREE_PHASES:
+        for m in candidates:
+            if m.endswith("3PHASES"):
+                return m
+    return candidates[0]
+
+
 def build_mapping(
     webviz_settings: WebvizSettings,
     ensembles: List[str],
@@ -65,12 +86,26 @@ def build_mapping(
         unique_attributes.update(ens_attr)
     unique_attributes_list = list(unique_attributes)
     mapping = {}
+    scenario = PhasesScenario.TWO_PHASES
+    # NBNB: Solution for Cirrus realizations, not yet clear for Eclipse
+    if any("mfs" in item for item in unique_attributes_list):
+        scenario = PhasesScenario.THREE_PHASES
     for attr in unique_attributes_list:
-        for name_convention in MapNamingConvention:
-            if attr == name_convention.value:
-                attribute_key = MapAttribute[name_convention.name].name
-                mapping[attribute_key] = attr
-                break
+        matched_name = resolve_mapattribute_name(attr, scenario)
+        if not matched_name:
+            continue
+        if scenario == PhasesScenario.THREE_PHASES and any(
+            g in attr for g in ["sgas", "amfg"]
+        ):
+            LOGGER.info(
+                f"Map '{attr}' is available, but since the scenario is not saline aquifer,"
+                f" neither SGAS nor AMFG are informative about presence of CO2."
+                f" If either of these properties is still of interest, they can be"
+                f" explicitly requested via 'map_attribute_names' in the config file"
+            )
+            continue
+        attribute_key = MapAttribute[matched_name].name
+        mapping[attribute_key] = attr
     return mapping
 
 
@@ -109,6 +144,34 @@ def init_surface_providers(
     }
 
 
+def init_dates_per_ensemble(
+    ensembles: List[str],
+    attribute_names: FilteredMapAttribute,
+    surface_providers: Dict[str, EnsembleSurfaceProvider],
+) -> Dict[str, List[str]]:
+    ensemble_dates: Dict[str, List[str]] = {}
+    for ens in ensembles:
+        surface_provider = surface_providers[ens]
+        dated_attributes = [
+            k
+            for k in attribute_names.filtered_values
+            if MapType[k.name].value != "MIGRATION_TIME"
+        ]
+        if len(dated_attributes) == 0:
+            ensemble_dates[ens] = []
+        else:
+            date_map_attribute = dated_attributes[0]
+            att_name = attribute_names[date_map_attribute]
+            dates = surface_provider.surface_dates_for_attribute(att_name)
+            if dates is None:
+                raise ValueError(
+                    f"Failed to fetch dates in ensemble {ens} "
+                    f"for attribute '{att_name}'"
+                )
+            ensemble_dates[ens] = dates
+    return ensemble_dates
+
+
 def init_well_pick_provider(
     ensemble_paths: Dict[str, str],
     well_pick_path: Optional[str],

webviz_subsurface/plugins/{_co2_leakage → _co2_migration}/_utilities/polygon_handler.py

@@ -7,7 +7,7 @@ from webviz_subsurface._providers.ensemble_polygon_provider import (
 from webviz_subsurface._providers.ensemble_polygon_provider.ensemble_polygon_provider import (
     PolygonsAddress,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.generic import BoundarySettings
+from webviz_subsurface.plugins._co2_migration._utilities.generic import BoundarySettings
 
 
 class PolygonHandler:

webviz_subsurface/plugins/{_co2_leakage → _co2_migration}/_utilities/summary_graphs.py

@@ -4,14 +4,14 @@ import numpy as np
 import plotly.colors
 import plotly.graph_objects as go
 
-from webviz_subsurface.plugins._co2_leakage._utilities.containment_data_provider import (
+from webviz_subsurface.plugins._co2_migration._utilities.containment_data_provider import (
     ContainmentDataProvider,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.generic import (
+from webviz_subsurface.plugins._co2_migration._utilities.generic import (
     Co2MassScale,
     Co2VolumeScale,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.unsmry_data_provider import (
+from webviz_subsurface.plugins._co2_migration._utilities.unsmry_data_provider import (
     UnsmryDataProvider,
 )
 
@@ -33,8 +33,8 @@ def generate_summary_figure(
     unsmry_last_mobile = df_unsmry[df_unsmry.REAL == r_min][
         unsmry_provider.colname_mobile
     ].iloc[-1]
-    unsmry_last_dissolved = df_unsmry[df_unsmry.REAL == r_min][
-        unsmry_provider.colname_dissolved
+    unsmry_last_dissolved_water = df_unsmry[df_unsmry.REAL == r_min][
+        unsmry_provider.colname_dissolved_water
     ].iloc[-1]
 
     containment_reference = df_containment[df_containment.REAL == r_min]
@@ -44,8 +44,8 @@ def generate_summary_figure(
     containment_last_mobile = containment_reference[
         containment_reference["phase"] == "free_gas"
     ]["amount"].iloc[-1]
-    containment_last_dissolved = containment_reference[
-        containment_reference["phase"] == "dissolved"
+    containment_last_dissolved_water = containment_reference[
+        containment_reference["phase"] == "dissolved_water"
     ]["amount"].iloc[-1]
     # ---
     last_total_err_percentage = (
@@ -54,19 +54,21 @@ def generate_summary_figure(
     last_mobile_err_percentage = (
         100.0 * abs(containment_last_mobile - unsmry_last_mobile) / unsmry_last_mobile
     )
-    last_dissolved_err_percentage = (
+    last_dissolved_water_err_percentage = (
         100.0
-        * abs(containment_last_dissolved - unsmry_last_dissolved)
-        / unsmry_last_dissolved
+        * abs(containment_last_dissolved_water - unsmry_last_dissolved_water)
+        / unsmry_last_dissolved_water
     )
     last_total_err_percentage = np.round(last_total_err_percentage, 2)
     last_mobile_err_percentage = np.round(last_mobile_err_percentage, 2)
-    last_dissolved_err_percentage = np.round(last_dissolved_err_percentage, 2)
+    last_dissolved_water_err_percentage = np.round(
+        last_dissolved_water_err_percentage, 2
+    )
 
     _colors = {
         "total": plotly.colors.qualitative.Plotly[3],
         "mobile": plotly.colors.qualitative.Plotly[2],
-        "dissolved": plotly.colors.qualitative.Plotly[0],
+        "dissolved_water": plotly.colors.qualitative.Plotly[0],
         "trapped": plotly.colors.qualitative.Plotly[1],
     }
 
@@ -93,12 +95,12 @@ def generate_summary_figure(
         )
         fig.add_scatter(
             x=sub_df[unsmry_provider.colname_date],
-            y=sub_df[unsmry_provider.colname_dissolved],
-            name=f"UNSMRY ({unsmry_provider.colname_dissolved})",
-            legendgroup="dissolved",
-            legendgrouptitle_text=f"Dissolved ({last_dissolved_err_percentage} %)",
+            y=sub_df[unsmry_provider.colname_dissolved_water],
+            name=f"UNSMRY ({unsmry_provider.colname_dissolved_water})",
+            legendgroup="dissolved_water",
+            legendgrouptitle_text=f"Dissolved in water ({last_dissolved_water_err_percentage} %)",
             showlegend=showlegend,
-            marker_color=_colors["dissolved"],
+            marker_color=_colors["dissolved_water"],
         )
         fig.add_scatter(
             x=sub_df[unsmry_provider.colname_date],
@@ -114,7 +116,7 @@ def generate_summary_figure(
     _col_names = {
         "total": "total",
         "free_gas": "mobile",
-        "dissolved": "dissolved",
+        "dissolved_water": "dissolved_water",
         "trapped_gas": "trapped",
     }
 

webviz_subsurface/plugins/{_co2_leakage → _co2_migration}/_utilities/surface_publishing.py

@@ -11,17 +11,17 @@ from webviz_subsurface._providers import (
     SimulatedSurfaceAddress,
     StatisticalSurfaceAddress,
     SurfaceAddress,
-    SurfaceImageMeta,
-    SurfaceImageServer,
+    SurfaceArrayMeta,
+    SurfaceArrayServer,
 )
 from webviz_subsurface._providers.ensemble_surface_provider.ensemble_surface_provider import (
     SurfaceStatistic,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.generic import (
+from webviz_subsurface.plugins._co2_migration._utilities.generic import (
     FilteredMapAttribute,
     MapType,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.plume_extent import (
+from webviz_subsurface.plugins._co2_migration._utilities.plume_extent import (
     truncate_surfaces,
 )
 
@@ -43,17 +43,17 @@ class TruncatedSurfaceAddress:
 
 
 def publish_and_get_surface_metadata(
-    server: SurfaceImageServer,
+    server: SurfaceArrayServer,
     provider: EnsembleSurfaceProvider,
     address: Union[SurfaceAddress, TruncatedSurfaceAddress],
     visualization_info: Dict[str, Any],
     map_attribute_names: FilteredMapAttribute,
-) -> Tuple[Optional[SurfaceImageMeta], Optional[str], Optional[Any]]:
+) -> Tuple[Optional[SurfaceArrayMeta], Optional[str], Optional[Any]]:
     if isinstance(address, TruncatedSurfaceAddress):
-        return (
-            *_publish_and_get_truncated_surface_metadata(server, provider, address),
-            None,
+        meta, partial_url = _publish_and_get_truncated_surface_metadata(
+            server, provider, address
         )
+        return meta, partial_url, None
     address_map_attribute = next(
         (
             key
@@ -66,14 +66,12 @@ def publish_and_get_surface_metadata(
     if MapType[address_map_attribute.name].value == "MIGRATION_TIME" and isinstance(
         address, StatisticalSurfaceAddress
     ):
-        return (
-            *_publish_and_get_statistical_time_surface_metadata(
-                server,
-                provider,
-                address,
-            ),
-            None,
+        meta, partial_url = _publish_and_get_statistical_time_surface_metadata(
+            server,
+            provider,
+            address,
         )
+        return meta, partial_url, None
     provider_id: str = provider.provider_id()
     qualified_address = QualifiedSurfaceAddress(provider_id, address)
     surf_meta = server.get_surface_metadata(qualified_address)
@@ -105,10 +103,10 @@ def publish_and_get_surface_metadata(
 
 
 def _publish_and_get_truncated_surface_metadata(
-    server: SurfaceImageServer,
+    server: SurfaceArrayServer,
     provider: EnsembleSurfaceProvider,
     address: TruncatedSurfaceAddress,
-) -> Tuple[Optional[SurfaceImageMeta], str]:
+) -> Tuple[Optional[SurfaceArrayMeta], str]:
     qualified_address = QualifiedSurfaceAddress(
         provider.provider_id(),
         # TODO: Should probably use a dedicated address type for this. Statistical surface
@@ -159,10 +157,10 @@ def _generate_surface(
 
 
 def _publish_and_get_statistical_time_surface_metadata(
-    server: SurfaceImageServer,
+    server: SurfaceArrayServer,
     provider: EnsembleSurfaceProvider,
     address: StatisticalSurfaceAddress,
-) -> Tuple[Optional[SurfaceImageMeta], str]:
+) -> Tuple[Optional[SurfaceArrayMeta], str]:
     qualified_address = QualifiedSurfaceAddress(
         provider.provider_id(),
         StatisticalSurfaceAddress(

webviz_subsurface/plugins/{_co2_leakage → _co2_migration}/_utilities/unsmry_data_provider.py

@@ -3,13 +3,13 @@ from typing import Tuple, Union
 import pandas as pd
 
 from webviz_subsurface._providers import EnsembleTableProvider
-from webviz_subsurface.plugins._co2_leakage._utilities.generic import (
+from webviz_subsurface.plugins._co2_migration._utilities.generic import (
     Co2MassScale,
     Co2VolumeScale,
     MenuOptions,
 )
 
-_PFLOTRAN_COLNAMES = ("DATE", "FGMDS", "FGMTR", "FGMGP")
+_PFLOTRAN_COLNAMES = ("DATE", "FGMDS", "FGMTR", "FGMMO")
 _ECLIPSE_COLNAMES = ("DATE", "FWCD", "FGCDI", "FGCDM")
 
 
@@ -23,7 +23,7 @@ class UnsmryDataProvider:
         self._provider = provider
         (
             self._colname_date,
-            self._colname_dissolved,
+            self._colname_dissolved_water,
             self._colname_trapped,
             self._colname_mobile,
         ) = UnsmryDataProvider._column_subset_unsmry(provider)
@@ -34,7 +34,7 @@ class UnsmryDataProvider:
         return {
             "zones": [],
             "regions": [],
-            "phases": ["total", "gas", "dissolved"],
+            "phases": ["total", "gas", "dissolved_water"],  ##NB: Split gas?
             "plume_groups": [],
             "dates": [],
         }
@@ -44,8 +44,8 @@ class UnsmryDataProvider:
         return self._colname_date
 
     @property
-    def colname_dissolved(self) -> str:
-        return self._colname_dissolved
+    def colname_dissolved_water(self) -> str:
+        return self._colname_dissolved_water
 
     @property
     def colname_trapped(self) -> str:
@@ -62,7 +62,7 @@ class UnsmryDataProvider:
     def extract(self, scale: Union[Co2MassScale, Co2VolumeScale]) -> pd.DataFrame:
         columns = [
             self._colname_date,
-            self._colname_dissolved,
+            self._colname_dissolved_water,
             self._colname_trapped,
             self._colname_mobile,
         ]
@@ -73,7 +73,7 @@ class UnsmryDataProvider:
             ]
         )
         full[self._colname_total] = (
-            full[self._colname_dissolved]
+            full[self._colname_dissolved_water]
             + full[self._colname_trapped]
             + full[self.colname_mobile]
         )

webviz_subsurface/plugins/{_co2_leakage → _co2_migration}/views/mainview/mainview.py

@@ -8,7 +8,10 @@ from webviz_config.utils import StrEnum
 from webviz_config.webviz_plugin_subclasses import ViewABC, ViewElementABC
 from webviz_subsurface_components import SubsurfaceViewer
 
-from webviz_subsurface.plugins._co2_leakage._types import LegendData
+from webviz_subsurface.plugins._co2_migration._types import LegendData
+from webviz_subsurface.plugins._co2_migration._utilities.containment_info import (
+    MainTabOption,
+)
 
 
 class MainView(ViewABC):
@@ -35,6 +38,9 @@ class MapViewElement(ViewElementABC):
         TOP_ELEMENT = "top-element"
         BOTTOM_ELEMENT = "bottom-element"
         LEGEND_DATA_STORE = "legend-data-store"
+        SUMMARY_TABS = "summary-tabs"
+        CSV_EXPORT_BUTTON = "csv-export-button"
+        DOWNLOAD_CSV = "download-csv"
 
     def __init__(
         self, color_scales: List[Dict[str, Any]], content: Dict[str, bool]
@@ -105,6 +111,15 @@ class MapViewElement(ViewElementABC):
                                 self.register_component_unique_id(
                                     self.Ids.STATISTICS_PLOT
                                 ),
+                                self.register_component_unique_id(
+                                    self.Ids.CSV_EXPORT_BUTTON
+                                ),
+                                self.register_component_unique_id(
+                                    self.Ids.DOWNLOAD_CSV
+                                ),
+                                self.register_component_unique_id(
+                                    self.Ids.SUMMARY_TABS
+                                ),
                             )
                         ),
                     ],
@@ -157,57 +172,96 @@ def _summary_graph_layout(
     bar_plot_id: str,
     time_plot_id: str,
     statistics_plot_id: str,
+    csv_export_button_id: str,
+    download_csv_id: str,
+    summary_tabs_id: str,
 ) -> List:
     return [
-        wcc.Tabs(
-            id="TAB",
-            value="tab-1",
-            children=[
-                wcc.Tab(
-                    label="Containment state",
-                    value="tab-1",
-                    children=[
-                        html.Div(
-                            wcc.Graph(
-                                id=bar_plot_id,
-                                figure=go.Figure(),
-                                config={
-                                    "displayModeBar": False,
-                                },
-                            ),
-                        ),
-                    ],
+        html.Div(
+            [
+                html.Button(
+                    "↓",
+                    id=csv_export_button_id,
+                    title="Export data in current plot to a CSV file",
+                    style={
+                        "position": "absolute",
+                        "bottom": "5px",
+                        "right": "5px",
+                        "backgroundColor": "#F4F4F4",
+                        "border": "1px solid #B0B0B0",
+                        "color": "#606060",
+                        "padding": "0",
+                        "borderRadius": "4px",
+                        "zIndex": "1000",  # Make sure it appears on top
+                        "fontSize": "18px",
+                        "fontWeight": "bold",
+                        "display": "flex",
+                        "alignItems": "center",  # Vertical centering
+                        "justifyContent": "center",  # Horizontal centering
+                        "lineHeight": "1",  # Prevents extra line spacing
+                        "textAlign": "center",
+                        "width": "32px",
+                        "height": "32px",
+                        "fontFamily": "Arial, sans-serif",
+                    },
                 ),
-                wcc.Tab(
-                    label="Containment over time",
-                    value="tab-2",
+                wcc.Tabs(
+                    id=summary_tabs_id,
+                    value=MainTabOption.CONTAINMENT_STATE,
                     children=[
-                        html.Div(
-                            wcc.Graph(
-                                id=time_plot_id,
-                                figure=go.Figure(),
-                                config={
-                                    "displayModeBar": False,
-                                },
-                            ),
+                        wcc.Tab(
+                            label="Containment state",
+                            value=MainTabOption.CONTAINMENT_STATE,
+                            children=[
+                                html.Div(
+                                    wcc.Graph(
+                                        id=bar_plot_id,
+                                        figure=go.Figure(),
+                                        config={
+                                            "displayModeBar": False,
+                                        },
+                                    ),
+                                ),
+                            ],
                         ),
-                    ],
-                ),
-                wcc.Tab(
-                    label="Statistics",
-                    value="tab-3",
-                    children=[
-                        html.Div(
-                            wcc.Graph(
-                                id=statistics_plot_id,
-                                figure=go.Figure(),
-                                config={
-                                    "displayModeBar": False,
-                                },
-                            ),
+                        wcc.Tab(
+                            label="Containment over time",
+                            value=MainTabOption.CONTAINMENT_OVER_TIME,
+                            children=[
+                                html.Div(
+                                    wcc.Graph(
+                                        id=time_plot_id,
+                                        figure=go.Figure(),
+                                        config={
+                                            "displayModeBar": False,
+                                        },
+                                    ),
+                                ),
+                            ],
+                        ),
+                        wcc.Tab(
+                            label="Statistics",
+                            value=MainTabOption.STATISTICS,
+                            children=[
+                                html.Div(
+                                    wcc.Graph(
+                                        id=statistics_plot_id,
+                                        figure=go.Figure(),
+                                        config={
+                                            "displayModeBar": False,
+                                        },
+                                    ),
+                                ),
+                            ],
                         ),
                     ],
                 ),
             ],
+            style={
+                "position": "relative",
+                "height": "100%",
+                "width": "100%",
+            },
         ),
+        dcc.Download(id=download_csv_id),
     ]

webviz_subsurface/plugins/{_co2_leakage → _co2_migration}/views/mainview/settings.py

@@ -12,11 +12,13 @@ from webviz_subsurface._providers.ensemble_surface_provider.ensemble_surface_pro
     EnsembleSurfaceProvider,
     SurfaceStatistic,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.callbacks import property_origin
-from webviz_subsurface.plugins._co2_leakage._utilities.containment_info import (
+from webviz_subsurface.plugins._co2_migration._utilities.callbacks import (
+    property_origin,
+)
+from webviz_subsurface.plugins._co2_migration._utilities.containment_info import (
     StatisticsTabOption,
 )
-from webviz_subsurface.plugins._co2_leakage._utilities.generic import (
+from webviz_subsurface.plugins._co2_migration._utilities.generic import (
     Co2MassScale,
     Co2VolumeScale,
     FilteredMapAttribute,
@@ -1350,13 +1352,13 @@ class FeedbackLayout(wcc.Dialog):
             open=False,
             children=[
                 dcc.Markdown(
-                    """If you have any feedback regarding the CO2-Leakage application,
+                    """If you have any feedback regarding the CO2-Migration application,
                     don't hesitate to"""
                 ),
                 dcc.Link(
                     ["send an email!"],
                     href=f"mailto:{get_emails()}&subject=Feedback regarding the "
-                    f"CO2-Leakage application",
+                    f"CO2-Migration application",
                     target="_blank",
                     style={"float": "left"},
                 ),

webviz_subsurface/plugins/_map_viewer_fmu/layout.py

@@ -810,7 +810,7 @@ def update_map_layers(
                     "name": LayerNames.FAULTPOLYGONS,
                     "id": f"{LayoutElements.FAULTPOLYGONS_LAYER}-{idx}",
                     "visible": visible_fault_polygons_layer,
-                    "parameters": {"depthTest": False},
+                    "depthTest": False,
                 }
             )
         layers.append(
@@ -818,6 +818,7 @@ def update_map_layers(
                 "@@type": LayerTypes.FIELD_OUTLINE,
                 "id": f"{LayoutElements.FIELD_OUTLINE_LAYER}-{idx}",
                 "data": {"type": "FeatureCollection", "features": []},
+                "parameters": {"depthTest": False},
             }
         )
         if include_well_layer:

{webviz_subsurface-0.2.40.dist-info → webviz_subsurface-0.2.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webviz-subsurface
-Version: 0.2.40
+Version: 0.2.42
 Summary: Webviz config plugins for subsurface data
 Author: R&T Equinor
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -712,8 +712,8 @@ Requires-Dist: pillow>=6.1
 Requires-Dist: pyarrow>=5.0.0
 Requires-Dist: pyjwt>=2.6.0
 Requires-Dist: pyscal>=0.7.5
-Requires-Dist: scipy>=1.2
-Requires-Dist: statsmodels>=0.12.1
+Requires-Dist: scipy>=1.16
+Requires-Dist: statsmodels>=0.14.5
 Requires-Dist: xtgeo>=2.20.0
 Requires-Dist: vtk>=9.2.2
 Requires-Dist: webviz-config>=0.6.5