resqpy 5.1.6__py3-none-any.whl → 5.1.8__py3-none-any.whl

resqpy/__init__.py

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

resqpy/grid_surface/_find_faces.py

@@ -881,7 +881,8 @@ def find_faces_to_represent_surface_regular_optimised(grid,
                                                       raw_bisector = False,
                                                       n_batches = 20,
                                                       packed_bisectors = False,
-                                                      patch_indices = None):
+                                                      patch_indices = None,
+                                                      direction = 'IJK'):
     """Returns a grid connection set containing those cell faces which are deemed to represent the surface.
 
     argumants:
@@ -919,6 +920,8 @@ def find_faces_to_represent_surface_regular_optimised(grid,
            non curtain bisectors are returned in packed form
         patch_indices (numpy int array, optional): if present, an array over grid cells indicating which 
            patch of surface is applicable in terms of a bisector, for each cell
+        direction (str, default 'IJK'): indicates which face directions to include; one of 'I', 'J', 'K',
+           'IJ', IK', 'JK', 'IJK"
 
     returns:
         gcs  or  (gcs, gcs_props)
@@ -935,7 +938,8 @@ def find_faces_to_represent_surface_regular_optimised(grid,
         organisational objects for the feature are created if needed;
         if the offset return property is requested, the implicit units will be the z units of the grid's crs;
         if patch_indices is present and grid bisectors are being returned, a composite bisector array is returned
-        with elements set from individual bisectors for each patch of surface
+        with elements set from individual bisectors for each patch of surface;
+        if generating a grid bisector property then direction will typically need to be 'IJK'
     """
 
     assert isinstance(grid, grr.RegularGrid)
