resqpy 4.9.2__tar.gz → 4.9.5__tar.gz

{resqpy-4.9.2 → resqpy-4.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: resqpy
-Version: 4.9.2
+Version: 4.9.5
 Summary: Python API for working with RESQML models
 Home-page: https://github.com/bp/resqpy
 License: MIT
@@ -48,7 +48,7 @@ you the ability to work with reservoir models programmatically, without having
 to know the details of the RESQML standard.
 
 The package is written and maintained by bp, and is made available under the MIT
-license as a contribution to the open-source community.
+license as a contribution to the open source community.
 
 **resqpy** was created by Andy Beer. For enquires about resqpy, please contact
 Emma Nesbit (Emma.Nesbit@uk.bp.com)
@@ -73,8 +73,6 @@ for, although the RESQML standard does allow for such grids.
 It is envisaged that the code base will be expanded to include other classes of
 object and more fully cover the options permitted by the RESQML standard.
 
-Modification functionality at the moment focuses on changes to grid geometry.
-
 ## Installation
 
 Resqpy can be installed with pip:

{resqpy-4.9.2 → resqpy-4.9.5}/README.md

@@ -16,7 +16,7 @@ you the ability to work with reservoir models programmatically, without having
 to know the details of the RESQML standard.
 
 The package is written and maintained by bp, and is made available under the MIT
-license as a contribution to the open-source community.
+license as a contribution to the open source community.
 
 **resqpy** was created by Andy Beer. For enquires about resqpy, please contact
 Emma Nesbit (Emma.Nesbit@uk.bp.com)
@@ -41,8 +41,6 @@ for, although the RESQML standard does allow for such grids.
 It is envisaged that the code base will be expanded to include other classes of
 object and more fully cover the options permitted by the RESQML standard.
 
-Modification functionality at the moment focuses on changes to grid geometry.
-
 ## Installation
 
 Resqpy can be installed with pip:

{resqpy-4.9.2 → resqpy-4.9.5}/pyproject.toml

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

{resqpy-4.9.2 → resqpy-4.9.5}/resqpy/__init__.py

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

{resqpy-4.9.2 → resqpy-4.9.5}/resqpy/grid_surface/_find_faces.py

@@ -182,6 +182,7 @@ def find_faces_to_represent_surface_regular(
     title = None,
     centres = None,
     agitate = False,
+    random_agitation = False,
     feature_type = "fault",
     progress_fn = None,
     consistent_side = False,
@@ -196,9 +197,11 @@ def find_faces_to_represent_surface_regular(
         title (str, optional): the citation title to use for the grid connection set; defaults to name
         centres (numpy float array of shape (nk, nj, ni, 3), optional): precomputed cell centre points in
            local grid space, to avoid possible crs issues; required if grid's crs includes an origin (offset)?
-        agitate (bool, default False): if True, the points of the surface are perturbed by a small random
+        agitate (bool, default False): if True, the points of the surface are perturbed by a small
            offset, which can help if the surface has been built from a regular mesh with a periodic resonance
            with the grid
+        random_agitation (bool, default False): if True, the agitation is by a small random distance; if False,
+           a constant positive shift of 5.0e-6 is applied to x, y & z values; ignored if agitate is False
         feature_type (str, default 'fault'): 'fault', 'horizon' or 'geobody boundary'
         progress_fn (f(x: float), optional): a callback function to be called at intervals by this function;
            the argument will progress from 0.0 to 1.0 in unspecified and uneven increments
@@ -261,7 +264,10 @@ def find_faces_to_represent_surface_regular(
     t, p = surface.triangles_and_points()
     assert t is not None and p is not None, f"surface {surface.title} is empty"
     if agitate:
-        p += 1.0e-5 * (np.random.random(p.shape) - 0.5)
+        if random_agitation:
+            p += 1.0e-5 * (np.random.random(p.shape) - 0.5)
+        else:
+            p += 5.0e-6
     log.debug(f"surface: {surface.title}; p0: {p[0]}; crs uuid: {surface.crs_uuid}")
     log.debug(f"surface min xyz: {np.min(p, axis = 0)}")
     log.debug(f"surface max xyz: {np.max(p, axis = 0)}")
@@ -495,6 +501,7 @@ def find_faces_to_represent_surface_regular_optimised(
     name,
     title = None,
     agitate = False,
+    random_agitation = False,
     feature_type = "fault",
     is_curtain = False,
     progress_fn = None,
@@ -509,9 +516,11 @@ def find_faces_to_represent_surface_regular_optimised(
         surface (Surface): the surface to be intersected with the grid
         name (str): the feature name to use in the grid connection set
         title (str, optional): the citation title to use for the grid connection set; defaults to name
-        agitate (bool, default False): if True, the points of the surface are perturbed by a small random
+        agitate (bool, default False): if True, the points of the surface are perturbed by a small
            offset, which can help if the surface has been built from a regular mesh with a periodic resonance
            with the grid
+        random_agitation (bool, default False): if True, the agitation is by a small random distance; if False,
+           a constant positive shift of 5.0e-6 is applied to x, y & z values; ignored if agitate is False
         feature_type (str, default 'fault'): 'fault', 'horizon' or 'geobody boundary'
         is_curtain (bool, default False): if True, only the top layer of the grid is processed and the bisector
            property, if requested, is generated with indexable element columns
@@ -591,7 +600,10 @@ def find_faces_to_represent_surface_regular_optimised(
     triangles, points = surface.triangles_and_points()
     assert (triangles is not None and points is not None), f"surface {surface.title} is empty"
     if agitate:
-        points += 1.0e-5 * (np.random.random(points.shape) - 0.5)
+        if random_agitation:
+            points += 1.0e-5 * (np.random.random(points.shape) - 0.5)
+        else:
+            points += 5.0e-6
     # log.debug(f'surface: {surface.title}; p0: {points[0]}; crs uuid: {surface.crs_uuid}')
     # log.debug(f'surface min xyz: {np.min(points, axis = 0)}')
     # log.debug(f'surface max xyz: {np.max(points, axis = 0)}')

{resqpy-4.9.2 → resqpy-4.9.5}/resqpy/multi_processing/wrappers/grid_surface_mp.py

@@ -29,6 +29,7 @@ def find_faces_to_represent_surface_regular_wrapper(
         name: str,
         title: Optional[str] = None,
         agitate: bool = False,
+        random_agitation: bool = False,
         feature_type: str = 'fault',
         trimmed: bool = False,
         is_curtain = False,
@@ -55,9 +56,11 @@ def find_faces_to_represent_surface_regular_wrapper(
         surface_uuid (UUID or str): UUID (universally unique identifier) of the surface (or point set) object.
         name (str): the feature name to use in the grid connection set.
         title (str): the citation title to use for the grid connection set; defaults to name
-        agitate (bool): if True, the points of the surface are perturbed by a small random
-           offset, which can help if the surface has been built from a regular mesh with a periodic resonance
+        agitate (bool): if True, the points of the surface are perturbed by a small offset,
+           which can help if the surface has been built from a regular mesh with a periodic resonance
            with the grid
+        random_agitation (bool, default False): if True, the agitation is by a small random distance; if False,
+           a constant positive shift of 5.0e-6 is applied to x, y & z values; ignored if agitate is False
         feature_type (str, default 'fault'): one of 'fault', 'horizon', or 'geobody boundary'
         trimmed (bool, default True): if True the surface has already been trimmed
         is_curtain (bool, default False): if True, only the top layer is intersected with the surface and bisector
@@ -221,6 +224,7 @@ def find_faces_to_represent_surface_regular_wrapper(
                                                                      name,
                                                                      title,
                                                                      agitate,
+                                                                     random_agitation,
                                                                      feature_type,
                                                                      is_curtain,
                                                                      progress_fn,

{resqpy-4.9.2 → resqpy-4.9.5}/resqpy/olio/wellspec_keywords.py

@@ -469,7 +469,7 @@ def get_well_data(
     while True:
         kf.skip_comments(file)
         if (kf.specific_keyword_next(file, "WELLSPEC") or kf.specific_keyword_next(file, "WELLMOD") or
-                kf.specific_keyword_next(file, "TIME")):
+                kf.specific_keyword_next(file, "TIME") or kf.specific_keyword_next(file, "INCLUDE")):
             break
         line = kf.strip_trailing_comment(file.readline())
         words = line.split()

{resqpy-4.9.2 → resqpy-4.9.5}/resqpy/well/_blocked_well.py

@@ -3485,7 +3485,7 @@ class BlockedWell(BaseResqpy):
                             facet = gridpc.facet_for_part(part),
                             realization = gridpc.realization_for_part(part),
                             indexable_element = 'cells')
-                    bwpc.write_hdf5_for_imported_list()
+                    bwpc.write_hdf5_for_imported_list(use_int32 = False)
                     bwpc.create_xml_for_imported_list_and_add_parts_to_model(time_series_uuid = time_uuid,
                                                                              string_lookup_uuid = sl_uuid)
         else: