resqpy 4.18.1__py3-none-any.whl → 4.18.3__py3-none-any.whl

resqpy/__init__.py

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

resqpy/grid_surface/_find_faces.py

@@ -865,7 +865,7 @@ def find_faces_to_represent_surface_regular_dense_optimised(grid,
     if progress_fn is not None:
         progress_fn(1.0)
 
-    log.debug(f"finishing find_faces_to_represent_surface_regular_optimised for {name}")
+    log.debug(f"finishing find_faces_to_represent_surface_regular_dense_optimised for {name}")
 
     # if returning properties, construct dictionary
     if return_properties:
@@ -1537,7 +1537,7 @@ def packed_bisector_from_face_indices(  # type: ignore
 
     # find the surface boundary (includes a buffer slice where surface does not reach edge of grid), and shrink the I axis
     box = get_packed_boundary_from_indices(k_faces_kji0, j_faces_kji0, i_faces_kji0, grid_extent_kji)
-    # set k_faces as uint8 packed bool arrays covering box
+    # set k_faces, j_faces & i_faces as uint8 packed bool arrays covering box
     k_faces, j_faces, i_faces = _packed_box_face_arrays_from_indices(k_faces_kji0, j_faces_kji0, i_faces_kji0, box)
 
     box_shape = box[1, :] - box[0, :]
@@ -1562,9 +1562,10 @@ def packed_bisector_from_face_indices(  # type: ignore
     else:
         open_i = np.invert(i_faces, dtype = np.uint8)
 
-    # close off faces in padding bits
-    tail = grid_extent_kji[2] % 8  # number of valid bits in padded byte
-    if tail:
+    # close off faces in padding bits, if within box
+    if box[1, 2] * 8 > grid_extent_kji[2]:
+        tail = grid_extent_kji[2] % 8  # number of valid bits in padded byte
+        assert tail
         m = np.uint8((255 << (8 - tail)) & 255)
         open_k[:, :, -1] &= m
         open_j[:, :, -1] &= m
@@ -1581,7 +1582,7 @@ def packed_bisector_from_face_indices(  # type: ignore
     array[box[0, 0]:box[1, 0], box[0, 1]:box[1, 1], box[0, 2]:box[1, 2]] = box_array
 
     # set bisector values outside of the bounding box
-    _set_packed_bisector_outside_box(array, box, box_array)
+    _set_packed_bisector_outside_box(array, box, box_array, grid_extent_kji[2] % 8)
 
     # check all array elements are not the same
     true_count = np.sum(bitwise_count(array))  # note: will usually include some padding bits, so not so true!
@@ -2127,7 +2128,7 @@ def _set_bisector_outside_box(a: np.ndarray, box: np.ndarray, box_array: np.ndar
         a[:, :, :box[0, 2]] = True
 
 
-def _set_packed_bisector_outside_box(a: np.ndarray, box: np.ndarray, box_array: np.ndarray):
+def _set_packed_bisector_outside_box(a: np.ndarray, box: np.ndarray, box_array: np.ndarray, tail: int):
     # set values outside of the bounding box, working with packed arrays
     if box[1, 0] < a.shape[0] and np.any(box_array[-1, :, :]):
         a[box[1, 0]:, :, :] = 255
@@ -2141,6 +2142,9 @@ def _set_packed_bisector_outside_box(a: np.ndarray, box: np.ndarray, box_array:
         a[:, :, box[1, 2]:] = 255
     if box[0, 2] != 0:
         a[:, :, :box[0, 2]] = 255
+    if tail:
+        m = np.uint8((255 << (8 - tail)) & 255)
+        a[:, :, -1] &= m
 
 
 def _box_face_arrays_from_indices(  # type: ignore
@@ -2171,7 +2175,7 @@ def _packed_box_face_arrays_from_indices(  # type: ignore
     i_a = np.zeros(tuple(box_shape), dtype = np.uint8)
     ko = box[0, 0]
     jo = box[0, 1]
-    io = box[0, 2]
+    io = box[0, 2] * 8
     if k_faces_kji0 is not None:
         _set_packed_face_array(k_a, k_faces_kji0, ko, jo, io)
     if j_faces_kji0 is not None:

{resqpy-4.18.1.dist-info → resqpy-4.18.3.dist-info}/METADATA

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

{resqpy-4.18.1.dist-info → resqpy-4.18.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=m7ex3YMpQEz7CGtNIaAvVVxBOBQyIH3030Q1cW0Yzjc,556
+resqpy/__init__.py,sha256=h-xRZeh8uYnzFHKt-aS_ERySkjCO9kcZ31zV2u3C86k,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
@@ -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=kJl9DEN2AdhKZH7xzmS6Pvp8wSy6antAwgl9I5CE-2w,104982
+resqpy/grid_surface/_find_faces.py,sha256=YyZ2x453BgBaBaOYII1yIXCyEi6_LML2s4zJCtG4wGQ,105201
 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
@@ -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.1.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.18.1.dist-info/METADATA,sha256=koDfqOD-Z2n2hELGkShabQJBZ1L17FJ0hypnJCmX5PI,4028
-resqpy-4.18.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-resqpy-4.18.1.dist-info/RECORD,,
+resqpy-4.18.3.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.18.3.dist-info/METADATA,sha256=7giwDE8PWXV3N0JGfUqPHqe0NbLsxVQrjz-gu1W1oZ0,4028
+resqpy-4.18.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+resqpy-4.18.3.dist-info/RECORD,,