@@ -1018,7 +1022,7 @@ def find_faces_to_represent_surface_regular_optimised(grid,
     k_depths = None
     k_offsets = None
     k_props = None
-    if nk > 1:
+    if nk > 1 and 'K' in direction:
         # log.debug("searching for k faces")
 
         k_hits, k_depths = vec.points_in_triangles_aligned_unified(grid.ni, grid.nj, 0, 1, 2, p, n_batches)
@@ -1061,7 +1065,7 @@ def find_faces_to_represent_surface_regular_optimised(grid,
     j_depths = None
     j_offsets = None
     j_props = None
-    if grid.nj > 1:
+    if grid.nj > 1 and 'J' in direction:
         # log.debug("searching for J faces")
 
         j_hits, j_depths = vec.points_in_triangles_aligned_unified(grid.ni, nk, 0, 2, 1, p, n_batches)
@@ -1113,7 +1117,7 @@ def find_faces_to_represent_surface_regular_optimised(grid,
     i_depths = None
     i_offsets = None
     i_props = None
-    if grid.ni > 1:
+    if grid.ni > 1 and 'I' in direction:
         # log.debug("searching for I faces")
 
         i_hits, i_depths = vec.points_in_triangles_aligned_unified(grid.nj, nk, 1, 2, 0, p, n_batches)

resqpy/multi_processing/wrappers/grid_surface_mp.py

@@ -50,7 +50,8 @@ def find_faces_to_represent_surface_regular_wrapper(
         n_threads: int = 20,
         patchwork: bool = False,
         grid_patching_property_uuid: Optional[Union[UUID, str]] = None,
-        surface_patching_property_uuid: Optional[Union[UUID, str]] = None) ->  \
+        surface_patching_property_uuid: Optional[Union[UUID, str]] = None,
+        direction = 'IJK') ->  \
             Tuple[int, bool, str, List[Union[UUID, str]]]:
     """Multiprocessing wrapper function of find_faces_to_represent_surface_regular_optimised.
 
@@ -116,6 +117,8 @@ def find_faces_to_represent_surface_regular_wrapper(
         surface_patching_property_uuid (uuid, optional): required if patchwork is True, the uuid of a discrete or
            categorical property on the patches of the surface, identifying the value of the grid patching property
            that each patch relates to
+        direction (str, default 'IJK'): indicates which face directions to include; one of 'I', 'J', 'K',
+           'IJ', IK', 'JK', 'IJK"
 
     returns:
         Tuple containing:
@@ -134,6 +137,7 @@ def find_faces_to_represent_surface_regular_wrapper(
           the shift being in the +ve z hemisphere; in either case the direction of the shift is perpendicular
           to the average plane of the original points
         - patchwork is not compatible with re-triangulation
+        - if grid bisector is included in return properties, direction will usually need to be 'IJK'
     """
     tmp_dir = Path(parent_tmp_dir) / f"{uuid.uuid4()}"
     tmp_dir.mkdir(parents = True, exist_ok = True)
@@ -302,7 +306,8 @@ def find_faces_to_represent_surface_regular_wrapper(
                                                                      raw_bisector = raw_bisector,
                                                                      n_batches = n_threads,
                                                                      packed_bisectors = use_pack,
-                                                                     patch_indices = patch_indices)
+                                                                     patch_indices = patch_indices,
+                                                                     direction = direction)
 
     success = False
 

resqpy/organize/fault_interpretation.py

@@ -32,7 +32,7 @@ class FaultInterpretation(BaseResqpy):
                  tectonic_boundary_feature = None,
                  domain = 'depth',
                  is_normal = None,
-                 is_listric = None,
+                 is_listric = False,
                  maximum_throw = None,
                  mean_azimuth = None,
                  mean_dip = None,
@@ -44,7 +44,7 @@ class FaultInterpretation(BaseResqpy):
         # if not extracting from xml,:
         # tectonic_boundary_feature is required and must be a TectonicBoundaryFeature object
         # domain is required and must be one of 'depth', 'time' or 'mixed'
-        # is_listric is required if the fault is not normal (and must be None if normal)
+        # is_listric is required if the fault is normal (and is ignored if not normal)
         # max throw, azimuth & dip are all optional
         # the throw interpretation list is not supported for direct initialisation
 
@@ -53,10 +53,12 @@ class FaultInterpretation(BaseResqpy):
         if (not title) and self.tectonic_boundary_feature is not None:
             title = self.tectonic_boundary_feature.feature_name
         self.main_has_occurred_during = (None, None)
+        if is_normal is None:
+            is_normal = (is_listric is not None)
         self.is_normal = is_normal  # extra field, not explicitly in RESQML
         self.domain = domain
         # RESQML xml business rule: IsListric must be present if the fault is normal; must not be present if the fault is not normal
-        self.is_listric = is_listric
+        self.is_listric = is_listric if is_normal else None
         self.maximum_throw = maximum_throw
         self.mean_azimuth = mean_azimuth
         self.mean_dip = mean_dip
@@ -87,7 +89,7 @@ class FaultInterpretation(BaseResqpy):
                                                                              self.feature_root))
             self.main_has_occurred_during = ou.extract_has_occurred_during(root_node)
             self.is_listric = rqet.find_tag_bool(root_node, 'IsListric')
-            self.is_normal = (self.is_listric is None)
+            self.is_normal = (self.is_listric is not None)
             self.maximum_throw = rqet.find_tag_float(root_node, 'MaximumThrow')
             # todo: check that type="eml:LengthMeasure" is simple float
             self.mean_azimuth = rqet.find_tag_float(root_node, 'MeanAzimuth')
@@ -164,7 +166,7 @@ class FaultInterpretation(BaseResqpy):
 
         # note: related tectonic boundary feature node should be created first and referenced here
 
-        assert self.is_normal == (self.is_listric is None)
+        assert self.is_normal == (self.is_listric is not None)
         if not self.title:
             if tectonic_boundary_feature_root is not None:
                 title = rqet.find_nested_tags_text(tectonic_boundary_feature_root, ['Citation', 'Title'])

