resqpy 4.5.0__py3-none-any.whl → 4.6.3__py3-none-any.whl

resqpy/__init__.py

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

resqpy/grid/_defined_geometry.py

@@ -60,12 +60,14 @@ def cell_geometry_is_defined(grid, cell_kji0 = None, cell_geometry_is_defined_ro
                                              object = grid,
                                              array_attribute = 'array_cell_geometry_is_defined',
                                              dtype = 'bool')
-        if grid.geometry_defined_for_all_cells_cached is None and cache_array and hasattr(
-                grid, 'array_cell_geometry_is_defined'):
-            grid.geometry_defined_for_all_cells_cached = (np.count_nonzero(
-                grid.array_cell_geometry_is_defined) == grid.array_cell_geometry_is_defined.size)
+        if (grid.geometry_defined_for_all_cells_cached is None and (cache_array or cell_kji0 is None) and
+                hasattr(grid, 'array_cell_geometry_is_defined')):
+            grid.geometry_defined_for_all_cells_cached =  \
+                (np.count_nonzero(grid.array_cell_geometry_is_defined) == grid.array_cell_geometry_is_defined.size)
             if grid.geometry_defined_for_all_cells_cached:
                 delattr(grid, 'array_cell_geometry_is_defined')
+        if cell_kji0 is None:
+            return grid.geometry_defined_for_all_cells_cached
         return result
 
 
