resqpy 4.12.2__tar.gz → 4.12.3__tar.gz

{resqpy-4.12.2 → resqpy-4.12.3}/PKG-INFO

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

{resqpy-4.12.2 → resqpy-4.12.3}/pyproject.toml

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

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/__init__.py

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

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/grid/_defined_geometry.py

@@ -348,6 +348,7 @@ def set_geometry_is_defined(grid,
 
     if complete_all:
         cells_update_needed = __complete_all_pillars(cells_update_needed, grid, points, surround_z)
+        cells_update_needed = True
 
     if cells_update_needed:
         # note: each pillar is either fully defined or fully undefined at this point
@@ -387,7 +388,10 @@ def __complete_all_pillars(cells_update_needed, grid, points, surround_z):
     if hasattr(grid, 'array_pillar_geometry_is_defined'):
         del grid.array_pillar_geometry_is_defined
     cells_update_needed = False
-    assert not np.any(np.isnan(points))
+    nan_mask = np.isnan(points)
+    if np.any(nan_mask):
+        log.warning('remaining NaNs after filling missing pillar geometry will be set to zero (dangerous)')
+        points[nan_mask] = 0.0
     grid.geometry_defined_for_all_cells_cached = True
     if hasattr(grid, 'array_cell_geometry_is_defined'):
         del grid.array_cell_geometry_is_defined
@@ -585,7 +589,7 @@ def __fill_holes(grid, holes_mask):
 def __fill_surround(grid, surround_mask):
     # note: only fills x,y; based on bottom layer of points; assumes surround mask is a regularly shaped frame of columns
     log.debug(f'filling {np.count_nonzero(surround_mask)} pillars for surround')
-    points = grid.points_ref(masked = False)
+    points = grid.points_ref(masked = False).reshape((grid.nk_plus_k_gaps + 1, -1, 3))
     points_view = points[-1, :, :2].reshape((-1, 2))[:(grid.nj + 1) * (grid.ni + 1), :].reshape(
         (grid.nj + 1, grid.ni + 1, 2))
     modified = False

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/grid_surface/_blocked_well_populate.py

@@ -60,7 +60,10 @@ def populate_blocked_well_from_trajectory(blocked_well,
     assert isinstance(blocked_well.trajectory, rqw.Trajectory)
     assert grid is not None
 
-    flavour = grr.grid_flavour(grid.root)
+    flavour = grid.grid_representation
+    if flavour is None:
+        assert grid.root is not None
+        flavour = grr.grid_flavour(grid.root)
     if not flavour.startswith('Ijk'):
         raise NotImplementedError('well blocking only implemented for IjkGridRepresentation')
     is_regular = (flavour == 'IjkBlockGrid') and hasattr(grid, 'is_aligned') and grid.is_aligned

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/property/_collection_get_attributes.py

@@ -222,7 +222,7 @@ def _get_perm_k_part(collection, perms, perm_k_mode, share_perm_parts, perm_i_pa
                                                         uom = 'mD',
                                                         time_index = None,
                                                         null_value = None,
-                                                        property_kind = 'permeability rock',
+                                                        property_kind = 'rock permeability',
                                                         facet_type = 'direction',
                                                         facet = 'K',
                                                         realization = perms.realization_for_part(perm_i_part),

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/property/grid_property_collection.py

@@ -941,7 +941,7 @@ def _extend_imported_get_fine_collections(other, realization):
     source_sat = rqp_c.selective_version_of_collection(other, realization = realization, property_kind = 'saturation')
     source_perm = rqp_c.selective_version_of_collection(other,
                                                         realization = realization,
-                                                        property_kind = 'permeability rock')
+                                                        property_kind = 'rock permeability')
     # todo: add kh and some other property kinds
 
     return source_rv, source_ntg, source_poro, source_sat, source_perm

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/property/property_collection.py

@@ -2796,7 +2796,7 @@ class PropertyCollection():
                                     share_perm_parts = False,
                                     perm_k_mode = None,
                                     perm_k_ratio = 1.0):
-        """Returns five parts: net to gross ratio, porosity, permeability rock I, J & K; each returned part may be None.
+        """Returns five parts: net to gross ratio, porosity, rock permeability I, J & K; each returned part may be None.
 
         arguments:
            realization: (int, optional): if present, only properties with the given realization are considered; if None,
@@ -2832,7 +2832,7 @@ class PropertyCollection():
 
         perms = rqp_c.selective_version_of_collection(self,
                                                       realization = realization,
-                                                      property_kind = 'permeability rock')
+                                                      property_kind = 'rock permeability')
         if perms is None or perms.number_of_parts() == 0:
             log.error('no rock permeabilities present')
         else:
@@ -2869,7 +2869,7 @@ class PropertyCollection():
                                     share_perm_parts = False,
                                     perm_k_mode = None,
                                     perm_k_ratio = 1.0):
-        """Returns five uuids: net to gross ratio, porosity, permeability rock I, J & K; each returned uuid may be None.
+        """Returns five uuids: net to gross ratio, porosity, rock permeability I, J & K; each returned uuid may be None.
 
         note:
            see basic_static_property_parts() method for argument documentation

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/property/property_common.py

