resqpy 4.8.0__py3-none-any.whl → 4.8.2__py3-none-any.whl

resqpy/__init__.py

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

resqpy/olio/triangulation.py

@@ -726,7 +726,7 @@ def triangulated_polygons(p, v, centres = None):
     return points, triangles
 
 
-def reorient(points, rough = True, max_dip = None, use_linalg = False):
+def reorient(points, rough = True, max_dip = None, use_linalg = True, sample = 500):
     """Returns a reoriented copy of a set of points, such that z axis is approximate normal to average plane of points.
 
     arguments:
@@ -735,7 +735,8 @@ def reorient(points, rough = True, max_dip = None, use_linalg = False):
           if False, that reduces to around 2.5 degrees of the optimum; iugnored if use_linalg is True
        max_dip (float, optional): if present, the reorientation of perspective off vertical is
           limited to this angle in degrees
-       use_linalg (bool, default False): if True, the numpy linear algebra svd function is used and rough is ignored
+       use_linalg (bool, default True): if True, the numpy linear algebra svd function is used and rough is ignored
+       sample (int, default 500): downsample points to this number for the purposes of determining normal vector
 
     returns:
        numpy float array of the same shape as points, numpy xyz vector, numpy 3x3 matrix;
@@ -748,7 +749,9 @@ def reorient(points, rough = True, max_dip = None, use_linalg = False):
        implicit xy & z units for points are assumed to be the same;
        the function may typically be called prior to the Delauney triangulation, which uses an xy projection to
        determine the triangulation;
-       the numpy linear algebra option seems to be memory intensive, not recommended
+       the numpy linear algebra option seems to be memory intensive, not recommended;
+       downsampling will occur (for normal vector determination) when the number of points exceeds double that
+       given in the sample argument; set sample to None to use all points for normal vector determination
     """
 
     def best_angles(points, mid_x, mid_y, steps, d_theta):
@@ -780,8 +783,14 @@ def reorient(points, rough = True, max_dip = None, use_linalg = False):
 
     assert points.ndim >= 2 and points.shape[-1] == 3
 
+    if sample is not None and len(points) > 2 * sample:
+        step = len(points) // sample
+        p = points[::step, :]
+    else:
+        p = points
+
     if use_linalg:
-        normal_vector = linalg_normal_vector(points)
+        normal_vector = linalg_normal_vector(p)
         incl = vec.inclination(normal_vector)
         if incl == 0.0:
             rotation_m = vec.no_rotation_matrix()
@@ -790,14 +799,14 @@ def reorient(points, rough = True, max_dip = None, use_linalg = False):
             rotation_m = vec.tilt_3d_matrix(azi, incl)
     else:
         # coarse iteration trying a few different angles
-        best_x_rotation, best_y_rotation = best_angles(points, 0.0, 0.0, 7, 30.0)
+        best_x_rotation, best_y_rotation = best_angles(p, 0.0, 0.0, 7, 30.0)
 
         # finer iteration searching around the best coarse rotation
-        best_x_rotation, best_y_rotation = best_angles(points, best_x_rotation, best_y_rotation, 5, 10.0)
+        best_x_rotation, best_y_rotation = best_angles(p, best_x_rotation, best_y_rotation, 5, 10.0)
 
         if not rough:
             # finer iteration searching around the best coarse rotation
-            best_x_rotation, best_y_rotation = best_angles(points, best_x_rotation, best_y_rotation, 7, 2.5)
+            best_x_rotation, best_y_rotation = best_angles(p, best_x_rotation, best_y_rotation, 7, 2.5)
 
         rotation_m = vec.rotation_3d_matrix((best_x_rotation, 0.0, best_y_rotation))
 
@@ -809,7 +818,7 @@ def reorient(points, rough = True, max_dip = None, use_linalg = False):
         if incl > max_dip:
             azi = vec.azimuth(v)
             rotation_m = vec.tilt_3d_matrix(azi, max_dip)  # TODO: check whether any reverse direction errors here
