resqpy 4.9.2__py3-none-any.whl → 4.9.5__py3-none-any.whl

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/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/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/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/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:

{resqpy-4.9.2.dist-info → resqpy-4.9.5.dist-info}/METADATA

@@ -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.dist-info → resqpy-4.9.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=DE1yHzJ88g5estS5JeLe9EdLTXhCsjSgGEUc1_y4iLg,555
+resqpy/__init__.py,sha256=Behlemi-nhF8AnlLq_npRt_o7-vrB10KGOmSXk-YCDg,555
 resqpy/crs.py,sha256=iq0lO3aXzttmJBfuhUjS9IHlv8OV1wuByhFk0b4fvmI,24782
 resqpy/derived_model/__init__.py,sha256=NFvMSOKI3cxmH7lAbddV43JjoUj-r2G7ExEfOqinD1I,1982
 resqpy/derived_model/_add_edges_per_column_property_array.py,sha256=cpW3gwp6MSYIrtvFmCjoJXcyUsgGuCDbgmwlJCJebUs,6410
@@ -48,7 +48,7 @@ resqpy/grid/_write_nexus_corp.py,sha256=yEVfiObsedEAXX6UG6ZTf56kZnQVkd3lLqE2NpL-
 resqpy/grid/_xyz.py,sha256=RLQWOdM_DRoCj4JypwB5gUJ78HTdk5JnZHSeAzuU634,13087
 resqpy/grid_surface/__init__.py,sha256=iyK3_Vlg9mXffc_1gjvRdKwQE0zicbNXya0tryHkr04,2593
 resqpy/grid_surface/_blocked_well_populate.py,sha256=oP1TW5hf1no6WYMZrCgJFV2tJCXHAvap3if3WHMULac,35739
-resqpy/grid_surface/_find_faces.py,sha256=7FiIXG4engo2Yj_oT1Yb9Cqn0jK5EqHh02TqLnWlIv0,64016
+resqpy/grid_surface/_find_faces.py,sha256=WRoc5g-kLtR0JkuT0nueVF8ZgG09YfR3K_aRp2Rc2K8,64645
 resqpy/grid_surface/_grid_skin.py,sha256=D0cjHkcuT5KCKb-8EZfXgh0GgJj3kzOBS2wVNXg4bfY,26056
 resqpy/grid_surface/_grid_surface.py,sha256=l2NJo7Kiucolbb_TlLPC7NGdksg_JahkihfsrJVq99w,14379
 resqpy/grid_surface/_trajectory_intersects.py,sha256=Och9cZYU9Y7ofovhPzsLyIblRUl2xj9_5nHH3fMZp-A,22498
@@ -69,7 +69,7 @@ resqpy/multi_processing/__init__.py,sha256=ZRudHfN9aaZjxvat7t8BZr6mwMi9baiCNjczw
 resqpy/multi_processing/_multiprocessing.py,sha256=bnCKfSC1tWwvZmZ7BZqCyje0C93m6q7HZPxNpx8xoxA,7301
 resqpy/multi_processing/wrappers/__init__.py,sha256=7vjuTWdHnp3rN9Ud8ljpDnt1NbBAyhA08lv-sQ9Kf3o,72
 resqpy/multi_processing/wrappers/blocked_well_mp.py,sha256=_2fEsSmJVQCnbQIjTHqmnNEugfhN1KvX-o4ZbvtChdI,5952
-resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=bHncBa2I0OCuxsmFwiWrEUz-fXJlQrhOVbLELSqYIkA,21156
+resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=PzmVOrW_7FCWM_jFz62Q3VQ259HlmyVFIraMHeVpFl8,21494
 resqpy/multi_processing/wrappers/mesh_mp.py,sha256=0VYoqtgBFfrlyYB6kkjbdrRQ5FKe6t5pHJO3wD9b8Fc,5793
 resqpy/olio/__init__.py,sha256=j2breqKYVufhw5k8qS2uZwB3tUKT7FhdZ23ninS75YA,84
 resqpy/olio/ab_toolbox.py,sha256=bZlAhOJVS0HvIYBW0Lg68re17N8eltoQhIUh0xuUyVc,2147
