resqpy 5.1.1__py3-none-any.whl → 5.1.3__py3-none-any.whl

resqpy/__init__.py

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

resqpy/grid_surface/_find_faces.py

@@ -1246,9 +1246,9 @@ def find_faces_to_represent_surface_regular_optimised(grid,
             # log.debug('finished preparing columns bisector')
         elif patchwork:
             n_patches = surface.number_of_patches()
-            nkf = len(k_faces_kji0)
-            njf = len(j_faces_kji0)
-            nif = len(i_faces_kji0)
+            nkf = 0 if k_faces_kji0 is None else len(k_faces_kji0)
+            njf = 0 if j_faces_kji0 is None else len(j_faces_kji0)
+            nif = 0 if i_faces_kji0 is None else len(i_faces_kji0)
             # fetch patch indices for triangle hits
             assert all_tris is not None and len(all_tris) == nkf + njf + nif
             patch_indices_k = surface.patch_indices_for_triangle_indices(all_tris[:nkf])
@@ -1260,27 +1260,37 @@ def find_faces_to_represent_surface_regular_optimised(grid,
                 bisector = np.ones(_shape_packed(grid.extent_kji), dtype = np.uint8)
             else:
                 bisector = np.ones(tuple(grid.extent_kji), dtype = np.bool_)
-            # populate 4D bisector with an axis zero slice for each patch
+            # populate composite bisector
             for patch in range(n_patches):
                 mask = (patch_indices == patch)
                 if np.count_nonzero(mask) == 0:
                     log.warning(f'patch {patch} of surface {surface.title} is not applicable to any cells in grid')
                     continue
+                patch_k_faces_kji0 = None
+                if k_faces_kji0 is not None:
+                    patch_k_faces_kji0 = k_faces_kji0[(patch_indices_k == patch).astype(bool)]
+                patch_j_faces_kji0 = None
+                if j_faces_kji0 is not None:
+                    patch_j_faces_kji0 = j_faces_kji0[(patch_indices_j == patch).astype(bool)]
+                patch_i_faces_kji0 = None
+                if i_faces_kji0 is not None:
+                    patch_i_faces_kji0 = i_faces_kji0[(patch_indices_i == patch).astype(bool)]
                 if packed_bisectors:
                     mask = np.packbits(mask, axis = -1)
                     patch_bisector, is_curtain =  \
                         packed_bisector_from_face_indices(tuple(grid.extent_kji),
-                                                          k_faces_kji0[(patch_indices_k == patch).astype(bool)],
-                                                          j_faces_kji0[(patch_indices_j == patch).astype(bool)],
-                                                          i_faces_kji0[(patch_indices_i == patch).astype(bool)],
+                                                          patch_k_faces_kji0,
+                                                          patch_j_faces_kji0,
+                                                          patch_i_faces_kji0,
                                                           raw_bisector)
-                    bisector = np.bitwise_or(np.bitwise_and(mask, patch_bisector), bisector)
+                    bisector = np.bitwise_or(np.bitwise_and(mask, patch_bisector),
+                                             np.bitwise_and(np.invert(mask), bisector))
                 else:
                     patch_bisector, is_curtain =  \
                         bisector_from_face_indices(tuple(grid.extent_kji),
-                                                   k_faces_kji0[(patch_indices_k == patch).astype(bool)],
-                                                   j_faces_kji0[(patch_indices_j == patch).astype(bool)],
-                                                   i_faces_kji0[(patch_indices_i == patch).astype(bool)],
+                                                   patch_k_faces_kji0,
+                                                   patch_j_faces_kji0,
+                                                   patch_i_faces_kji0,
                                                    raw_bisector)
                     bisector[mask] = patch_bisector[mask]
                 if is_curtain:
@@ -2293,12 +2303,12 @@ def get_boundary_from_indices(  # type: ignore
         k_faces_kji0: Union[np.ndarray, None], j_faces_kji0: Union[np.ndarray, None],
         i_faces_kji0: Union[np.ndarray, None], grid_extent_kji: Tuple[int, int, int]) -> np.ndarray:
     """Return python protocol box containing indices"""
-    k_min_kji0 = None if (k_faces_kji0 is None or k_faces_kji0.size == 0) else np.min(k_faces_kji0, axis = 0)
-    k_max_kji0 = None if (k_faces_kji0 is None or k_faces_kji0.size == 0) else np.max(k_faces_kji0, axis = 0)
-    j_min_kji0 = None if (j_faces_kji0 is None or j_faces_kji0.size == 0) else np.min(j_faces_kji0, axis = 0)
-    j_max_kji0 = None if (j_faces_kji0 is None or j_faces_kji0.size == 0) else np.max(j_faces_kji0, axis = 0)
-    i_min_kji0 = None if (i_faces_kji0 is None or i_faces_kji0.size == 0) else np.min(i_faces_kji0, axis = 0)
-    i_max_kji0 = None if (i_faces_kji0 is None or i_faces_kji0.size == 0) else np.max(i_faces_kji0, axis = 0)
+    k_min_kji0 = None if ((k_faces_kji0 is None) or (k_faces_kji0.size == 0)) else np.min(k_faces_kji0, axis = 0)
+    k_max_kji0 = None if ((k_faces_kji0 is None) or (k_faces_kji0.size == 0)) else np.max(k_faces_kji0, axis = 0)
+    j_min_kji0 = None if ((j_faces_kji0 is None) or (j_faces_kji0.size == 0)) else np.min(j_faces_kji0, axis = 0)
+    j_max_kji0 = None if ((j_faces_kji0 is None) or (j_faces_kji0.size == 0)) else np.max(j_faces_kji0, axis = 0)
+    i_min_kji0 = None if ((i_faces_kji0 is None) or (i_faces_kji0.size == 0)) else np.min(i_faces_kji0, axis = 0)
+    i_max_kji0 = None if ((i_faces_kji0 is None) or (i_faces_kji0.size == 0)) else np.max(i_faces_kji0, axis = 0)
     box = np.empty((2, 3), dtype = np.int32)
     box[0, :] = grid_extent_kji
     box[1, :] = -1

resqpy/olio/vector_utilities.py

@@ -1363,6 +1363,24 @@ def triangle_normal_vector_numba(points):  # pragma: no cover
     return v / np.linalg.norm(v)
 
 
+@njit
+def triangles_normal_vectors(t: np.ndarray, p: np.ndarray) -> np.ndarray:  # pragma: no cover
+    """For a triangulated set, return an array of unit normal vectors (one per triangle).
+
+    note:
+        resulting vectors implicitly assume that xy & z units are the same; if this is not the case, adjust vectors
+        afterwards as required
+    """
+    nv = np.empty((len(t), 3), dtype = np.float64)
+    v = np.zeros(3, dtype = np.float64)
+    for ti in range(len(t)):
+        v[:] = np.cross(p[t[ti, 0]] - p[t[ti, 1]], p[t[ti, 0]] - p[t[ti, 2]])
+        if v[2] < 0.0:
+            v[:] = -v
+        nv[ti, :] = v / np.linalg.norm(v)
+    return nv
+
+
 def in_circumcircle(a, b, c, d):
     """Returns True if point d lies within the circumcircle pf ccw points a, b, c, projected onto xy plane.
 

{resqpy-5.1.1.dist-info → resqpy-5.1.3.dist-info}/METADATA

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

{resqpy-5.1.1.dist-info → resqpy-5.1.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=p9tTrsC5HfUexwsU8YYBIHq3nslCgVVqUH-tiqKHF7w,555
+resqpy/__init__.py,sha256=v1suGb9OEjHgcvF6jTHiNDS_EenJ2Wd5dHfV_Bylcuo,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=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=YogiM8SIDZGtDIuA8Hyd8DOt3Po47CKHP7luE_jz93I,111556
+resqpy/grid_surface/_find_faces.py,sha256=3-aIp6K9rnmGC29c1TOfzky-I0VFTi-agEktWUF1294,112055
 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
@@ -97,7 +97,7 @@ resqpy/olio/transmission.py,sha256=auz_12TKtSPy6Fv3wmKn5lXPRAEnn2tYVyTQfsj37xU,6
 resqpy/olio/triangulation.py,sha256=sBNP4MhSpY2bv6BYIn7890stqetkK5dag9pYNFiUs2g,46037
 resqpy/olio/uuid.py,sha256=JRMi-RZNeGm8tGNloIwTATzNtdj29lBQDV9OILboPRI,7324
 resqpy/olio/vdb.py,sha256=lQYuK1kr1Wnucq2EoKgT6lrR7vloCemnCKZktzBcLUc,45231
-resqpy/olio/vector_utilities.py,sha256=B354cr9-nqqPcb3SAx1jD9Uk51sjkV95xToAiF3-WHA,61127
+resqpy/olio/vector_utilities.py,sha256=T8n9JMhE13msuy1dwJeIWw6ByKbm2o4zUV8l5frVsuk,61784
 resqpy/olio/volume.py,sha256=inKZzW8UiYvyetltz_r_OgO3UzVtqdOz_RMg-WqlyDo,5475
 resqpy/olio/wellspec_keywords.py,sha256=ad3B727golWYiko54OZOw7vG21IvpNxCMCyLv8jSkcI,26533
 resqpy/olio/write_data.py,sha256=bIX7ilMkXWCMz_zQh-Gqk56sNzng4W5l4BahW2EV7Kw,5142
@@ -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.1.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-5.1.1.dist-info/METADATA,sha256=Cj9yg05wIMxdty_mNIuSG2kY_6NoHMvaRSoDM6C_7gs,4026
-resqpy-5.1.1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-resqpy-5.1.1.dist-info/RECORD,,
+resqpy-5.1.3.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-5.1.3.dist-info/METADATA,sha256=cP8drP0abAEs-q-QHWDYNZjq_MoTXD1JilbSor9sF0o,4026
+resqpy-5.1.3.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+resqpy-5.1.3.dist-info/RECORD,,