@@ -78,7 +78,7 @@ expected_facet_type_dict = {
     'property multiplier': (
         'what',
         [
-            'rock volume',  # made up; todo: add rock permeability?
+            'rock volume',  # made up; todo: add rock permeability? (would need multiple facets)
             'pore volume',
             'transmissibility'
         ]),
@@ -159,7 +159,7 @@ def property_kind_and_facet_from_keyword(keyword):
     elif len(lk) >= 2 and lk[0] == 'd' and lk[1] in 'xyz':
         property_kind, facet_type, facet = _pkf_from_keyword_length(lk)
     elif lk[:4] == 'perm' or (len(lk) == 2 and lk[0] == 'k'):  # permeability
-        property_kind = 'permeability rock'
+        property_kind = 'rock permeability'
         (facet_type, facet) = _facet_info_for_dir_ch(lk[-1])
     elif lk[:5] == 'trans' or (len(lk) == 2 and lk[0] == 't'):  # transmissibility (for unit viscosity)
         if 'mult' in lk:

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/unstructured/_prism_grid.py

@@ -624,7 +624,7 @@ class VerticalPrismGrid(PrismGrid):
             ppc = rqp.selective_version_of_collection(pc,
                                                       continuous = True,
                                                       realization = realization,
-                                                      property_kind = 'permeability rock')
+                                                      property_kind = 'rock permeability')
             assert ppc.number_of_parts() > 0, 'no permeability properties available for vertical prism grid'
 
             # look for a triple permeability; if present, assume to be per face horizontal permeabilities

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/weights_and_measures/nexus_units.py

@@ -40,8 +40,8 @@ def nexus_uom_for_quantity(nexus_unit_system, quantity, english_volume_flavour =
         'length', 'area', 'volume', 'volume per volume', 'permeability rock', 'rock permeability', 'time',
         'thermodynamic temperature', 'mass per volume', 'pressure', 'volume per time'
     ]
-    if quantity == 'rock permeability':
-        quantity = 'permeability rock'
+    if quantity == 'permeability rock':
+        quantity = 'rock permeability'
 
     if (nexus_unit_system == 'ENGLISH' and english_volume_flavour is not None):
         english_volume_flavour = english_volume_flavour.lower()
@@ -68,7 +68,7 @@ def nexus_uom_for_quantity(nexus_unit_system, quantity, english_volume_flavour =
             'area': 'm2',
             'volume': 'm3',
             'volume per volume': 'm3/m3',
-            'permeability rock': 'mD',
+            'rock permeability': 'mD',
             'time': 'd',
             'thermodynamic temperature': 'degC',
             'mass per volume': 'kg/m3',
@@ -80,7 +80,7 @@ def nexus_uom_for_quantity(nexus_unit_system, quantity, english_volume_flavour =
             'area': 'm2',
             'volume': 'm3',
             'volume per volume': 'm3/m3',
-            'permeability rock': 'mD',
+            'rock permeability': 'mD',
             'time': 'd',
             'thermodynamic temperature': 'degC',
             'mass per volume': 'kg/m3',
@@ -92,7 +92,7 @@ def nexus_uom_for_quantity(nexus_unit_system, quantity, english_volume_flavour =
             'area': 'm2',
             'volume': 'm3',
             'volume per volume': 'm3/m3',
-            'permeability rock': 'mD',
+            'rock permeability': 'mD',
             'time': 'd',
             'thermodynamic temperature': 'degC',
             'mass per volume': 'kg/m3',
@@ -104,7 +104,7 @@ def nexus_uom_for_quantity(nexus_unit_system, quantity, english_volume_flavour =
             'area': 'cm2',
             'volume': 'cm3',
             'volume per volume': 'cm3/cm3',
-            'permeability rock': 'mD',
+            'rock permeability': 'mD',
             'time': 'h',
             'thermodynamic temperature': 'degC',
             'mass per volume': 'g/cm3',
@@ -116,7 +116,7 @@ def nexus_uom_for_quantity(nexus_unit_system, quantity, english_volume_flavour =
             'area': 'ft2',
             'volume': 'ft3',  # NB. Nexus expects bbl in some situations!
             'volume per volume': 'ft3/ft3',  # note: some special cases dealt with above
-            'permeability rock': 'mD',
+            'rock permeability': 'mD',
             'time': 'd',
             'thermodynamic temperature': 'degF',
             'mass per volume': 'lbm/ft3',

{resqpy-4.12.2 → resqpy-4.12.3}/resqpy/well/_blocked_well.py

@@ -2754,7 +2754,7 @@ class BlockedWell(BaseResqpy):
             'ANGLE': ('dega', 'plane angle', False),
             'TEMP': (temperature_uom, 'thermodynamic temperature', False),
             'MDCON': length_uom_pk_discrete,
-            'K': ('mD', 'permeability rock', False),
+            'K': ('mD', 'rock permeability', False),
             'DZ': (length_uom, 'cell length', False),  # TODO: add direction facet
             'DTOP': (length_uom, 'depth', False),
             'DBOT': (length_uom, 'depth', False),
@@ -3366,18 +3366,21 @@ class BlockedWell(BaseResqpy):
                                    root = bw_node)
         for grid in self.grid_list:
             grid_root = grid.root
+            ref_uuid = grid.uuid if grid_root is None else bu.uuid_from_string(grid_root.attrib['uuid'])
             self.model.create_ref_node('Grid',
                                        rqet.find_nested_tags_text(grid_root, ['Citation', 'Title']),
-                                       bu.uuid_from_string(grid_root.attrib['uuid']),
+                                       ref_uuid,
                                        content_type = 'obj_IjkGridRepresentation',
                                        root = bw_node)
 
         interp_root = None
         if self.wellbore_interpretation is not None:
             interp_root = self.wellbore_interpretation.root
+            ref_uuid = self.wellbore_interpretation.uuid if interp_root is None else bu.uuid_from_string(
+                interp_root.attrib['uuid'])
             self.model.create_ref_node('RepresentedInterpretation',
                                        rqet.find_nested_tags_text(interp_root, ['Citation', 'Title']),
-                                       bu.uuid_from_string(interp_root.attrib['uuid']),
+                                       ref_uuid,
                                        content_type = 'obj_WellboreInterpretation',
                                        root = bw_node)
         return traj_root, grid_root, interp_root