resqpy 4.8.3__py3-none-any.whl → 4.8.4__py3-none-any.whl

resqpy/__init__.py

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

resqpy/model/_hdf5.py

@@ -229,10 +229,12 @@ def _h5_array_element(model,
         shape_tuple = tuple(h5_root[h5_key_pair[1]].shape)
         if required_shape is None:
             required_shape = shape_tuple
+        else:
+            required_shape = tuple(required_shape)
         object.__dict__[array_attribute] = np.zeros(required_shape, dtype = dtype)
         if shape_tuple == required_shape:
             object.__dict__[array_attribute][:] = h5_root[h5_key_pair[1]]
-        elif (len(shape_tuple) == len(required_shape) and ('bool' in str_dtype or 'int8' in str_dtype) and
+        elif (len(shape_tuple) == len(required_shape) and ('bool' in str_dtype or 'uint8' in str_dtype) and
               8 * (shape_tuple[-1] - 1) < required_shape[-1] <= 8 * shape_tuple[-1]):
             a = np.unpackbits(h5_root[h5_key_pair[1]], axis = -1).astype(bool)
             object.__dict__[array_attribute][:] = a[..., :required_shape[-1]]

resqpy/property/_collection_get_attributes.py

@@ -427,6 +427,8 @@ def _supporting_shape_grid(support, indexable_element, direction):
         shape_list = [support.nk, support.ni]
     elif indexable_element == 'I0':
         shape_list = [support.nk, support.nj]
+    else:
+        raise ValueError(f'unsupported grid indexable element: {indexable_element}')
     return shape_list
 
 
@@ -549,7 +551,7 @@ def _cached_part_array_ref_const_none(collection, part, dtype, model, cached_arr
     # the required shape is required if a bool array may need to be unpacked from bits
     required_shape = None
     str_dtype = str(dtype)
-    if use_pack and ('bool' in str_dtype or 'int8' in str_dtype):
+    if use_pack and ('bool' in str_dtype or 'uint8' in str_dtype):
         required_shape = collection.supporting_shape(indexable_element = collection.indexable_for_part(part),
                                                      direction = _part_direction(collection, part))
 

{resqpy-4.8.3.dist-info → resqpy-4.8.4.dist-info}/METADATA

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

{resqpy-4.8.3.dist-info → resqpy-4.8.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=s6aVZ6vLnhmPPWOVdm04L5b74UqKIck4nEA5oAG-3gQ,555
+resqpy/__init__.py,sha256=yQv1gAOYtvOtkQA1zkolH_qP8vynreXYsCVWIGqkglo,555
 resqpy/crs.py,sha256=iq0lO3aXzttmJBfuhUjS9IHlv8OV1wuByhFk0b4fvmI,24782
 resqpy/derived_model/__init__.py,sha256=NFvMSOKI3cxmH7lAbddV43JjoUj-r2G7ExEfOqinD1I,1982
 resqpy/derived_model/_add_edges_per_column_property_array.py,sha256=cpW3gwp6MSYIrtvFmCjoJXcyUsgGuCDbgmwlJCJebUs,6410
@@ -62,7 +62,7 @@ resqpy/model/_catalogue.py,sha256=CvR7rdlY7_z9v05FawCzcmicA8jgnilPyuQf4GNnDlU,30
 resqpy/model/_context.py,sha256=0tLBVMcuuIj3i87Ig8lhFMLHE5GHgEA2PEl1NjKaohc,2840
 resqpy/model/_forestry.py,sha256=qfpDnaWQFOoQ9nZEpllTbFvB0wGfUl0X4UXmcp5A9Is,34159
 resqpy/model/_grids.py,sha256=d7hRQRmni5pJrm1CY31D2icJV1XDar7xTmUexq_eVGY,3371
-resqpy/model/_hdf5.py,sha256=cjrU3Z773BpVLhFQPe-Kk8V5BMH0ugOICi99aNzHdC0,14172
+resqpy/model/_hdf5.py,sha256=2iQdyUp5eNLfWhmvl_XuFO8j7dCdtTBjtrr6-9mq3Qg,14238
 resqpy/model/_model.py,sha256=8CTqYCxSoiA8ONrxEQ_vq20qTJfHkhhF-tiJUTwfEEk,103055
 resqpy/model/_xml.py,sha256=n042AUhJU8AV1S4GdeeAdXikSqu2UGoSYT6AMXS2_bA,23589
 resqpy/multi_processing/__init__.py,sha256=ZRudHfN9aaZjxvat7t8BZr6mwMi9baiCNjczwwT0WjI,909
@@ -130,7 +130,7 @@ resqpy/organize/wellbore_interpretation.py,sha256=jRAHq90tR2dCQSXsZicujXhSVHOEPo
 resqpy/property/__init__.py,sha256=3dNW6fYT8nrNFA3Ja7Tz5AsoT-SX6VPnXYhnkHKl-VQ,2155
 resqpy/property/_collection_add_part.py,sha256=wzF40k5RMdbNOyDN_JxPOYR0G7l48Cu0MySQ6ZiF9Bo,16697
 resqpy/property/_collection_create_xml.py,sha256=GgreApUncPvzQSICYq5cHm0z8yBWHFrriM6eR9Q1pYI,13021
-resqpy/property/_collection_get_attributes.py,sha256=x2CTcq0uEb2SUASav99KTV_5IrfExK5vwfpTuBCGMzU,30025
+resqpy/property/_collection_get_attributes.py,sha256=DOZfNmamIbJglHKkMBgukOvvG-3TbdZxsXbtH0aDD2o,30121
 resqpy/property/_collection_support.py,sha256=Frcc2XRF5fODbkKf9qrWfz_N5khQrguSyWbQ5jXot7E,5368
 resqpy/property/_property.py,sha256=JcG7h6k4cJ4l3WC_VCsvoqHM3FBxrnUuxbIK2Ono1M0,24426
 resqpy/property/grid_property_collection.py,sha256=gmRlalqukdVT5PomgLOoPf42z__zqEgNqwx_31aLqow,66946
@@ -192,7 +192,7 @@ resqpy/well/_wellbore_marker_frame.py,sha256=xvYH2_2Ie3a18LReFymbUrZboOx7Rhv5DOD
 resqpy/well/blocked_well_frame.py,sha256=Lg7TgynfPv9WkklXTLt9VN6uBXWUqX1LI-Xmv_FBqYk,22555
 resqpy/well/well_object_funcs.py,sha256=LdktgZ1X-ABQ2R-DArRxGK_Pf2OjrMr-bvH3dbXBFas,24743
 resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-resqpy-4.8.3.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.8.3.dist-info/METADATA,sha256=kfd4HHedswt67Mh_kFB_2VLsaLvE_YoWJf6Y6ruN9Ss,4156
-resqpy-4.8.3.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-resqpy-4.8.3.dist-info/RECORD,,
+resqpy-4.8.4.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.8.4.dist-info/METADATA,sha256=b0KNBhMHycJY13hlJaqgJH35xe6eaSITmOATFOBu-jc,4156
+resqpy-4.8.4.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+resqpy-4.8.4.dist-info/RECORD,,