resqpy 5.1.9__py3-none-any.whl → 5.1.10__py3-none-any.whl

resqpy/__init__.py

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

resqpy/olio/zmap_reader.py

@@ -7,6 +7,7 @@ import logging
 log = logging.getLogger(__name__)
 
 import numpy as np
+import resqpy.olio.vector_utilities as vec
 
 
 def read_zmap_header(inputfile):
@@ -72,7 +73,7 @@ def read_roxar_header(inputfile):
     """Reads header lines from a roxar format file.
 
     returns:
-       header_lines_count, no_rows, no_cols, minx, maxx, miny, maxy, null_value
+       header_lines_count, no_rows, no_cols, minx, maxx, miny, maxy, null_value, rotation, originx, originy
     """
 
     with open(inputfile, 'r') as fp:
@@ -88,9 +89,12 @@ def read_roxar_header(inputfile):
         maxy = float(words[3])
         words = fp.readline().split()
         no_cols = int(words[0])
+        rotation = float(words[1])
+        originx = float(words[2])
+        originy = float(words[3])
     headers = 4
     null_value = '9999900.0000'
-    return headers, no_rows, no_cols, minx, maxx, miny, maxy, null_value
+    return headers, no_rows, no_cols, minx, maxx, miny, maxy, null_value, rotation, originx, originy
 
 
 def read_mesh(inputfile, dtype = np.float64, format = None):
@@ -103,7 +107,8 @@ def read_mesh(inputfile, dtype = np.float64, format = None):
     if format == 'zmap':
         headers, no_rows, no_cols, minx, maxx, miny, maxy, null_value = read_zmap_header(inputfile)
     elif format in ['rms', 'roxar']:
-        headers, no_rows, no_cols, minx, maxx, miny, maxy, null_value = read_roxar_header(inputfile)
+        headers, no_rows, no_cols, minx, maxx, miny, maxy, null_value, rotation, originx, originy = read_roxar_header(
+            inputfile)
     else:
         raise ValueError('format not recognised for read_mesh: ' + str(format))
     # load the values in, converting null value to NaN's
@@ -143,6 +148,16 @@ def read_mesh(inputfile, dtype = np.float64, format = None):
     else:  # format in ['rms', 'roxar']
         y = np.linspace(miny, maxy, no_rows)
     x, y = np.meshgrid(x, y)  # get x and y of every node
+    if format in ['rms', 'roxar']:
+        if rotation != 0.0:
+            unrot = np.empty(shape = [no_rows, no_cols, 3])
+            unrot[:, :, 0] = x - originx
+            unrot[:, :, 1] = y - originy
+            matrix = vec.rotation_matrix_3d_axial(2, rotation)
+            rot = vec.rotate_array(matrix, unrot)
+            x = rot[:, :, 0] + originx
+            y = rot[:, :, 1] + originy
+
     assert x.shape == y.shape == f.shape
 
     return x, y, f

{resqpy-5.1.9.dist-info → resqpy-5.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: resqpy
-Version: 5.1.9
+Version: 5.1.10
 Summary: Python API for working with RESQML models
 License: MIT
 Keywords: RESQML

{resqpy-5.1.9.dist-info → resqpy-5.1.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=vrb9QCmfIRLPlxx_91xKeBskRVGSdjNykQFQY7i1DGs,555
+resqpy/__init__.py,sha256=WzNNz7f6bGpTRb2e9rAZACnOvxMITQPQp7hbHOkuzAA,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
@@ -104,7 +104,7 @@ resqpy/olio/write_data.py,sha256=bIX7ilMkXWCMz_zQh-Gqk56sNzng4W5l4BahW2EV7Kw,514
 resqpy/olio/write_hdf5.py,sha256=iUIYPWlbJsSSq9UXXiXAW_S6TeK-N2M7QvlJJE43EK8,19015
 resqpy/olio/xml_et.py,sha256=aPjxr2XWvYcwlnckL_UiZmd5EGEoIfy_JxeOKOk3vwQ,25322
 resqpy/olio/xml_namespaces.py,sha256=PiQi2W7gRLxhMSEs26ahT4MlagYqsjMWJlNpIiZupoA,1824
-resqpy/olio/zmap_reader.py,sha256=YuhZjde_DZszVFsUKfu0XieKGg7ONXtJWskRV9Pw7VE,5709
+resqpy/olio/zmap_reader.py,sha256=pVQUDk4gY9MtAqNZFOo2J9-CPO70qS6RH-OzJmmBf1c,6349
 resqpy/organize/__init__.py,sha256=H1c7B4aRJf5peaGUTvGrCVug4Xr_JW38zeWL-LyCDtk,2206
 resqpy/organize/_utils.py,sha256=p1ec0ytUv8X4SFn0cCp5g-aWjucNR7xKQEwkcMOyHYM,2937
 resqpy/organize/boundary_feature.py,sha256=AqSTtYpEKBXgkggzETbl61PhtdatIEFwXkzcrqRlj0A,1685
@@ -193,7 +193,7 @@ resqpy/well/_wellbore_marker_frame.py,sha256=xvYH2_2Ie3a18LReFymbUrZboOx7Rhv5DOD
 resqpy/well/blocked_well_frame.py,sha256=Rx8jwkCjchseDZaTttPkA1-f6l7W6vRGrxWtDHlEPx8,22560
 resqpy/well/well_object_funcs.py,sha256=1O4EVPuTn-kN3uT_V4TbSwehnMUMY0TX36XOUgasTcc,24689
 resqpy/well/well_utils.py,sha256=-g_pg2v5XD9g4SQz9sk7KK-x2xEQZHzWehCQqiEGo6M,7627
-resqpy-5.1.9.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-5.1.9.dist-info/METADATA,sha256=nZu5hw5sgWE_EEjC6wrxTqYABwsz5Hnq1pLihKN26YI,3986
-resqpy-5.1.9.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-resqpy-5.1.9.dist-info/RECORD,,
+resqpy-5.1.10.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-5.1.10.dist-info/METADATA,sha256=CXqpWAWxAExImRo2QYl94u0SoHJWvxwy4k7YOBy3qek,3987
+resqpy-5.1.10.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+resqpy-5.1.10.dist-info/RECORD,,

{resqpy-5.1.9.dist-info → resqpy-5.1.10.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any