{resqpy-5.1.6.dist-info → resqpy-5.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: resqpy
-Version: 5.1.6
+Version: 5.1.8
 Summary: Python API for working with RESQML models
 License: MIT
 Keywords: RESQML

{resqpy-5.1.6.dist-info → resqpy-5.1.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=cnR7ZBD-Sv8zdt5JWWw7n0iqZIaIhsYS7akdPjFzG10,555
+resqpy/__init__.py,sha256=-ilwl-tTKv_tDcoim3YUzpSMlDOV_pTqG_cs4Q7ioYg,555
 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
@@ -47,7 +47,7 @@ resqpy/grid/_write_nexus_corp.py,sha256=yEVfiObsedEAXX6UG6ZTf56kZnQVkd3lLqE2NpL-
 resqpy/grid/_xyz.py,sha256=RLQWOdM_DRoCj4JypwB5gUJ78HTdk5JnZHSeAzuU634,13087
 resqpy/grid_surface/__init__.py,sha256=zSbyDwUH_p0UXd9PAcAXvcS1wrmRVnZvXXa1zQSQBlY,2925
 resqpy/grid_surface/_blocked_well_populate.py,sha256=Lme1AR-nLWOUlNnmHMVThk6jEg_lAZxWWtL82Yksppw,35867
-resqpy/grid_surface/_find_faces.py,sha256=sBzy9mWQZNU41kE5v3taVNDKnqzTcvnOT2FVAXABP0c,120573
+resqpy/grid_surface/_find_faces.py,sha256=QwJkeZCdRO1zJNCcA0xm6Lr81uBPv80FmvddLIbUgeg,120944
 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
@@ -68,7 +68,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=2XkaD_YWNLz6xFvegkuPM8YN_rRXmOVUoVJmXmTkKBg,27083
+resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=3dt6yj9vj3lSjqnRJ7ZTc9KySirxaRrLgd55WOhaJek,27443
 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
@@ -110,7 +110,7 @@ resqpy/organize/_utils.py,sha256=p1ec0ytUv8X4SFn0cCp5g-aWjucNR7xKQEwkcMOyHYM,293
 resqpy/organize/boundary_feature.py,sha256=AqSTtYpEKBXgkggzETbl61PhtdatIEFwXkzcrqRlj0A,1685
 resqpy/organize/boundary_feature_interpretation.py,sha256=u0vTBFAhIVOHOjF5YlSIeNDq17qW2fWKwT8H-PtTMNQ,5190
 resqpy/organize/earth_model_interpretation.py,sha256=-2aJ7NSbuOWjSSKABqDwyZL67gxQ_RlxerhsOQcaq0I,6186
-resqpy/organize/fault_interpretation.py,sha256=bXonQ9vrFK_-Taq2F6nPU05EWLLX88ZhUppjLZRLl2I,12457
+resqpy/organize/fault_interpretation.py,sha256=srLl0HZ0B4-DOIyQC61q4-PrmKS0N0pR1bP_OGBxHYM,12566
 resqpy/organize/fluid_boundary_feature.py,sha256=OyBz_oHhrD_d1tlcXPOBvsvgns2JY1G9zMt9PM0U6nM,2757
 resqpy/organize/frontier_feature.py,sha256=DbGEtHKCUxXyYdjP7aV1PXU-jXtLz_M-e3gMg_CJqWs,1702
 resqpy/organize/generic_interpretation.py,sha256=ILh5bibemk5t-1Ozfz9e8KYo9ijQYWs8p23tlV4jJ04,4498
@@ -193,7 +193,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=1O4EVPuTn-kN3uT_V4TbSwehnMUMY0TX36XOUgasTcc,24689
 resqpy/well/well_utils.py,sha256=-g_pg2v5XD9g4SQz9sk7KK-x2xEQZHzWehCQqiEGo6M,7627
-resqpy-5.1.6.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-5.1.6.dist-info/METADATA,sha256=ixIzugCD9ZynPEJP_6VZiiUrn042oJmOx8HoilUgePw,3986
-resqpy-5.1.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-resqpy-5.1.6.dist-info/RECORD,,
+resqpy-5.1.8.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-5.1.8.dist-info/METADATA,sha256=Xgx175NkH8hnkGVXzQNhRpr0y6J8ilxauycgXyxpP78,3986
+resqpy-5.1.8.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+resqpy-5.1.8.dist-info/RECORD,,