resqpy 5.1.11__py3-none-any.whl → 5.1.12__py3-none-any.whl

resqpy/__init__.py

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

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/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.dist-info → resqpy-5.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: resqpy
-Version: 5.1.11
+Version: 5.1.12
 Summary: Python API for working with RESQML models
 License: MIT
 Keywords: RESQML

{resqpy-5.1.11.dist-info → resqpy-5.1.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=m9JFC4Ii5VrtWGEZYLL9BYR98bJiF1BmuA3-HN9ix7E,556
+resqpy/__init__.py,sha256=csBim4zh4sLjMvqtbQcxmkK9N3KOj3_pnVIpz7DiUvc,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
@@ -25,7 +25,7 @@ resqpy/derived_model/_zonal_grid.py,sha256=H-IGMudUV-tiRHZqvl9B1wxMQNjeAM2zHvTll
 resqpy/derived_model/_zone_layer_ranges_from_array.py,sha256=4pHkp7yqvkif_pC59VEK0g0JeFx7kt8mqhqADTOcucI,4358
 resqpy/fault/__init__.py,sha256=IStX_EhPnppIExf_mgYrBddC4KP26VcqblcfXiBT614,996
 resqpy/fault/_gcs_functions.py,sha256=NRyhKkYChRaKDUIQ6pfVQiD67e4TTm3LnBvWEPtpkDU,29569
-resqpy/fault/_grid_connection_set.py,sha256=xStOkWHsbh9m6lql7f2PDURnoFOIM1mFmx-QG6yPaKo,126124
+resqpy/fault/_grid_connection_set.py,sha256=nr7Zvz7uExTchMhjDH5TUSVoqDR8ZcGdmHDIotjS3Ss,126289
 resqpy/grid/__init__.py,sha256=FTeNW9kJ8By6gA2-x-NisQQ8cY8RHCAro0lT-3ssxYQ,601
 resqpy/grid/_cell_properties.py,sha256=pbyAK2eV9n4teOxm2q5hyBinohEbevFPrCfMcpGiqUU,20689
 resqpy/grid/_connection_sets.py,sha256=-277bh9pMoeESSzy9oZehL-vc82aMGZuSLQs2KJ4Wfg,10120
@@ -68,7 +68,7 @@ resqpy/multi_processing/__init__.py,sha256=ZRudHfN9aaZjxvat7t8BZr6mwMi9baiCNjczw
 resqpy/multi_processing/_multiprocessing.py,sha256=bnCKfSC1tWwvZmZ7BZqCyje0C93m6q7HZPxNpx8xoxA,7301
 resqpy/multi_processing/wrappers/__init__.py,sha256=7vjuTWdHnp3rN9Ud8ljpDnt1NbBAyhA08lv-sQ9Kf3o,72
 resqpy/multi_processing/wrappers/blocked_well_mp.py,sha256=_2fEsSmJVQCnbQIjTHqmnNEugfhN1KvX-o4ZbvtChdI,5952
-resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=3dt6yj9vj3lSjqnRJ7ZTc9KySirxaRrLgd55WOhaJek,27443
+resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=SzNhu8ATLkYMJS1gUFXHvkv7uClGKvHFkg5eRQ-jETw,28458
 resqpy/multi_processing/wrappers/mesh_mp.py,sha256=0VYoqtgBFfrlyYB6kkjbdrRQ5FKe6t5pHJO3wD9b8Fc,5793
 resqpy/olio/__init__.py,sha256=j2breqKYVufhw5k8qS2uZwB3tUKT7FhdZ23ninS75YA,84
 resqpy/olio/ab_toolbox.py,sha256=bZlAhOJVS0HvIYBW0Lg68re17N8eltoQhIUh0xuUyVc,2147
@@ -193,7 +193,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=1O4EVPuTn-kN3uT_V4TbSwehnMUMY0TX36XOUgasTcc,24689
 resqpy/well/well_utils.py,sha256=-g_pg2v5XD9g4SQz9sk7KK-x2xEQZHzWehCQqiEGo6M,7627
-resqpy-5.1.11.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-5.1.11.dist-info/METADATA,sha256=gkVzn_t3EvFt34mBA4s6N0ORYZKq7JVunxs_JDzWn_c,3987
-resqpy-5.1.11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-resqpy-5.1.11.dist-info/RECORD,,
+resqpy-5.1.12.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-5.1.12.dist-info/METADATA,sha256=MyMKuS_qJfJF9j8-62rw8qjvtmVq43Y9gaZXidK77KI,3987
+resqpy-5.1.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+resqpy-5.1.12.dist-info/RECORD,,