resqpy 4.16.0__py3-none-any.whl → 4.16.2__py3-none-any.whl

resqpy/__init__.py

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

resqpy/fault/_gcs_functions.py

@@ -439,29 +439,29 @@ def combined_tr_mult_from_gcs_mults(model,
 
         # merge in each of the three directional face arrays for this gcs with combined arrays
         for (combo_trm, gcs_trm) in [(combo_trm_k, gcs_trm_k), (combo_trm_j, gcs_trm_j), (combo_trm_i, gcs_trm_i)]:
-            mask = np.logical_not(np.isnan(gcs_trm))  # true where this tr mult is present
+            mask = np.logical_not(np.isnan(gcs_trm)).astype(bool)  # true where this tr mult is present
             clash_mask = np.logical_and(mask, np.logical_not(np.isnan(combo_trm)))  # true where combined value clashes
             if np.any(clash_mask):
                 if merge_mode == 'exception':
                     raise ValueError('gcs transmissibility multiplier conflict when merging')
                 if merge_mode == 'minimum':
-                    combo_trm[:] = np.where(clash_mask, np.minimum(combo_trm, gcs_trm), combo_trm)
+                    combo_trm[clash_mask] = np.minimum(combo_trm, gcs_trm)[clash_mask]
                 elif merge_mode == 'maximum':
-                    combo_trm[:] = np.where(clash_mask, np.maximum(combo_trm, gcs_trm), combo_trm)
+                    combo_trm[clash_mask] = np.maximum(combo_trm, gcs_trm)[clash_mask]
                 elif merge_mode == 'multiply':
-                    combo_trm[:] = np.where(clash_mask, combo_trm * gcs_trm, combo_trm)
+                    combo_trm[clash_mask] = (combo_trm * gcs_trm)[clash_mask]
                 else:
                     raise Exception(f'code failure with unrecognised merge mode {merge_mode}')
                 mask = np.logical_and(mask,
                                       np.logical_not(clash_mask))  # remove clash faces from mask (already handled)
             if np.any(mask):
-                combo_trm[:] = np.where(mask, gcs_trm, combo_trm)  # update combined array from individual array
+                combo_trm[mask] = gcs_trm[mask]  # update combined array from individual array
 
     # for each of the 3 combined tr mult arrays, replace unused values with the default fill value
     # also check that any set values are non-negative
     for combo_trm in (combo_trm_k, combo_trm_j, combo_trm_i):
         if fill_value is not None and not np.isnan(fill_value):
-            combo_trm[:] = np.where(np.isnan(combo_trm), fill_value, combo_trm)
+            combo_trm[:][np.isnan(combo_trm).astype(bool)] = fill_value
             assert np.all(combo_trm >= 0.0)
         else:
             assert np.all(np.logical_or(np.isnan(combo_trm), combo_trm >= 0.0))

resqpy/fault/_grid_connection_set.py

@@ -2100,9 +2100,6 @@ class GridConnectionSet(BaseResqpy):
         ak = np.full((nk + 1, nj, ni), default_value, dtype = dtype)
         aj = np.full((nk, nj + 1, ni), default_value, dtype = dtype)
         ai = np.full((nk, nj, ni + 1), default_value, dtype = dtype)
-        # mk = np.zeros((nk + 1, nj, ni), dtype = bool)
-        # mj = np.zeros((nk, nj + 1, ni), dtype = bool)
-        # mi = np.zeros((nk, nj, ni + 1), dtype = bool)
 
         # populate arrays from faces of gcs, optionally filtered by feature index
         cip, fip = self.list_of_cell_face_pairs_for_feature_index(None)
@@ -2113,42 +2110,36 @@ class GridConnectionSet(BaseResqpy):
         else:
             indices = self.indices_for_feature_index(feature_index)
 
-        # opposing_count = 0
         side_list = ([0] if lazy else [0, 1])
-        for fi in indices:
-            # fi = int(i)
-            if active_mask is not None and not active_mask[fi]:
-                continue
-            value = gcs_prop_array[fi]
-            if baffle_mask is not None and baffle_mask[fi]:
-                value = 0  # will be cast to float (or bool) if needed when assigned below
-            for side in side_list:
-                cell_kji0 = cip[fi, side].copy()
-                # opposing = cell_kji0.copy()
-                axis, polarity = fip[fi, side]
-                assert 0 <= axis <= 2 and 0 <= polarity <= 1
-                cell_kji0[axis] += polarity
-                # opposing[axis] += (1 - polarity)
-                if axis == 0:
-                    ak[tuple(cell_kji0)] = value
-                    # mk[tuple(cell_kji0)] = True
-                    # if mk[tuple(opposing)]:
-                    #     opposing_count += 1
-                elif axis == 1:
-                    aj[tuple(cell_kji0)] = value
-                    # mj[tuple(cell_kji0)] = True
-                    # if mj[tuple(opposing)]:
-                    #     opposing_count += 1
-                else:
-                    ai[tuple(cell_kji0)] = value
-                    # mi[tuple(cell_kji0)] = True
-                    # if mi[tuple(opposing)]:
-                    #     opposing_count += 1
-
-        # if opposing_count:
-        #     log.warning(f'{opposing_count} suspicious opposing faces of {len(indices)} detected in gcs: {self.title}')
-        # else:
-        #     log.debug(f'no suspicious opposing faces detected in gcs: {self.title}')
+
+        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 active_mask is not None:
+            cip = cip[active_mask, :, :]
+            value_array = value_array[active_mask]
+
+        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
+
+            axis_mask = (axis == 0).astype(bool)
+            ak_kji0 = cell_kji0[axis_mask, :]
+            ak_kji0[:, 0] += polarity[axis_mask]
+            ak[ak_kji0[:, 0], ak_kji0[:, 1], ak_kji0[:, 2]] = value_array[axis_mask]
+
+            axis_mask = (axis == 1).astype(bool)
+            aj_kji0 = cell_kji0[axis_mask, :]
+            aj_kji0[:, 1] += polarity[axis_mask]
+            aj[aj_kji0[:, 0], aj_kji0[:, 1], aj_kji0[:, 2]] = value_array[axis_mask]
+
+            axis_mask = (axis == 2).astype(bool)
+            ai_kji0 = cell_kji0[axis_mask, :]
+            ai_kji0[:, 2] += polarity[axis_mask]
+            ai[ai_kji0[:, 0], ai_kji0[:, 1], ai_kji0[:, 2]] = value_array[axis_mask]
 
         return (ak, aj, ai)
 

resqpy/grid/_grid.py

@@ -2255,9 +2255,9 @@ class Grid(BaseResqpy):
         pc = self.extract_property_collection()
 
         if baffle_triplet is not None:
-            trm_k[1:-1] = np.where(baffle_triplet[0], 0.0, trm_k[1:-1])
-            trm_j[:, 1:-1] = np.where(baffle_triplet[1], 0.0, trm_j[:, 1:-1])
-            trm_i[:, :, 1:-1] = np.where(baffle_triplet[2], 0.0, trm_i[:, :, 1:-1])
+            trm_k[1:-1][baffle_triplet[0]] = 0.0
+            trm_j[:, 1:-1][baffle_triplet[1]] = 0.0
+            trm_i[:, :, 1:-1][baffle_triplet[2]] = 0.0
 
         if composite_property:
             tr_composite = np.concatenate((trm_k.flat, trm_j.flat, trm_i.flat))

resqpy/property/attribute_property_set.py

@@ -183,7 +183,14 @@ class ApsProperty:
 class AttributePropertySet(rqp.PropertyCollection):
     """Class for set of RESQML properties for any supporting representation, using attribute syntax."""
 
-    def __init__(self, model = None, support = None, property_set_uuid = None, realization = None, key_mode = 'pk'):
+    def __init__(self,
+                 model = None,
+                 support = None,
+                 property_set_uuid = None,
+                 realization = None,
+                 key_mode = 'pk',
+                 indexable = None,
+                 multiple_handling = 'warn'):
         """Initialise an empty property set, optionally populate properties from a supporting representation.
 
         arguments:
@@ -198,6 +205,11 @@ class AttributePropertySet(rqp.PropertyCollection):
               if None, then the collection is either covering a whole ensemble (individual properties can each be flagged with a
               realisation number), or is for properties that do not have multiple realizations
            key_mode (str, default 'pk'): either 'pk' (for property kind) or 'title', identifying the basis of property attribute keys
+           indexable (str, optional): if present and key_mode is 'pk', properties with indexable element other than this will
+              have their indexable element included in their key
+           multiple_handling (str, default 'warn'): either 'ignore', 'warn' ,or 'exception'; if 'warn' or 'ignore', and properties
+              exist that generate the same key, then only the first is visible in the attribute property set (and a warning is given
+              for each of the others in the case of 'warn'); if 'exception', a KeyError is raised if there are any duplicate keys
 
         note:
            at present, if the collection is being initialised from a property set, the support argument must also be specified;
@@ -214,9 +226,12 @@ class AttributePropertySet(rqp.PropertyCollection):
             property_set_root = None
         else:
             property_set_root = model.root_for_uuid(property_set_uuid)
+        assert multiple_handling in ['ignore', 'warn', 'exception']
 
         super().__init__(support = support, property_set_root = property_set_root, realization = realization)
         self.key_mode = key_mode
+        self.indexable_mode = indexable
+        self.multiple_handling = multiple_handling
         self._make_attributes()
 
     def keys(self):
@@ -241,12 +256,21 @@ class AttributePropertySet(rqp.PropertyCollection):
                             title = self.citation_title_for_part(part),
                             facet = self.facet_for_part(part),
                             time_index = self.time_index_for_part(part),
-                            realization = self.realization_for_part(part))
+                            realization = self.realization_for_part(part),
+                            indexable_mode = self.indexable_mode,
+                            indexable = self.indexable_for_part(part))
 
     def _make_attributes(self):
         """Setup individual properties with attribute style read access to metadata."""
         for part in self.parts():
             key = self._key(part)
+            if getattr(self, key, None) is not None:
+                if self.multiple_handling == 'warn':
+                    log.warning(f'duplicate key in AttributePropertySet; only first instance included: {key}')
+                    continue
+                if self.multiple_handling == 'ignore':
+                    continue
+                raise KeyError(f'duplicate key in attribute property set: {key}')
             aps_property = ApsProperty(self, part)
             setattr(self, key, aps_property)
 
@@ -255,11 +279,20 @@ class AttributePropertySet(rqp.PropertyCollection):
         return self.number_of_parts()
 
 
-def make_aps_key(key_mode, property_kind = None, title = None, facet = None, time_index = None, realization = None):
+def make_aps_key(key_mode,
+                 property_kind = None,
+                 title = None,
+                 facet = None,
+                 time_index = None,
+                 realization = None,
+                 indexable_mode = None,
+                 indexable = None):
     """Contructs the key (attribute name) for a property based on metadata items."""
     if key_mode == 'pk':
         assert property_kind is not None
         key = property_kind
+        if indexable_mode is not None and indexable is not None and indexable != indexable_mode:
+            key += f'_{indexable}'
         if facet is not None:
             key += f'_{facet}'
     else:

{resqpy-4.16.0.dist-info → resqpy-4.16.2.dist-info}/METADATA

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

{resqpy-4.16.0.dist-info → resqpy-4.16.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=g4-311FByk_0L-xOs-Nz6K7tDFGQMse3zy72TBlnqB0,556
+resqpy/__init__.py,sha256=V_KEFWKpjsovnzmh69UtTXTHOi6WVOZzJJZCMhJBFxs,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
@@ -24,8 +24,8 @@ resqpy/derived_model/_unsplit_grid.py,sha256=aqcdyn4WhDy7Kys3wnb55QwVXehmir4VW7T
 resqpy/derived_model/_zonal_grid.py,sha256=H-IGMudUV-tiRHZqvl9B1wxMQNjeAM2zHvTllNiagPA,18825
 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=T3syDK7okT-xmx-ipk4xda1gwHEnaVn5VYmQAn1R5pE,29616
-resqpy/fault/_grid_connection_set.py,sha256=vpEFTXn5fvy2X6jgR-a4UUVbiU-ShOZ8MuSGEZklbos,117671
+resqpy/fault/_gcs_functions.py,sha256=wMP4gnzT6Smv1RKGex0fdcadzj2xmanyusNA-D_ebfI,29569
+resqpy/fault/_grid_connection_set.py,sha256=IEG9duPzPmVge-7yX70mcfmFSdU8MSR1sbQmRoSjlyE,117203
 resqpy/grid/__init__.py,sha256=WsfOnR5lHcnpJEx8ZZ3lhd4dImEiieJLM7eFPxMi3u8,692
 resqpy/grid/_cell_properties.py,sha256=pbyAK2eV9n4teOxm2q5hyBinohEbevFPrCfMcpGiqUU,20689
 resqpy/grid/_connection_sets.py,sha256=-277bh9pMoeESSzy9oZehL-vc82aMGZuSLQs2KJ4Wfg,10120
@@ -34,7 +34,7 @@ resqpy/grid/_defined_geometry.py,sha256=qkkfiSh8hzhTaW3vEot77mFWgApZl92Cb552b-xy
 resqpy/grid/_extract_functions.py,sha256=n_SmfkvEssX09SrlvUMe7y-4eOuVckhL_M6tFTg1bRg,28203
 resqpy/grid/_face_functions.py,sha256=0I7O6DDz7nJWczi_G2bE3L2XUr4acxREwKygXWEp6F4,16516
 resqpy/grid/_faults.py,sha256=OmukVoLpdrndqDxwE6Rj7Ul5tj3FUQVPhE0raH2FHpg,12236
-resqpy/grid/_grid.py,sha256=kG5YwHmflK30-26r4v2QCjvfXL1DVImMD6bpH_TN_Ng,132130
+resqpy/grid/_grid.py,sha256=JIY88o5Df2y0rCDXZCpV2c0cf4I5sdXhbN30oF-FubM,132052
 resqpy/grid/_grid_types.py,sha256=vN_mMAEvcQ7HGxDQ8VMJilGXADPfJ_2rgebOJ__2P8E,3572
 resqpy/grid/_intervals_info.py,sha256=ODjDz22n8U9pSpO0Muj8mJr2hYWauFDzgcVQ0RM3csQ,338
 resqpy/grid/_moved_functions.py,sha256=XboxA0pE55j-P_x5g051WheVamxkAatQGbU5aq2GkaE,604
@@ -133,7 +133,7 @@ resqpy/property/_collection_create_xml.py,sha256=E48fu8h64T_bz5k3OEqIzPvZAOYRTBg
 resqpy/property/_collection_get_attributes.py,sha256=MlontPfGo00lxt0SpB49YG9PRsi5oXPqduDgCSOSmzs,32441
 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=YveiTAIeNUXZRJ8m1-SZEvtae83SOW-D0E3Wz4GNqSs,10382
+resqpy/property/attribute_property_set.py,sha256=AI0rS3bn38DJLQ_5XLdkeol8Oa9tGpTrX57d3435byQ,12132
 resqpy/property/grid_property_collection.py,sha256=bLWCTfhmpDsagBaXXb8XXHL46Cy78HL_NGWpPFZAgdw,66946
 resqpy/property/property_collection.py,sha256=b4J_bzigN-P5nag49Y6IG4mq3s1KbelsQC5frYg2ij8,151911
 resqpy/property/property_common.py,sha256=wf429weNtgf6J4gCNNoRwj64elQvUPI_ZWzg4qI7l6c,35993
@@ -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.0.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.16.0.dist-info/METADATA,sha256=jF_cAuOlMIbcM_n2fTddd40ATOW6f9Me8AlJ4LfIg7A,4028
-resqpy-4.16.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-resqpy-4.16.0.dist-info/RECORD,,
+resqpy-4.16.2.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.16.2.dist-info/METADATA,sha256=I-u5Mm5YX9_vhfM4XERgozLlbtan3_91gKZkE9jpFiw,4028
+resqpy-4.16.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+resqpy-4.16.2.dist-info/RECORD,,