@@ -100,7 +100,7 @@ resqpy/olio/uuid.py,sha256=JRMi-RZNeGm8tGNloIwTATzNtdj29lBQDV9OILboPRI,7324
 resqpy/olio/vdb.py,sha256=lQYuK1kr1Wnucq2EoKgT6lrR7vloCemnCKZktzBcLUc,45231
 resqpy/olio/vector_utilities.py,sha256=Oe5NGOnV_wNExlcevBnLdP30XbvTM-4YnLmbgM4bDDk,46253
 resqpy/olio/volume.py,sha256=F1pMnDoJ4ricy4dfdLuLuK1xkVgJckL9V06tUeyK6Wc,6185
-resqpy/olio/wellspec_keywords.py,sha256=wXOSADbmRm2TJQ9jq-H9AqI7l8y3g22Xkcmp4Vk4zYs,26220
+resqpy/olio/wellspec_keywords.py,sha256=MqrXRSzVfXAKUhiJkop3EwoVdKEjgZRwHYBJjx2IW8Q,26265
 resqpy/olio/write_data.py,sha256=bIX7ilMkXWCMz_zQh-Gqk56sNzng4W5l4BahW2EV7Kw,5142
 resqpy/olio/write_hdf5.py,sha256=KXB2L6Qz3TFb9yDjT-Ty0CXgjyq0nhVp3GADlekWhMQ,19055
 resqpy/olio/xml_et.py,sha256=pRKxUwqlEk9zJjAEb3AGSktE1OfdfPWP23A6Ihjb2AQ,24925
@@ -182,7 +182,7 @@ resqpy/weights_and_measures/__init__.py,sha256=Kp1pPZFH4rS5_PkCERZBEzGoat6n_dSS0
 resqpy/weights_and_measures/nexus_units.py,sha256=y78sk6zb43LnwzGWQFV3g_Bwg5seUbgE1YROSOgu6UU,5434
 resqpy/weights_and_measures/weights_and_measures.py,sha256=i3Fv7hZczQmvTtPwzWvQb-XAxCG6Uta_vd4DV7XDwOU,16186
 resqpy/well/__init__.py,sha256=v5_gd7sSPRM9q2KsLiLWaw3jbnXFZkou38qeB7_HSN4,990
-resqpy/well/_blocked_well.py,sha256=g5Wh7uvaDH6EWLpvMTG9ShRbqi7OPZ6jDqvMrZdMqlE,188822
+resqpy/well/_blocked_well.py,sha256=yCW9V1uAQG916eOlW5Qs_vRy9HdLA6NG9noQMbYitiE,188839
 resqpy/well/_deviation_survey.py,sha256=y9Cj8Y81puJvUrIeZEUX3QR2iWg2tuUY6QS-_Hu8zEU,22138
 resqpy/well/_md_datum.py,sha256=rRrDQckTJwZtIEh28dlgXj32kcBSu-ZvHFYZOiQsyqg,7154
 resqpy/well/_trajectory.py,sha256=ebKjv9IwhrxJRRH4iSQYmd09zSdTC_Z6u-1-h6vnfqA,50015
@@ -192,7 +192,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.9.2.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.9.2.dist-info/METADATA,sha256=Kp9_Kdifqc4FPnHiRh9YFToHWpliQqbWjt-_EktR-1U,4106
-resqpy-4.9.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-resqpy-4.9.2.dist-info/RECORD,,
+resqpy-4.9.5.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.9.5.dist-info/METADATA,sha256=Y1P5_zdsK0_XEo0zXiSkEdeQEPZP1a-j2qOpIuPNMBM,4027
+resqpy-4.9.5.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+resqpy-4.9.5.dist-info/RECORD,,