Merge branch 'master' into group_tree_dataprovider

equinor · Jan 13, 2022 · c325a1d · c325a1d
2 parents 19d800e + ab38a56
commit c325a1d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,15 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [UNRELEASED] - YYYY-MM-DD
-### Added
-- [#880](https://github.com/equinor/webviz-subsurface/pull/880) - Show hover information for uncertainty envelope in `StructuralUncertainty`.
+
+## [0.2.9] - 2022-01-06
 
 ### Fixed
 
 - [#888](https://github.com/equinor/webviz-subsurface/pull/888) - Improved `SeismicMisfit` performance when using polygon files with a large number of polygons.
+- [#911](https://github.com/equinor/webviz-subsurface/pull/911) - Handle ensembles with missing surface folders in `PropertyStatistics`.
 
 ### Added
 
+- [#880](https://github.com/equinor/webviz-subsurface/pull/880) - Show hover information for uncertainty envelope in `StructuralUncertainty`.
 - [#883](https://github.com/equinor/webviz-subsurface/pull/883) - Added `Statistics + Realizations`-plot for New `SimulationTimeSeries` plugin. Includes filtering of realizations and selection to calculate statistics from all realizations or selected subset of realizations. Updated visualization mode included in user download data.
 - [#867](https://github.com/equinor/webviz-subsurface/pull/867) - Added new `SimulationTimeSeries` plugin, with code structure according to best practice plugin example `webviz-plugin-boilerplate` and usage of `EnsembleSummaryProvider`. New functionality as multiple Delta Ensembles in same plot, selectable resampling frequency and possibility to group subplots per selected ensemble or per selected vector.
 - [#884](https://github.com/equinor/webviz-subsurface/pull/884) - Added a new tab to the `RFTPlotter` plugin, with functionality to analyse RFT pressure responses to parameters.

diff --git a/setup.py b/setup.py
@@ -94,7 +94,7 @@
         "pyscal>=0.7.5",
         "scipy>=1.2",
         "statsmodels>=0.12.1",  # indirect dependency through https://plotly.com/python/linear-fits/
-        "webviz-config>=0.3.1",
+        "webviz-config>=0.3.8",
         "webviz-core-components>=0.5.1",
         "webviz-subsurface-components>=0.4.8",
         "xtgeo>=2.14",

diff --git a/webviz_subsurface/plugins/_property_statistics/utils/surface.py b/webviz_subsurface/plugins/_property_statistics/utils/surface.py
@@ -49,7 +49,7 @@ def generate_surface_table(
                     zone_in_file = surface_renaming.get(zone, zone)
                     prop_in_file = surface_renaming.get(prop, prop)
                     path = (
-                        surface_folders[ensemble]
+                        surface_folders.get(ensemble, pathlib.Path())
                         / statistic
                         / f"{zone_in_file}--{prop_in_file}.gri"
                     )

diff --git a/webviz_subsurface/plugins/_simulation_time_series/_callbacks.py b/webviz_subsurface/plugins/_simulation_time_series/_callbacks.py
@@ -320,15 +320,8 @@ def _update_graph(
                     )
                 if visualization == VisualizationOptions.STATISTICS_AND_REALIZATIONS:
                     # Configure line width and color scaling to easier separate
-                    # statistics traces and realization traces
-                    vectors_statistics_df = create_vectors_statistics_df(vectors_df)
-                    figure_builder.add_statistics_traces(
-                        vectors_statistics_df,
-                        ensemble,
-                        statistics_options,
-                        line_width=3,
-                    )
-                    # Show selected realizations on top - only filter df if realizations filter
+                    # statistics traces and realization traces.
+                    # Show selected realizations - only filter df if realizations filter
                     # query is not performed
                     figure_builder.add_realizations_traces(
                         vectors_df
@@ -337,6 +330,14 @@ def _update_graph(
                         ensemble,
                         color_lightness_scale=150.0,
                     )
+                    # Add statistics on top
+                    vectors_statistics_df = create_vectors_statistics_df(vectors_df)
+                    figure_builder.add_statistics_traces(
+                        vectors_statistics_df,
+                        ensemble,
+                        statistics_options,
+                        line_width=3,
+                    )
 
         # Retrieve selected input providers
         selected_input_providers = ProviderSet(