resqpy 4.18.9__py3-none-any.whl → 4.18.10__py3-none-any.whl

resqpy/__init__.py

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

resqpy/property/_collection_get_attributes.py

@@ -538,6 +538,8 @@ def _supporting_shape_polylineset(support, indexable_element):
         shape_list = [len(support.coordinates) - reduction]
     elif indexable_element == 'nodes':
         shape_list = [len(support.coordinates)]
+    elif indexable_element in ['patches', 'enumerated elements', 'contacts']:  # one value per polyline within the set
+        shape_list = [len(support.count_perpol)]
     return shape_list
 
 

resqpy/property/property_collection.py

@@ -141,20 +141,28 @@ class PropertyCollection():
         else:
             pcs._set_support_uuid_notnone(self, support, support_uuid, model, modify_parts)
 
-    def supporting_shape(self, indexable_element = None, direction = None):
+    def supporting_shape(self,
+                         indexable_element = None,
+                         direction = None,
+                         count = 1,
+                         points = False,
+                         pre_packed = False):
         """Return the shape of the supporting representation with respect to the given indexable element
 
         arguments:
            indexable_element (string, optional): if None, a hard-coded default depending on the supporting representation class
               will be used
            direction (string, optional): must be passed if required for the combination of support class and indexable element;
-              currently only used for Grid faces.
+              currently only used for Grid faces
+           count (int, default 1): the count parameter for the property
+           points (bool, default False): set True if the property is a points property
+           pre_packed (bool, default False): set True if the required shape is for a pre-packed boolean property
 
         returns:
            list of int, being required shape of numpy array, or None if not coded for
 
         note:
-           individual property arrays will only match this shape if they have the same indexable element and a count of one
+           individual property arrays will only match this shape if they have the same indexable element and matching count etc.
         """
 
         # when at global level was causing circular reference loading issues as grid imports this module
@@ -204,6 +212,14 @@ class PropertyCollection():
         else:
             raise Exception(f'unsupported support class {type(support)} for property')
 
+        if pre_packed:
+            shape_list[-1] = (shape_list[-1] - 1) // 8 + 1
+
+        if shape_list is not None:
+            if count > 1:
+                shape_list.append(count)
+            if points:
+                shape_list.append(3)
         return shape_list
 
     def populate_from_property_set(self, property_set_root):
@@ -1867,7 +1883,7 @@ class PropertyCollection():
             shape = self.supporting_shape(indexable_element = self.indexable_for_part(part),
                                           direction = pcga._part_direction(self, part))
             assert shape is not None
-            return shape, (float if self.continuous_for_part(part) else int)
+            return tuple(shape), (float if self.continuous_for_part(part) else int)
 
         h5_key_pair = self._shape_and_type_of_part_get_h5keypair(part, part_node, model)
         if h5_key_pair is None:
@@ -2283,6 +2299,15 @@ class PropertyCollection():
         uuid = bu.new_uuid()
         cached_name = rqp_c._cache_name_for_uuid(uuid)
         if cached_array is not None:
+            direction = facet if facet_type == 'direction' else None
+            shape = self.supporting_shape(indexable_element = indexable_element,
+                                          direction = direction,
+                                          count = count,
+                                          points = points,
+                                          pre_packed = pre_packed)
+            assert shape is not None, f'unsupported indexable element {indexable_element} for supporting representation'
+            assert cached_array.shape == tuple(
+                shape), f'property array has shape {cached_array.shape} when expecting {tuple(shape)}'
             min_value, max_value = pcga._min_max_of_cached_array(self, cached_name, cached_array, null_value, discrete)
         else:
             if const_value == null_value or isinstance(const_value, bool) or (not discrete and np.isnan(const_value)):

{resqpy-4.18.9.dist-info → resqpy-4.18.10.dist-info}/METADATA

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

{resqpy-4.18.9.dist-info → resqpy-4.18.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=lB-7ZcQp9dDxWaqMRVMU8EvWJuaaUZH9Pp6m7NuwNiQ,556
+resqpy/__init__.py,sha256=bCgJboQVKJh3Tfvdixcjr9IwEMz9vrWU8msVRPmQr6M,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
@@ -130,12 +130,12 @@ resqpy/organize/wellbore_interpretation.py,sha256=jRAHq90tR2dCQSXsZicujXhSVHOEPo
 resqpy/property/__init__.py,sha256=KegXDizklsMB-EnGFrzhCSszrXAHXEIoStdC5XmyifQ,2294
 resqpy/property/_collection_add_part.py,sha256=uM64TWqJ0aBUwP1u1OJNTUhKLGlmOQj14fGPLG-2pRs,17156
 resqpy/property/_collection_create_xml.py,sha256=p9GASodhg4vQqDDvCOHScto_Qtz_nDADGtvZY92Dcu8,13001
-resqpy/property/_collection_get_attributes.py,sha256=MlontPfGo00lxt0SpB49YG9PRsi5oXPqduDgCSOSmzs,32441
+resqpy/property/_collection_get_attributes.py,sha256=whWG3O3fIXi2TetUKQWC4JPjrKI9tPrYmw0d51HkJgY,32609
 resqpy/property/_collection_support.py,sha256=77_DG-0pzhMWdG_mNDiGfihXD7Pp-CvDSGCV8ZlDjj4,5889
 resqpy/property/_property.py,sha256=JcG7h6k4cJ4l3WC_VCsvoqHM3FBxrnUuxbIK2Ono1M0,24426
 resqpy/property/attribute_property_set.py,sha256=gATFe-vI00GrgaJNMHSKbM0xmlxIsO5DT1qRSU9snYI,12295
 resqpy/property/grid_property_collection.py,sha256=37dVQSBSTpX22UfBcpPvwGjd8H3O2MepKpWXYc4yJvM,66858
-resqpy/property/property_collection.py,sha256=RqFzbN60P_Q973R9UsxXo2gBnwv-9NSuNPpo38fQgxY,152986
+resqpy/property/property_collection.py,sha256=rz_J3-NSyrPOKV2IzC3hqX5Io_oZf-8KLqdeQ0P9YsY,154356
 resqpy/property/property_common.py,sha256=wf429weNtgf6J4gCNNoRwj64elQvUPI_ZWzg4qI7l6c,35993
 resqpy/property/property_kind.py,sha256=6SK0La09eisHPYOSgdx69K_Ordrq0x2tz4IAyurVyY8,5557
 resqpy/property/string_lookup.py,sha256=eH-lbLRbb8JKtO91FTtyuYseRGwPkmsghcXbKUTvVgI,7737
@@ -194,7 +194,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=tWufc8wahihzMEO-Ou1dncIttrf4bNo1qmLgh3I2pOM,24717
 resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-resqpy-4.18.9.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.18.9.dist-info/METADATA,sha256=cgQ2tIjpkdQz_Eu2ccGfKDuF_zcmf6K2QIZmL4R8oIs,4028
-resqpy-4.18.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-resqpy-4.18.9.dist-info/RECORD,,
+resqpy-4.18.10.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.18.10.dist-info/METADATA,sha256=jnRJbRcNGiFk8VVQANkqRuApRa4Y0EQ5I0201HlTRk8,4029
+resqpy-4.18.10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+resqpy-4.18.10.dist-info/RECORD,,