resqpy 4.18.7__py3-none-any.whl → 4.18.8__py3-none-any.whl

resqpy/__init__.py

@@ -28,6 +28,6 @@
 
 import logging
 
-__version__ = "4.18.7"  # Set at build time
+__version__ = "4.18.8"  # Set at build time
 log = logging.getLogger(__name__)
 log.info(f"Imported resqpy version {__version__}")

resqpy/grid/_grid.py

@@ -1498,7 +1498,7 @@ class Grid(BaseResqpy):
         """
         return z_corner_point_depths(self, order = order)
 
-    def frontier(self, set_z_zero = True, title = None, add_as_part = True):
+    def frontier(self, set_z_zero = True, title = None, add_as_part = True, mode = 'mean'):
         """Returns a frontier polygon (closed polyline) based on midpoints of edge coordinate lines, with z set to zero.
         
         arguments:
@@ -1507,35 +1507,59 @@ class Grid(BaseResqpy):
             - title (str, optional): the citation title for the polyline; if None, one is generated using the grid title
             - add_as_part (bool default True): if True, the xml is created for the polyline and it is added as a part to
               the model; if False, the create_xml() method is not called fot the polyline
-              
+            - mode (str, default 'mean'): one of 'mean', 'top', 'base', 'inner', 'outer' determining how a non-vertical
+              edge coordinate line is converted to a point to include in the frontier
+
         returns:
             - closed Polyline representing the frontier of the grid in plan view
         """
+
+        def get_point(clep, mode, centrum):
+            if mode == 'mean':
+                return np.nanmean(clep, axis = 0)
+            if mode == 'top':
+                return clep[0]
+            if mode == 'base':
+                return clep[-1]
+            assert mode in ['inner', 'outer'], f'unrecognised frontier mode: {mode}'
+            vp = clep - np.expand_dims(centrum, axis = 0)
+            dp = np.sum(vp * vp, axis = -1)
+            if (dp[0] < dp[1] and mode == 'inner') or (dp[0] > dp[1] and mode == 'outer'):
+                return clep[0]
+            return clep[-1]
+
+        assert mode in ['mean', 'top', 'base', 'inner', 'outer']
         coords = self.coordinate_line_end_points()
+        centrum = None
+        if mode in ['inner', 'outer']:
+            centrum = np.nanmean(np.concatenate((coords[0, 0], coords[0, -1], coords[-1, 0], coords[-1, -1]), axis = 0),
+                                 axis = 0)
+            assert not np.any(
+                np.isnan(centrum)), f'trying to make frontier polygon in mode {mode} when corners of grid not defined'
         nj = self.nj
         ni = self.ni
         frontier = np.zeros((2 * (nj + ni), 3), dtype = float)
         f_i = 0
         for i in range(self.ni):
-            c = np.nanmean(coords[0, i], axis = 0)
+            c = get_point(coords[0, i], mode, centrum)
             if np.any(np.isnan(c)):
                 continue
             frontier[f_i] = c
             f_i += 1
         for j in range(self.nj):
-            c = np.nanmean(coords[j, ni], axis = 0)
+            c = get_point(coords[j, ni], mode, centrum)
             if np.any(np.isnan(c)):
                 continue
             frontier[f_i] = c
             f_i += 1
         for i in range(self.ni, 0, -1):
-            c = np.nanmean(coords[nj, i], axis = 0)
+            c = get_point(coords[nj, i], mode, centrum)
             if np.any(np.isnan(c)):
                 continue
             frontier[f_i] = c
             f_i += 1
         for j in range(self.nj, 0, -1):
-            c = np.nanmean(coords[j, 0], axis = 0)
+            c = get_point(coords[j, 0], mode, centrum)
             if np.any(np.isnan(c)):
                 continue
             frontier[f_i] = c

{resqpy-4.18.7.dist-info → resqpy-4.18.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: resqpy
-Version: 4.18.7
+Version: 4.18.8
 Summary: Python API for working with RESQML models
 Home-page: https://github.com/bp/resqpy
 License: MIT

{resqpy-4.18.7.dist-info → resqpy-4.18.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=8ToDgLcOS7bQ6zpqngyQ90B4ZH_HoYCRRMhZRyyblYs,556
+resqpy/__init__.py,sha256=d1nzdII66YXpUle9nxQk72e6mUpfRERvOp5Sgif4LLE,556
 resqpy/crs.py,sha256=R7DfcTP5xGv5pu9Y8RHA2WVM9DjBCSVMoHcz4RmQ7Yw,27646
 resqpy/derived_model/__init__.py,sha256=NFvMSOKI3cxmH7lAbddV43JjoUj-r2G7ExEfOqinD1I,1982
 resqpy/derived_model/_add_edges_per_column_property_array.py,sha256=cpW3gwp6MSYIrtvFmCjoJXcyUsgGuCDbgmwlJCJebUs,6410
@@ -34,7 +34,7 @@ resqpy/grid/_defined_geometry.py,sha256=QYQ3wLbPrlPobgUi9R1izTD4JD9qMGf5eyqbM68H
 resqpy/grid/_extract_functions.py,sha256=pOVC2vv4dJ9G7e6p3uh2mz4QPb6W7_pKiaq8HAWeyzg,28263
 resqpy/grid/_face_functions.py,sha256=0I7O6DDz7nJWczi_G2bE3L2XUr4acxREwKygXWEp6F4,16516
 resqpy/grid/_faults.py,sha256=OmukVoLpdrndqDxwE6Rj7Ul5tj3FUQVPhE0raH2FHpg,12236
-resqpy/grid/_grid.py,sha256=vjLZJoHfvlCi8vFY09_1xQEBMRnCR6AbFFs88leKrxA,134892
+resqpy/grid/_grid.py,sha256=d4hSTmtdfmuEiQIjOhSAAlJZNlYBf0Fui4PPGJE5I4U,136144
 resqpy/grid/_grid_types.py,sha256=YAmRrrm-J2HKuuwCRCAkE3ppcQLiwc4EEc6dc-sy9Fc,4362
 resqpy/grid/_intervals_info.py,sha256=ODjDz22n8U9pSpO0Muj8mJr2hYWauFDzgcVQ0RM3csQ,338
 resqpy/grid/_moved_functions.py,sha256=XboxA0pE55j-P_x5g051WheVamxkAatQGbU5aq2GkaE,604
@@ -194,7 +194,7 @@ resqpy/well/_wellbore_marker_frame.py,sha256=xvYH2_2Ie3a18LReFymbUrZboOx7Rhv5DOD
 resqpy/well/blocked_well_frame.py,sha256=Rx8jwkCjchseDZaTttPkA1-f6l7W6vRGrxWtDHlEPx8,22560
 resqpy/well/well_object_funcs.py,sha256=tWufc8wahihzMEO-Ou1dncIttrf4bNo1qmLgh3I2pOM,24717
 resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-resqpy-4.18.7.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.18.7.dist-info/METADATA,sha256=0jTMGWkS-S4La3Q1k-uxQds81bNPDHmgzk1mgbVnM-A,4028
-resqpy-4.18.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-resqpy-4.18.7.dist-info/RECORD,,
+resqpy-4.18.8.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.18.8.dist-info/METADATA,sha256=uILBwqblu0BxmkJmbnNMugLsQLb11xcPAlkBj4BI1ec,4028
+resqpy-4.18.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+resqpy-4.18.8.dist-info/RECORD,,