resqpy 4.17.8__py3-none-any.whl → 4.17.10__py3-none-any.whl

resqpy/__init__.py

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

resqpy/grid_surface/_find_faces.py

@@ -1145,7 +1145,8 @@ def find_faces_to_represent_surface_regular_optimised(grid,
     if progress_fn is not None:
         progress_fn(0.9)
 
-    if k_faces_kji0 is None and j_faces_kji0 is None and i_faces_kji0 is None:
+    if ((k_faces_kji0 is None or len(k_faces_kji0) == 0) and (j_faces_kji0 is None or len(j_faces_kji0) == 0) and
+        (i_faces_kji0 is None or len(i_faces_kji0) == 0)):
         log.error(f'did not find any faces to represent {name}: surface does not intersect grid?')
         if return_properties:
             return (None, {})
@@ -1226,7 +1227,8 @@ def find_faces_to_represent_surface_regular_optimised(grid,
             # log.debug('finished preparing columns bisector')
         else:
             log.debug("preparing cells bisector")
-            if k_faces_kji0 is None and j_faces_kji0 is None and i_faces_kji0 is None:
+            if ((k_faces_kji0 is None or len(k_faces_kji0) == 0) and
+                (j_faces_kji0 is None or len(j_faces_kji0) == 0) and (i_faces_kji0 is None or len(i_faces_kji0) == 0)):
                 bisector = np.ones((grid.nj, grid.ni), dtype = bool)
                 is_curtain = True
             else:
@@ -2010,8 +2012,8 @@ def get_boundary_from_indices(  # type: ignore
         box[1, 1] = max(box[1, 1], j_max_kji0[1])  # type: ignore
         box[1, 2] = max(box[1, 2], j_max_kji0[2])  # type: ignore
     if i_min_kji0 is not None:
-        box[0, 1] = min(box[0, 1], i_min_kji0[0])
-        box[0, 2] = min(box[0, 2], i_min_kji0[1])
+        box[0, 0] = min(box[0, 0], i_min_kji0[0])
+        box[0, 1] = min(box[0, 1], i_min_kji0[1])
         box[0, 2] = min(box[0, 2], i_min_kji0[2])
         box[1, 0] = max(box[1, 0], i_max_kji0[0])  # type: ignore
         box[1, 1] = max(box[1, 1], i_max_kji0[1])  # type: ignore

{resqpy-4.17.8.dist-info → resqpy-4.17.10.dist-info}/METADATA

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

{resqpy-4.17.8.dist-info → resqpy-4.17.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=abnGHVyMOlZut3zbCpN_mPCzniBim5FnqwHzdo2wR38,556
+resqpy/__init__.py,sha256=aTwCJeIjGzaZqObVT5I0P6wYP60BEBWztBZxI-AMahc,557
 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=rPr5zFFRmUDbMEhnCYsweSC3xugtQ8LnhZOf8JLIqIc,2765
 resqpy/grid_surface/_blocked_well_populate.py,sha256=Lme1AR-nLWOUlNnmHMVThk6jEg_lAZxWWtL82Yksppw,35867
-resqpy/grid_surface/_find_faces.py,sha256=TQDwKB56R5HZTB4iVyBCQRn0QcHwJ5Msc928vCExDss,93703
+resqpy/grid_surface/_find_faces.py,sha256=eMiT7wWIJJtldAY0-Imb2f3d_cjsADj-UCeMDaGAYaM,93899
 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=eK7Ca6PcqI3pK-XurZIcXAV5Z4B9PFe6H8a7DqVkmBo,22560
 resqpy/well/well_object_funcs.py,sha256=tWufc8wahihzMEO-Ou1dncIttrf4bNo1qmLgh3I2pOM,24717
 resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-resqpy-4.17.8.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.17.8.dist-info/METADATA,sha256=pK2eYC3DsUrCOkUqZqJJ9PQMCZplPnC47gP1X4rLc2o,4028
-resqpy-4.17.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-resqpy-4.17.8.dist-info/RECORD,,
+resqpy-4.17.10.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.17.10.dist-info/METADATA,sha256=AnujGEZLIW5OeC7MNnoyy06OOqUfNsdTGaSVL98G0us,4029
+resqpy-4.17.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+resqpy-4.17.10.dist-info/RECORD,,