resqpy 4.18.4__py3-none-any.whl → 4.18.6__py3-none-any.whl

resqpy/__init__.py

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

resqpy/grid/_extract_functions.py

@@ -501,7 +501,7 @@ def extract_inactive_mask(grid, check_pinchout = False):
     geom_defined = grr_dg.cell_geometry_is_defined_ref(grid)
     if grid.inactive is None:
         if geom_defined is None or geom_defined is True:
-            grid.inactive = np.zeros(tuple(grid.extent_kji))  # ie. all active
+            grid.inactive = np.zeros(tuple(grid.extent_kji), dtype = bool)  # ie. all active
         else:
             grid.inactive = np.logical_not(grr_dg.cell_geometry_is_defined_ref(grid))
     if check_pinchout:
@@ -524,6 +524,7 @@ def extract_inactive_mask(grid, check_pinchout = False):
             active_gpc = rprop.selective_version_of_collection(active_gpc,
                                                                time_index = grid.time_index,
                                                                time_series_uuid = grid.time_series_uuid)
+            active_parts = active_gpc.parts()
         else:
             active_parts = []
             for part in active_gpc.parts():

resqpy/grid/_grid.py

@@ -15,6 +15,7 @@ import resqpy.grid as grr
 import resqpy.grid_surface as rqgs
 import resqpy.fault as rqf
 import resqpy.property as rqp
+import resqpy.lines as rql
 import resqpy.olio.grid_functions as gf
 import resqpy.olio.uuid as bu
 import resqpy.olio.write_hdf5 as rwh5
@@ -75,7 +76,8 @@ class Grid(BaseResqpy):
                  geometry_required = True,
                  title = None,
                  originator = None,
-                 extra_metadata = {}):
+                 extra_metadata = {},
+                 load_inactive = True):
         """Create a Grid object and optionally populate from xml tree.
 
         arguments:
@@ -91,6 +93,8 @@ class Grid(BaseResqpy):
               ignored if loading from xml
            extra_metadata (dict, optional): dictionary of extra metadata items to add to the grid;
               ignored if loading from xml
+           load_inactive (bool, default True): if True and uuid is provided, the inactive attribubte is
+              populated if a property of kind 'active' is found for the grid
 
         returns:
            a newly created Grid object
@@ -147,6 +151,8 @@ class Grid(BaseResqpy):
             self.title = 'ROOT'
 
         if uuid is not None:
+            if load_inactive:
+                self.extract_inactive_mask()
             if geometry_required:
                 assert self.geometry_root is not None, 'grid geometry not present in xml'
             if find_properties:
@@ -185,7 +191,6 @@ class Grid(BaseResqpy):
         self.extract_parent()
         self.extract_children()
         # self.create_column_pillar_mapping()  # mapping now created on demand in other methods
-        self.extract_inactive_mask()
         self.extract_stratigraphy()
         self.get_represented_interpretation()
 
@@ -1493,6 +1498,62 @@ class Grid(BaseResqpy):
         """
         return z_corner_point_depths(self, order = order)
 