@@ -291,7 +293,7 @@ def set_geometry_is_defined(grid,
 
     assert not np.all(nan_mask), 'grid does not have any geometry defined'
 
-    points[:] = np.where(np.repeat(np.expand_dims(nan_mask, axis = nan_mask.ndim), 3, axis = -1), np.NaN, points)
+    points[np.where(np.repeat(np.expand_dims(nan_mask, axis = nan_mask.ndim), 3, axis = -1))] = np.NaN
 
     surround_z = grid.xyz_box(lazy = False)[1 if grid.z_inc_down() else 0, 2]
 
@@ -307,11 +309,12 @@ def set_geometry_is_defined(grid,
 
     grid.geometry_defined_for_all_cells_cached = False
 
-    primary_nan_mask = \
-        nan_mask.reshape((grid.nk_plus_k_gaps + 1, -1))[:, :primary_count].reshape(
-            (grid.nk_plus_k_gaps + 1, grid.nj + 1, grid.ni + 1))
+    primary_nan_mask = nan_mask.reshape((grid.nk_plus_k_gaps + 1, -1))[:, :primary_count].reshape(
+        (grid.nk_plus_k_gaps + 1, grid.nj + 1, grid.ni + 1))
+
     column_nan_mask = np.logical_or(np.logical_or(primary_nan_mask[:, :-1, :-1], primary_nan_mask[:, :-1, 1:]),
                                     np.logical_or(primary_nan_mask[:, 1:, :-1], primary_nan_mask[:, 1:, 1:]))
+
     if grid.k_gaps:
         grid.array_cell_geometry_is_defined = np.logical_not(
             np.logical_or(column_nan_mask[grid.k_raw_index_array], column_nan_mask[grid.k_raw_index_array + 1]))
@@ -333,6 +336,7 @@ def set_geometry_is_defined(grid,
         partial_pillar_mask = np.logical_and(pillar_defined_mask, np.any(nan_mask, axis = 0).flatten())
         if np.any(partial_pillar_mask):
             points.reshape((grid.nk_plus_k_gaps + 1, -1, 3))[:, partial_pillar_mask, :] = np.NaN
+            grid.geometry_defined_for_all_pillars_cached = False
             cells_update_needed = True
     elif complete_partial_pillars:
         partial_pillar_mask = np.logical_and(pillar_defined_mask, np.any(nan_mask, axis = 0).flatten())
@@ -356,7 +360,9 @@ def set_geometry_is_defined(grid,
                 (grid.nj + 1, grid.ni + 1)))
             column_nan_mask = np.logical_or(np.logical_or(top_nan_mask[:-1, :-1], top_nan_mask[:-1, 1:]),
                                             np.logical_or(top_nan_mask[1:, :-1], top_nan_mask[1:, 1:]))
-            grid.array_cell_geometry_is_defined = np.repeat(np.expand_dims(column_nan_mask, 0), grid.nk, axis = 0)
+            grid.array_cell_geometry_is_defined = np.repeat(np.logical_not(np.expand_dims(column_nan_mask, 0)),
+                                                            grid.nk,
+                                                            axis = 0)
             grid.geometry_defined_for_all_cells_cached = np.all(grid.array_cell_geometry_is_defined)
             if grid.geometry_defined_for_all_cells_cached:
                 del grid.array_cell_geometry_is_defined

resqpy/grid_surface/__init__.py

@@ -1,49 +1,70 @@
 """Classes for RESQML objects related to surfaces."""
 
 __all__ = [
-    'GridSkin', 'generate_untorn_surface_for_layer_interface', 'generate_torn_surface_for_layer_interface',
-    'generate_torn_surface_for_x_section', 'generate_untorn_surface_for_x_section', 'point_is_within_cell',
-    'create_column_face_mesh_and_surface', 'find_intersections_of_trajectory_with_surface',
-    'find_intersections_of_trajectory_with_layer_interface', 'find_first_intersection_of_trajectory_with_surface',
-    'find_first_intersection_of_trajectory_with_layer_interface',
-    'find_first_intersection_of_trajectory_with_cell_surface',
-    'find_intersection_of_trajectory_interval_with_column_face', 'trajectory_grid_overlap',
-    'populate_blocked_well_from_trajectory', 'generate_surface_for_blocked_well_cells',
-    'find_faces_to_represent_surface_staffa', 'find_faces_to_represent_surface_regular',
-    'find_faces_to_represent_surface_regular_optimised', 'find_faces_to_represent_surface', 'bisector_from_faces',
-    'column_bisector_from_faces', 'shadow_from_faces', 'get_boundary', 'where_true', 'first_true', 'intersect_numba'
+    "GridSkin",
+    "generate_untorn_surface_for_layer_interface",
+    "generate_torn_surface_for_layer_interface",
+    "generate_torn_surface_for_x_section",
+    "generate_untorn_surface_for_x_section",
+    "point_is_within_cell",
+    "create_column_face_mesh_and_surface",
+    "find_intersections_of_trajectory_with_surface",
+    "find_intersections_of_trajectory_with_layer_interface",
+    "find_first_intersection_of_trajectory_with_surface",
+    "find_first_intersection_of_trajectory_with_layer_interface",
+    "find_first_intersection_of_trajectory_with_cell_surface",
+    "find_intersection_of_trajectory_interval_with_column_face",
+    "trajectory_grid_overlap",
+    "populate_blocked_well_from_trajectory",
+    "generate_surface_for_blocked_well_cells",
+    "find_faces_to_represent_surface_staffa",
+    "find_faces_to_represent_surface_regular",
+    "find_faces_to_represent_surface_regular_optimised",
+    "find_faces_to_represent_surface",
+    "bisector_from_faces",
+    "column_bisector_from_faces",
+    "shadow_from_faces",
+    "get_boundary",
+    "_where_true",
+    "_first_true",
+    "intersect_numba",
 ]
 
 from ._grid_skin import GridSkin
-from ._grid_surface import  \
-    generate_untorn_surface_for_layer_interface,  \
-    generate_torn_surface_for_layer_interface,  \
-    generate_torn_surface_for_x_section,  \
-    generate_untorn_surface_for_x_section,  \
-    point_is_within_cell,  \
-    create_column_face_mesh_and_surface
-from ._trajectory_intersects import  \
-    find_intersections_of_trajectory_with_surface,  \
-    find_intersections_of_trajectory_with_layer_interface,  \
-    find_first_intersection_of_trajectory_with_surface,  \
-    find_first_intersection_of_trajectory_with_layer_interface,  \
-    find_first_intersection_of_trajectory_with_cell_surface,  \
-    find_intersection_of_trajectory_interval_with_column_face,  \
-    trajectory_grid_overlap
-from ._blocked_well_populate import  \
-    populate_blocked_well_from_trajectory,  \
-    generate_surface_for_blocked_well_cells
-from ._find_faces import  \
-    find_faces_to_represent_surface_staffa,  \
-    find_faces_to_represent_surface_regular,  \
-    find_faces_to_represent_surface_regular_optimised,  \
-    find_faces_to_represent_surface,  \
-    bisector_from_faces,  \
-    column_bisector_from_faces,  \
-    shadow_from_faces,  \
-    get_boundary,  \
-    where_true,  first_true,  \
-    intersect_numba
+from ._grid_surface import (
+    generate_untorn_surface_for_layer_interface,
+    generate_torn_surface_for_layer_interface,
+    generate_torn_surface_for_x_section,
+    generate_untorn_surface_for_x_section,
+    point_is_within_cell,
+    create_column_face_mesh_and_surface,
+)
+from ._trajectory_intersects import (
+    find_intersections_of_trajectory_with_surface,
+    find_intersections_of_trajectory_with_layer_interface,
+    find_first_intersection_of_trajectory_with_surface,
+    find_first_intersection_of_trajectory_with_layer_interface,
+    find_first_intersection_of_trajectory_with_cell_surface,
+    find_intersection_of_trajectory_interval_with_column_face,
+    trajectory_grid_overlap,
+)
+from ._blocked_well_populate import (
+    populate_blocked_well_from_trajectory,
+    generate_surface_for_blocked_well_cells,
+)
+from ._find_faces import (
+    find_faces_to_represent_surface_staffa,
+    find_faces_to_represent_surface_regular,
+    find_faces_to_represent_surface_regular_optimised,
+    find_faces_to_represent_surface,
+    bisector_from_faces,
+    column_bisector_from_faces,
+    shadow_from_faces,
+    get_boundary,
+    _where_true,
+    _first_true,
+    intersect_numba,
+)
 
 # Set "module" attribute of all public objects to this path.
 for _name in __all__: