resqpy 5.1.8__tar.gz → 5.1.10__tar.gz

{resqpy-5.1.8 → resqpy-5.1.10}/PKG-INFO

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

{resqpy-5.1.8 → resqpy-5.1.10}/pyproject.toml

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

{resqpy-5.1.8 → resqpy-5.1.10}/resqpy/__init__.py

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

{resqpy-5.1.8 → resqpy-5.1.10}/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.8 → resqpy-5.1.10}/resqpy/surface/_tri_mesh.py

@@ -9,6 +9,7 @@ import numpy as np
 
 import resqpy.crs as rqc
 import resqpy.surface as rqs
+import resqpy.weights_and_measures as wam
 import resqpy.olio.vector_utilities as vec
 import resqpy.olio.uuid as bu
 
@@ -568,6 +569,27 @@ class TriMesh(rqs.Mesh):
 
         return p
 
+    def area(self, required_uom = None):
+        """Returns approximate area of tri mesh based on proportion of non-NaN z values.
+
+        arguments:
+            - required_uom (str, optional): RESQML area unit of measure string for result
+
+        returns:
+            - float being the approximate area of the tri mesh in its xy projection
+
+        note:
+            - default uom is crs xy_units squared
+        """
+        a = 1.0 - (float(np.count_nonzero(np.isnan(self.full_array_ref()[..., 2]))) / float(self.nj * self.ni))
+        a *= float((self.nj - 1) * (self.ni - 1)) * self.t_side * self.t_side * root_3_by_2
+        if required_uom is not None:
+            crs = rqc.Crs(self.model, uuid = self.crs_uuid)
+            if required_uom != crs.xy_units + '2':
+                uom = ('ft' if crs.xy_units.startswith('ft') else crs.xy_units) + '2'
+                a = wam.convert(a, uom, required_uom)
+        return a
+
     def is_compatible_with(self, other_tri_mesh):
         """Returns True if this tri mesh has the same xy points as the other."""