resqpy 5.1.11__tar.gz → 5.1.13__tar.gz

{resqpy-5.1.11 → resqpy-5.1.13}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: resqpy
-Version: 5.1.11
+Version: 5.1.13
 Summary: Python API for working with RESQML models
 License: MIT
+License-File: LICENSE
 Keywords: RESQML
 Author: BP
 Requires-Python: >=3.9,<3.13

{resqpy-5.1.11 → resqpy-5.1.13}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "resqpy"
-version = "5.1.11" # Set at build time
+version = "5.1.13" # Set at build time
 description = "Python API for working with RESQML models"
 authors = ["BP"]
 license = "MIT"

{resqpy-5.1.11 → resqpy-5.1.13}/resqpy/__init__.py

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

{resqpy-5.1.11 → resqpy-5.1.13}/resqpy/fault/_grid_connection_set.py

@@ -10,6 +10,7 @@ import math as maths
 import numpy as np
 import pandas as pd
 
+from typing import Optional
 import resqpy.grid as grr
 import resqpy.fault
 import resqpy.olio.read_nexus_fault as rnf
@@ -2302,8 +2303,11 @@ def _copy_organisation_objects(target_model, source_model, gcs):
                                                 uuid)  # will copy related features as well as interpretations
 
 
-def _sort_and_remove_duplicates(a, props = None):
-    """Return copy of 1D array a, sorted and with duplicates removed; secondary arrays can be kept in alignment."""
+def _sort_and_remove_duplicates(a: np.ndarray, props: Optional[list[np.ndarray]] = None):
+    """Return copy of 1D array a, sorted and with duplicates removed; secondary arrays can be kept in alignment. 
+    
+    note: If present, property arrays are also sorted in-place with duplicates removed.
+    """
     if a is None or a.size <= 1:
         return a
     assert a.ndim == 1
@@ -2317,9 +2321,8 @@ def _sort_and_remove_duplicates(a, props = None):
     m = np.empty(a.size, dtype = bool)
     m[0] = True
     m[1:] = (a[1:] != a[:-1])
-    if np.all(m):
-        return a
     if not no_props:
+        assert props is not None
         for i in range(len(props)):
             p = props[i][si]
             props[i] = p[m]

{resqpy-5.1.11 → resqpy-5.1.13}/resqpy/multi_processing/wrappers/grid_surface_mp.py

@@ -424,16 +424,7 @@ def find_faces_to_represent_surface_regular_wrapper(
                     indexable_element = "cells",
                 )
             elif p_name == 'flange bool':
-                property_collection.add_cached_array_to_imported_list(
-                    array,
-                    f"from find_faces function for {surface.title}",
-                    f'{surface.title} {p_name}',
-                    discrete = True,
-                    null_value = -1,
-                    property_kind = "flange bool",
-                    realization = realisation,
-                    indexable_element = "faces",
-                )
+                log.debug('flange bool processed separately to ensure correct dtype for packing')
             else:
                 raise ValueError(f'unrecognised property name {p_name}')
         if property_collection.number_of_imports() > 0:
@@ -442,6 +433,26 @@ def find_faces_to_represent_surface_regular_wrapper(
             uuids_properties = property_collection.create_xml_for_imported_list_and_add_parts_to_model(
                 find_local_property_kinds = True)
             uuid_list.extend(uuids_properties)
+
+        if 'flange bool' in properties.keys():
+            log.debug('flange bool processed separately to ensure correct dtype for packing')
+            p_name = 'flange bool'
+            array = properties['flange bool']
+            property_collection.add_cached_array_to_imported_list(array,
+                                                                  f"from find_faces function for {surface.title}",
+                                                                  f'{surface.title} {p_name}',
+                                                                  discrete = True,
+                                                                  null_value = -1,
+                                                                  property_kind = "flange bool",
+                                                                  realization = realisation,
+                                                                  indexable_element = "faces")
+        if property_collection.number_of_imports() > 0:
+            # log.debug('writing gcs property hdf5 data')
+            property_collection.write_hdf5_for_imported_list(use_pack = use_pack, dtype = np.int8)
+            uuids_properties = property_collection.create_xml_for_imported_list_and_add_parts_to_model(
+                find_local_property_kinds = True)
+            uuid_list.extend(uuids_properties)
+
         if grid_pc is not None and grid_pc.number_of_imports() > 0:
             # log.debug('writing grid property (bisector) hdf5 data')
             grid_pc.write_hdf5_for_imported_list(use_pack = use_pack)

{resqpy-5.1.11 → resqpy-5.1.13}/resqpy/olio/triangulation.py

@@ -1,5 +1,5 @@
 """triangulation.py: functions for finding Delaunay triangulation and Voronoi graph from a set of points."""
-
+from __future__ import annotations
 import logging
 
 log = logging.getLogger(__name__)