resqpy 4.16.6__py3-none-any.whl → 4.16.7__py3-none-any.whl

resqpy/__init__.py

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

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

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

{resqpy-4.16.6.dist-info → resqpy-4.16.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=HShUsMyW_Opst0QwCwfVL9ZeafR-pFfMTCvvDzmU6rU,556
+resqpy/__init__.py,sha256=UxKXI8Fd5rwd7CjVK-yvaBPFhw8-s2GsvgMQgWAy-Wc,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=wMP4gnzT6Smv1RKGex0fdcadzj2xmanyusNA-D_ebfI,29569
-resqpy/fault/_grid_connection_set.py,sha256=IEG9duPzPmVge-7yX70mcfmFSdU8MSR1sbQmRoSjlyE,117203
+resqpy/fault/_grid_connection_set.py,sha256=O8VQcGZlQNWgnLS_SvGAUc_l5lAvSDK2BHZK5EUf404,117264
 resqpy/grid/__init__.py,sha256=WsfOnR5lHcnpJEx8ZZ3lhd4dImEiieJLM7eFPxMi3u8,692
 resqpy/grid/_cell_properties.py,sha256=pbyAK2eV9n4teOxm2q5hyBinohEbevFPrCfMcpGiqUU,20689
 resqpy/grid/_connection_sets.py,sha256=-277bh9pMoeESSzy9oZehL-vc82aMGZuSLQs2KJ4Wfg,10120
@@ -194,7 +194,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=LYTcC07ezlBxClfrug_B4iXXZUkXDPgsVufNzp361Wo,24703
 resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-resqpy-4.16.6.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.16.6.dist-info/METADATA,sha256=nKWccolEPWrZ8qsjWUWMrrbdDSGX1uFvnJOtD7hJySI,4028
-resqpy-4.16.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-resqpy-4.16.6.dist-info/RECORD,,
+resqpy-4.16.7.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.16.7.dist-info/METADATA,sha256=OewCYwU0gqYSS4Gs7o4kiihxMnmLw9W8czw2zLogvN8,4028
+resqpy-4.16.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+resqpy-4.16.7.dist-info/RECORD,,