+    def frontier(self, set_z_zero = True, title = None, add_as_part = True):
+        """Returns a frontier polygon (closed polyline) based on midpoints of edge coordinate lines, with z set to zero.
+        
+        arguments:
+            - set_z_zero (bool, default True): if True, the z values of the returned polyline are all set to zero; if False,
+              they are left at the midpoint z values from the edge coordinate lines
+            - 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
+              
+        returns:
+            - closed Polyline representing the frontier of the grid in plan view
+        """
+        coords = self.coordinate_line_end_points()
+        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)
+            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)
+            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)
+            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)
+            if np.any(np.isnan(c)):
+                continue
+            frontier[f_i] = c
+            f_i += 1
+        assert 4 <= f_i <= 2 * (nj + ni), 'failed to define frontier polygon (NaNs in grid geometry?)'
+        if set_z_zero:
+            frontier[:, 2] = 0.0
+        if not title:
+            title = f'frontier of {self.title}'
+        pl = rql.Polyline(self.model,
+                          set_coord = frontier[:f_i],
+                          set_crs = self.crs_uuid,
+                          is_closed = True,
+                          title = title)
+        if add_as_part:
+            pl.create_xml()
+        return pl
+
     def corner_points(self, cell_kji0 = None, points_root = None, cache_resqml_array = True, cache_cp_array = False):
         """Returns a numpy array of corner points for a single cell or the whole grid.
 

resqpy/grid_surface/_find_faces.py

@@ -1575,7 +1575,6 @@ def packed_bisector_from_face_indices(  # type: ignore
     is_curtain = _packed_shallow_or_curtain_temp_bitwise_count(array, true_count, raw_bisector)
     # todo: switch to numpy bitwise_count when numba supports it and resqpy has dropped older numpy versions
     # is_curtain = _packed_shallow_or_curtain(array, true_count, raw_bisector)
-    print(f'**** array shape: {array.shape}; dtype: {array.dtype}')
 
     return array, is_curtain
 

resqpy/multi_processing/wrappers/grid_surface_mp.py

@@ -353,7 +353,7 @@ def find_faces_to_represent_surface_regular_wrapper(index: int,
                                                           ('vertical' if is_curtain else 'sloping'),
                                                           realization = realisation,
                                                           indexable_element = "columns" if is_curtain else "cells",
-                                                          pre_packed = use_pack)
+                                                          pre_packed = False if is_curtain else use_pack)
             elif p_name == 'grid shadow':
                 if grid_pc is None:
                     grid_pc = rqp.PropertyCollection()

{resqpy-4.18.4.dist-info → resqpy-4.18.6.dist-info}/METADATA

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

{resqpy-4.18.4.dist-info → resqpy-4.18.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=3l-Kxew1egDvWafAvymh-cOYinz6WxZkG5dEkZXBBQk,556
+resqpy/__init__.py,sha256=1V-lAV0_8CC6-e7jwBM6HpCHAUHlHA7wBY9wofSJyjs,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
@@ -31,10 +31,10 @@ resqpy/grid/_cell_properties.py,sha256=pbyAK2eV9n4teOxm2q5hyBinohEbevFPrCfMcpGiq
 resqpy/grid/_connection_sets.py,sha256=-277bh9pMoeESSzy9oZehL-vc82aMGZuSLQs2KJ4Wfg,10120
 resqpy/grid/_create_grid_xml.py,sha256=p-jKo1BZ-DlhEYixVzadtY-QsqA8ygcXvMYS_TvQCjg,22837
 resqpy/grid/_defined_geometry.py,sha256=QYQ3wLbPrlPobgUi9R1izTD4JD9qMGf5eyqbM68Hg-0,32297
-resqpy/grid/_extract_functions.py,sha256=n_SmfkvEssX09SrlvUMe7y-4eOuVckhL_M6tFTg1bRg,28203
+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=P2-qZwf7P0WpPpbzdo8abJvmuhsHKQxLkfHvAWjZPKE,132215
+resqpy/grid/_grid.py,sha256=vjLZJoHfvlCi8vFY09_1xQEBMRnCR6AbFFs88leKrxA,134892
 resqpy/grid/_grid_types.py,sha256=vN_mMAEvcQ7HGxDQ8VMJilGXADPfJ_2rgebOJ__2P8E,3572
 resqpy/grid/_intervals_info.py,sha256=ODjDz22n8U9pSpO0Muj8mJr2hYWauFDzgcVQ0RM3csQ,338
 resqpy/grid/_moved_functions.py,sha256=XboxA0pE55j-P_x5g051WheVamxkAatQGbU5aq2GkaE,604
@@ -48,7 +48,7 @@ resqpy/grid/_write_nexus_corp.py,sha256=yEVfiObsedEAXX6UG6ZTf56kZnQVkd3lLqE2NpL-
 resqpy/grid/_xyz.py,sha256=RLQWOdM_DRoCj4JypwB5gUJ78HTdk5JnZHSeAzuU634,13087
 resqpy/grid_surface/__init__.py,sha256=IlPwm6G7P_Vg_w7JHqSs-d_oxk2QmFtWGTk_vvr1qm8,2911
 resqpy/grid_surface/_blocked_well_populate.py,sha256=Lme1AR-nLWOUlNnmHMVThk6jEg_lAZxWWtL82Yksppw,35867
-resqpy/grid_surface/_find_faces.py,sha256=sgMvBX8kduq2taAe1RRHpUjn1iCgex1F8cAJVG9hqJY,106856
+resqpy/grid_surface/_find_faces.py,sha256=kTytXfYqhcSES-Mnn1gDcdtvX-Ably1FAV3AILGMYUk,106788
 resqpy/grid_surface/_grid_skin.py,sha256=D0cjHkcuT5KCKb-8EZfXgh0GgJj3kzOBS2wVNXg4bfY,26056
 resqpy/grid_surface/_grid_surface.py,sha256=l2NJo7Kiucolbb_TlLPC7NGdksg_JahkihfsrJVq99w,14379
 resqpy/grid_surface/_trajectory_intersects.py,sha256=Och9cZYU9Y7ofovhPzsLyIblRUl2xj9_5nHH3fMZp-A,22498
@@ -69,7 +69,7 @@ resqpy/multi_processing/__init__.py,sha256=ZRudHfN9aaZjxvat7t8BZr6mwMi9baiCNjczw
 resqpy/multi_processing/_multiprocessing.py,sha256=bnCKfSC1tWwvZmZ7BZqCyje0C93m6q7HZPxNpx8xoxA,7301
 resqpy/multi_processing/wrappers/__init__.py,sha256=7vjuTWdHnp3rN9Ud8ljpDnt1NbBAyhA08lv-sQ9Kf3o,72
 resqpy/multi_processing/wrappers/blocked_well_mp.py,sha256=_2fEsSmJVQCnbQIjTHqmnNEugfhN1KvX-o4ZbvtChdI,5952
-resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=rnq5i34MRnwFFTzjcs_TzL4Y_dVn68Eg6Jh9nvSNx8Y,25245
+resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=QvfyGYVBPf5E_nLWUoG6OHxuvTdkqTPj-_w3Or_OSuI,25270
 resqpy/multi_processing/wrappers/mesh_mp.py,sha256=0VYoqtgBFfrlyYB6kkjbdrRQ5FKe6t5pHJO3wD9b8Fc,5793
 resqpy/olio/__init__.py,sha256=j2breqKYVufhw5k8qS2uZwB3tUKT7FhdZ23ninS75YA,84
 resqpy/olio/ab_toolbox.py,sha256=bZlAhOJVS0HvIYBW0Lg68re17N8eltoQhIUh0xuUyVc,2147
@@ -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.4.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.18.4.dist-info/METADATA,sha256=G_V0kUoVekOZesVDi5IaV1HZWvTRT_tvA1qdB3gsKHw,4028
-resqpy-4.18.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-resqpy-4.18.4.dist-info/RECORD,,
+resqpy-4.18.6.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.18.6.dist-info/METADATA,sha256=DgyxAGDisPPuPmbLYeAtAp-SvmsDo2J0nTyk3gzVwX8,4028
+resqpy-4.18.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+resqpy-4.18.6.dist-info/RECORD,,