-        normal_vector = vec.rotate_vector(rotation_m.T, np.array((0.0, 0.0, 1.0)))
+            normal_vector = vec.rotate_vector(rotation_m.T, np.array((0.0, 0.0, 1.0)))
 
     p = points.copy()
 

{resqpy-4.8.0.dist-info → resqpy-4.8.2.dist-info}/METADATA

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

{resqpy-4.8.0.dist-info → resqpy-4.8.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=KWQYIVMDZ2NyJw04SLXwao7UTdaSKVeUndtfWPQbh1A,555
+resqpy/__init__.py,sha256=Zh3CSU4YDhZyyZNCbVFR7kXCGBKp7uGvRzZlXBy8xFk,555
 resqpy/crs.py,sha256=iq0lO3aXzttmJBfuhUjS9IHlv8OV1wuByhFk0b4fvmI,24782
 resqpy/derived_model/__init__.py,sha256=NFvMSOKI3cxmH7lAbddV43JjoUj-r2G7ExEfOqinD1I,1982
 resqpy/derived_model/_add_edges_per_column_property_array.py,sha256=cpW3gwp6MSYIrtvFmCjoJXcyUsgGuCDbgmwlJCJebUs,6410
@@ -95,7 +95,7 @@ resqpy/olio/simple_lines.py,sha256=qaR11W5UPgRmtMeFQ-pXg0jOvkJZ_XPzSUpAXqeYtlc,1
 resqpy/olio/time.py,sha256=LtoSIf1A6wunHSpDgKsSGEr0rbcSQyy35TgJvY37PrI,760
 resqpy/olio/trademark.py,sha256=p_EWvUUnfalOA0RC94fSWMDgdGY9-FdZuGtAjg3wNcY,822
 resqpy/olio/transmission.py,sha256=ojMRvzMOulb-S3FHnkR3ouIBTXA4knI0drDOt_WACso,61869
-resqpy/olio/triangulation.py,sha256=VrZB2pgLc9M_EhMorNR16L5bqEUWjae4q0EuuXQEJ6o,44288
+resqpy/olio/triangulation.py,sha256=i5jB342ub_7j6H4ft4q2iPTrnQa94hJ3jDHmdTzheFw,44768
 resqpy/olio/uuid.py,sha256=JRMi-RZNeGm8tGNloIwTATzNtdj29lBQDV9OILboPRI,7324
 resqpy/olio/vdb.py,sha256=lQYuK1kr1Wnucq2EoKgT6lrR7vloCemnCKZktzBcLUc,45231
 resqpy/olio/vector_utilities.py,sha256=Oe5NGOnV_wNExlcevBnLdP30XbvTM-4YnLmbgM4bDDk,46253
@@ -192,7 +192,7 @@ resqpy/well/_wellbore_marker_frame.py,sha256=xvYH2_2Ie3a18LReFymbUrZboOx7Rhv5DOD
 resqpy/well/blocked_well_frame.py,sha256=Lg7TgynfPv9WkklXTLt9VN6uBXWUqX1LI-Xmv_FBqYk,22555
 resqpy/well/well_object_funcs.py,sha256=LdktgZ1X-ABQ2R-DArRxGK_Pf2OjrMr-bvH3dbXBFas,24743
 resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-resqpy-4.8.0.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.8.0.dist-info/METADATA,sha256=K-vW8HebhULcpIDM4b3pfn8JECgp3172zLS_OcDZlgU,4156
-resqpy-4.8.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-resqpy-4.8.0.dist-info/RECORD,,
+resqpy-4.8.2.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.8.2.dist-info/METADATA,sha256=trapyc6jZxugi5SP-dSkBA_4n5L4gj-G4fIx4dJAmXk,4156
+resqpy-4.8.2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+resqpy-4.8.2.dist-info/RECORD,,