webviz-subsurface 0.2.30__py3-none-any.whl → 0.2.31__py3-none-any.whl

webviz_subsurface/plugins/_co2_leakage/_utilities/generic.py

@@ -2,7 +2,8 @@ from webviz_subsurface._utils.enum_shim import StrEnum
 
 
 class MapAttribute(StrEnum):
-    MIGRATION_TIME = "Migration Time"
+    MIGRATION_TIME_SGAS = "Migration time (SGAS)"
+    MIGRATION_TIME_AMFG = "Migration time (AMFG)"
     MAX_SGAS = "Maximum SGAS"
     MAX_AMFG = "Maximum AMFG"
     SGAS_PLUME = "Plume (SGAS)"
@@ -69,9 +70,3 @@ class LayoutStyle:
         "line-height": "30px",
         "background-color": "lightgrey",
     }
-
-
-class ContainmentViews(StrEnum):
-    CONTAINMENTSPLIT = "Split into containment polygons"
-    ZONESPLIT = "Split into zones"
-    REGIONSPLIT = "Split into regions"

webviz_subsurface/plugins/_co2_leakage/_utilities/initialization.py

@@ -15,7 +15,7 @@ from webviz_subsurface._providers import (
 )
 from webviz_subsurface._utils.webvizstore_functions import read_csv
 from webviz_subsurface.plugins._co2_leakage._utilities.co2volume import (
-    read_zone_and_region_options,
+    read_menu_options,
 )
 from webviz_subsurface.plugins._co2_leakage._utilities.generic import (
     GraphSource,
@@ -35,7 +35,8 @@ def init_map_attribute_names(
     if mapping is None:
         # Based on name convention of xtgeoapp_grd3dmaps:
         return {
-            MapAttribute.MIGRATION_TIME: "migrationtime",
+            MapAttribute.MIGRATION_TIME_SGAS: "migrationtime_sgas",
+            MapAttribute.MIGRATION_TIME_AMFG: "migrationtime_amfg",
             MapAttribute.MAX_SGAS: "max_sgas",
             MapAttribute.MAX_AMFG: "max_amfg",
             MapAttribute.MASS: "co2-mass-total",
@@ -118,25 +119,28 @@ def _find_max_file_size_mb(ens_path: str, table_rel_path: str) -> float:
     return max_size
 
 
-def init_zone_and_region_options(
+def init_menu_options(
     ensemble_roots: Dict[str, str],
     mass_table: Dict[str, EnsembleTableProvider],
     actual_volume_table: Dict[str, EnsembleTableProvider],
-    ensemble_provider: Dict[str, EnsembleSurfaceProvider],
+    mass_relpath: str,
+    volume_relpath: str,
 ) -> Dict[str, Dict[str, Dict[str, List[str]]]]:
     options: Dict[str, Dict[str, Dict[str, List[str]]]] = {}
     for ens in ensemble_roots.keys():
         options[ens] = {}
-        real = ensemble_provider[ens].realizations()[0]
-        for source, table in zip(
+        for source, table, relpath in zip(
             [GraphSource.CONTAINMENT_MASS, GraphSource.CONTAINMENT_ACTUAL_VOLUME],
             [mass_table, actual_volume_table],
+            [mass_relpath, volume_relpath],
         ):
-            try:
-                options[ens][source] = read_zone_and_region_options(table[ens], real)
-            except KeyError:
-                options[ens][source] = {"zones": [], "regions": []}
-        options[ens][GraphSource.UNSMRY] = {"zones": [], "regions": []}
+            real = table[ens].realizations()[0]
+            options[ens][source] = read_menu_options(table[ens], real, relpath)
+        options[ens][GraphSource.UNSMRY] = {
+            "zones": [],
+            "regions": [],
+            "phases": ["total", "gas", "aqueous"],
+        }
     return options
 
 

webviz_subsurface/plugins/_co2_leakage/_utilities/surface_publishing.py

@@ -1,3 +1,4 @@
+import warnings
 from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Tuple, Union
 
@@ -44,7 +45,7 @@ def publish_and_get_surface_metadata(
     address: Union[SurfaceAddress, TruncatedSurfaceAddress],
     visualization_info: Dict[str, Any],
     map_attribute_names: Dict[MapAttribute, str],
-) -> Tuple[Optional[SurfaceImageMeta], str, Optional[Any]]:
+) -> Tuple[Optional[SurfaceImageMeta], Optional[str], Optional[Any]]:
     if isinstance(address, TruncatedSurfaceAddress):
         return _publish_and_get_truncated_surface_metadata(server, provider, address)
     provider_id: str = provider.provider_id()
@@ -53,9 +54,13 @@ def publish_and_get_surface_metadata(
     summed_mass = None
     if not surf_meta:
         # This means we need to compute the surface
-        surface = provider.get_surface(address)
+        try:
+            surface = provider.get_surface(address)
+        except ValueError:
+            surface = None
         if not surface:
-            raise ValueError(f"Could not get surface for address: {address}")
+            warnings.warn(f"Could not find surface file with properties: {address}")
+            return None, None, None
         if address.attribute in [
             map_attribute_names[MapAttribute.MASS],
             map_attribute_names[MapAttribute.FREE],
@@ -64,7 +69,11 @@ def publish_and_get_surface_metadata(
             surface.values = surface.values / SCALE_DICT[visualization_info["unit"]]
         summed_mass = np.ma.sum(surface.values)
         if (
-            address.attribute != map_attribute_names[MapAttribute.MIGRATION_TIME]
+            address.attribute
+            not in [
+                map_attribute_names[MapAttribute.MIGRATION_TIME_SGAS],
+                map_attribute_names[MapAttribute.MIGRATION_TIME_AMFG],
+            ]
             and visualization_info["threshold"] >= 0
         ):
             surface.operation("elile", visualization_info["threshold"])

webviz_subsurface/plugins/_co2_leakage/views/mainview/mainview.py

@@ -27,6 +27,11 @@ class MapViewElement(ViewElementABC):
         BAR_PLOT = "bar-plot"
         TIME_PLOT = "time-plot"
         TIME_PLOT_ONE_REAL = "time-plot-one-realization"
+        BAR_PLOT_ORDER = "bar-plot-order"
+        CONTAINMENT_COLORS = "containment-order"
+        SIZE_SLIDER = "size-slider"
+        TOP_ELEMENT = "top-element"
+        BOTTOM_ELEMENT = "bottom-element"
 
     def __init__(self, color_scales: List[Dict[str, Any]]) -> None:
         super().__init__()
@@ -37,6 +42,7 @@ class MapViewElement(ViewElementABC):
             [
                 wcc.Frame(
                     # id=self.register_component_unique_id(LayoutElements.MAP_VIEW),
+                    id=self.register_component_unique_id(self.Ids.TOP_ELEMENT),
                     color="white",
                     highlight=False,
                     children=[
@@ -54,8 +60,8 @@ class MapViewElement(ViewElementABC):
                                 ),
                             ],
                             style={
-                                "padding": "1vh",
-                                "height": "37vh",
+                                "padding": "1%",
+                                "height": "80%",
                                 "position": "relative",
                             },
                         ),
@@ -72,28 +78,52 @@ class MapViewElement(ViewElementABC):
                         ),
                     ],
                     style={
-                        "height": "47vh",
+                        "height": "43vh",
                     },
                 ),
                 wcc.Frame(
                     # id=get_uuid(LayoutElements.PLOT_VIEW),
+                    id=self.register_component_unique_id(self.Ids.BOTTOM_ELEMENT),
                     style={
-                        "height": "33vh",
-                        "display": "flex",
-                        "flexDirection": "row",
-                        "justifyContent": "space-evenly",
+                        "height": "37vh",
+                    },
+                    children=[
+                        html.Div(
+                            _summary_graph_layout(
+                                self.register_component_unique_id(self.Ids.BAR_PLOT),
+                                self.register_component_unique_id(self.Ids.TIME_PLOT),
+                                self.register_component_unique_id(
+                                    self.Ids.TIME_PLOT_ONE_REAL
+                                ),
+                            )
+                        ),
+                    ],
+                ),
+                html.Div(
+                    [
+                        wcc.Slider(
+                            id=self.register_component_unique_id(self.Ids.SIZE_SLIDER),
+                            min=1,
+                            max=79,
+                            step=2,
+                            value=37,
+                            vertical=False,
+                            marks={
+                                # 1: "Top",
+                                37: "Drag to scale the size of the containment plots",
+                                # 79: "Bottom",
+                            },
+                        ),
+                    ],
+                    style={
+                        "width": "100%",
                     },
-                    children=_summary_graph_layout(
-                        self.register_component_unique_id(self.Ids.BAR_PLOT),
-                        self.register_component_unique_id(self.Ids.TIME_PLOT),
-                        self.register_component_unique_id(self.Ids.TIME_PLOT_ONE_REAL),
-                    ),
                 ),
             ],
             style={
-                "flex": 3,
                 "display": "flex",
                 "flexDirection": "column",
+                "height": "90vh",
             },
         )
 
@@ -104,25 +134,55 @@ def _summary_graph_layout(
     time_plot_one_realization_id: str,
 ) -> List:
     return [
-        wcc.Graph(
-            id=bar_plot_id,
-            figure=go.Figure(),
-            config={
-                "displayModeBar": False,
-            },
-        ),
-        wcc.Graph(
-            id=time_plot_id,
-            figure=go.Figure(),
-            config={
-                "displayModeBar": False,
-            },
-        ),
-        wcc.Graph(
-            id=time_plot_one_realization_id,
-            figure=go.Figure(),
-            config={
-                "displayModeBar": False,
-            },
+        wcc.Tabs(
+            id="TAB",
+            value="tab-1",
+            children=[
+                wcc.Tab(
+                    label="End-state containment (all realizations)",
+                    value="tab-1",
+                    children=[
+                        html.Div(
+                            wcc.Graph(
+                                id=bar_plot_id,
+                                figure=go.Figure(),
+                                config={
+                                    "displayModeBar": False,
+                                },
+                            ),
+                        ),
+                    ],
+                ),
+                wcc.Tab(
+                    label="Containment over time (all realizations)",
+                    value="tab-2",
+                    children=[
+                        html.Div(
+                            wcc.Graph(
+                                id=time_plot_id,
+                                figure=go.Figure(),
+                                config={
+                                    "displayModeBar": False,
+                                },
+                            ),
+                        ),
+                    ],
+                ),
+                wcc.Tab(
+                    label="Containment over time (one realization)",
+                    value="tab-3",
+                    children=[
+                        html.Div(
+                            wcc.Graph(
+                                id=time_plot_one_realization_id,
+                                figure=go.Figure(),
+                                config={
+                                    "displayModeBar": False,
+                                },
+                            ),
+                        ),
+                    ],
+                ),
+            ],
         ),
     ]