resqpy 4.16.5__tar.gz → 4.16.7__tar.gz

{resqpy-4.16.5 → resqpy-4.16.7}/PKG-INFO

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

{resqpy-4.16.5 → resqpy-4.16.7}/pyproject.toml

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

{resqpy-4.16.5 → resqpy-4.16.7}/resqpy/__init__.py

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

{resqpy-4.16.5 → resqpy-4.16.7}/resqpy/fault/_grid_connection_set.py

@@ -249,6 +249,7 @@ class GridConnectionSet(BaseResqpy):
         gcs.model = parent_model
         gcs.uuid = bu.new_uuid()  # not strictly necessary as append will cause a new uuid as well
         gcs.title = title
+        gcs.property_collection = None
         # append data from the remaining grid connection sets
         for another_uuid in gcs_uuid_list[1:]:
             another_gcs = GridConnectionSet(source_model, uuid = another_uuid)
@@ -2089,6 +2090,7 @@ class GridConnectionSet(BaseResqpy):
         if default_value is None:
             default_value = -1 if dtype is int else np.NaN
         gcs_prop_array = gcs_prop.array_ref()
+        assert gcs_prop_array.shape == (self.count,)
         log.debug(f'preparing grid face arrays from gcs property: {gcs_prop.title}; from gcs:{self.title}')
 
         baffle_mask = None
@@ -2102,29 +2104,31 @@ class GridConnectionSet(BaseResqpy):
         ai = np.full((nk, nj, ni + 1), default_value, dtype = dtype)
 
         # populate arrays from faces of gcs, optionally filtered by feature index
-        cip, fip = self.list_of_cell_face_pairs_for_feature_index(None)
-        assert len(cip) == self.count and len(fip) == self.count
-        assert gcs_prop_array.shape == (self.count,)
-        if feature_index is None:
-            indices = np.arange(self.count, dtype = int)
-        else:
-            indices = self.indices_for_feature_index(feature_index)
-
-        side_list = ([0] if lazy else [0, 1])
+        cip, fip = self.list_of_cell_face_pairs_for_feature_index(feature_index)
 
         value_array = gcs_prop_array.copy()
+
         if baffle_mask is not None:
             value_array[baffle_mask] = 0  # will be cast to float (or bool) if needed
+
+        if feature_index is not None:
+            indices = self.indices_for_feature_index(feature_index)
+            value_array = value_array[indices]
+            if active_mask is not None:
+                active_mask = active_mask[indices]
+
         if active_mask is not None:
             cip = cip[active_mask, :, :]
             value_array = value_array[active_mask]
 
+        side_list = ([0] if lazy else [0, 1])
+
         for side in side_list:
             cell_kji0 = cip[:, side].copy()  # shape (N, 3)
             axis = fip[:, side, 0]  # shape (N,)
             polarity = fip[:, side, 1]  # shape (N,)
-            assert 0 <= np.min(axis) and np.max(axis) <= 2
-            assert 0 <= np.min(polarity) and np.max(polarity) <= 1
+            # assert 0 <= np.min(axis) and np.max(axis) <= 2
+            # assert 0 <= np.min(polarity) and np.max(polarity) <= 1
 
             axis_mask = (axis == 0).astype(bool)
             ak_kji0 = cell_kji0[axis_mask, :]

{resqpy-4.16.5 → resqpy-4.16.7}/resqpy/model/_hdf5.py

@@ -286,6 +286,14 @@ def _h5_overwrite_array_slice(model, h5_key_pair, slice_tuple, array_slice):
     dset[slice_tuple] = array_slice
 
 
+def _h5_overwrite_array(model, h5_key_pair, array):
+    """Overwrites (updates) the whole of an hdf5 array."""
+
+    h5_root = _h5_access(model, h5_key_pair[0], mode = 'a')
+    dset = h5_root[h5_key_pair[1]]
+    dset[...] = array
+
+
 def h5_clear_filename_cache(model):
     """Clears the cached filenames associated with all ext uuids."""
 

{resqpy-4.16.5 → resqpy-4.16.7}/resqpy/model/_model.py

@@ -1475,6 +1475,21 @@ class Model():
 
         return m_h._h5_overwrite_array_slice(self, h5_key_pair, slice_tuple, array_slice)
 
+    def h5_overwrite_array(self, h5_key_pair, array):
+        """Overwrites (updates) the whole of an hdf5 array.
+
+        arguments:
+           h5_key_pair (uuid, string): the uuid of the hdf5 ext part and the hdf5 internal path to the
+              required hdf5 array
+           array (numpy array of shape to match existing hdf5 dataset): the data to write
+
+        notes:
+           this method naively updates an hdf5 array without using mpi to look after parallel updates;
+           metadata (such as uuid or property min, max values) is not modified in any way by the method
+        """
+
+        return m_h._h5_overwrite_array(self, h5_key_pair, array)
+
     def h5_clear_filename_cache(self):
         """Clears the cached filenames associated with all ext uuids."""