subsurface-terra 2025.1.0rc8__py3-none-any.whl → 2025.1.0rc10__py3-none-any.whl

subsurface/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2025.1.0rc8'
+__version__ = version = '2025.1.0rc10'
 __version_tuple__ = version_tuple = (2025, 1, 0)

subsurface/modules/reader/mesh/mx_reader.py

@@ -157,7 +157,7 @@ def _process_mesh(mesh_lines) -> Optional[GOCADMesh]:
             continue
 
         if in_tface:
-            if line.startswith('VRTX'):
+            if line.startswith('VRTX') or line.startswith('PVRTX'):
                 # Parse vertex line
                 parts = line.split()
                 if len(parts) >= 5:
@@ -167,6 +167,7 @@ def _process_mesh(mesh_lines) -> Optional[GOCADMesh]:
                     vertex_indices.append(vid)
                     vertex_list.append([x, y, z])
                     vid_to_index[vid] = len(vertex_list) - 1
+                    # If PVRTX then there could be more columns with property values. For now, we are just parsing the vertex coordinates.
                 continue
             elif line.startswith('ATOM'):
                 # Parse ATOM line

subsurface/modules/reader/volume/read_volume.py

@@ -7,6 +7,7 @@ from subsurface.core.structs import StructuredData
 from .... import optional_requirements
 from ....core.structs import UnstructuredData
 from subsurface.core.reader_helpers.readers_data import GenericReaderFilesHelper
+import numpy as np
 import pandas as pd
 
 
@@ -32,7 +33,7 @@ def read_VTK_structured_grid(file_or_buffer: Union[str, BytesIO], active_scalars
         # If it's a file path, read directly
         pyvista_obj = pv.read(file_or_buffer)
     try:
-        pyvista_struct: pv.ExplicitStructuredGrid = pyvista_obj.cast_to_explicit_structured_grid()
+        pyvista_struct: pv.ExplicitStructuredGrid = pv_cast_to_explicit_structured_grid(pyvista_obj)
     except Exception as e:
         raise f"The file is not a structured grid: {e}"
 
@@ -99,3 +100,71 @@ def read_volumetric_mesh_attr_file(reader_helper: GenericReaderFilesHelper) -> p
     df = pd.read_table(reader_helper.file_or_buffer, **reader_helper.pandas_reader_kwargs)
     df.columns = df.columns.astype(str).str.strip()
     return df
+
+
+def pv_cast_to_explicit_structured_grid(pyvista_object):
+
+    pv = optional_requirements.require_pyvista()
+
+    match pyvista_object:
+
+        case pv.RectilinearGrid() as rectl_grid:
+
+            return __pv_convert_rectilinear_to_explicit(rectl_grid)
+
+        case _:
+
+            return pyvista_object.cast_to_explicit_structured_grid()
+
+
+def __pv_convert_rectilinear_to_explicit(rectl_grid):
+
+    pv = optional_requirements.require_pyvista()
+
+    # Extract the coordinate arrays from the input RectilinearGrid.
+    x = np.asarray(rectl_grid.x)
+    y = np.asarray(rectl_grid.y)
+    z = np.asarray(rectl_grid.z)
+
+    # Helper function: "double" the coordinates to produce an expanded set
+    # that, when processed internally via np.unique, returns the original nodal values.
+    def doubled_coords(arr):
+        return np.repeat(arr, 2)[1:-1]
+
+    # Double the coordinate arrays.
+    xcorn = doubled_coords(x)
+    ycorn = doubled_coords(y)
+    zcorn = doubled_coords(z)
+
+    # Build a complete grid of corner points via meshgrid. Fortran ('F') order ensures
+    # the connectivity ordering aligns with VTK's expectations.
+    xx, yy, zz = np.meshgrid(xcorn, ycorn, zcorn, indexing='ij')
+    corners = np.column_stack((xx.ravel(order='F'),
+                               yy.ravel(order='F'),
+                               zz.ravel(order='F')))
+
+    # The dimensions to pass to the ExplicitStructuredGrid constructor should be
+    # the counts of unique coordinates in each direction.
+    dims = (len(np.unique(xcorn)),
+            len(np.unique(ycorn)),
+            len(np.unique(zcorn)))
+
+    # Create the ExplicitStructuredGrid.
+    explicit_grid = pv.ExplicitStructuredGrid(dims, corners)
+    explicit_grid.compute_connectivity()
+
+    # --- Copy associated data arrays ---
+
+    # Transfer all cell data arrays.
+    for name, array in rectl_grid.cell_data.items():
+        explicit_grid.cell_data[name] = array.copy()
+
+    # Transfer all point data arrays.
+    for name, array in rectl_grid.point_data.items():
+        explicit_grid.point_data[name] = array.copy()
+
+    # (Optional) Transfer field data as well.
+    for name, array in rectl_grid.field_data.items():
+        explicit_grid.field_data[name] = array.copy()
+
+    return explicit_grid

{subsurface_terra-2025.1.0rc8.dist-info → subsurface_terra-2025.1.0rc10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subsurface_terra
-Version: 2025.1.0rc8
+Version: 2025.1.0rc10
 Summary: Subsurface data types and utilities. This version is the one used by Terranigma Solutions. Please feel free to take anything in this repository for the original one.
 Home-page: https://softwareunderground.github.io/subsurface
 Author: Software Underground

{subsurface_terra-2025.1.0rc8.dist-info → subsurface_terra-2025.1.0rc10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 subsurface/__init__.py,sha256=0D2rCUem3fiHsXFXXSmwheLiPS4cXxEdfWdFBj0b-cY,930
-subsurface/_version.py,sha256=0-BBA5HgwLud0-RzWFjmovo55cqFKf4y2LQ_O3YdbRs,541
+subsurface/_version.py,sha256=FcQPFS21SJ4lyiZc0tXWa590ajfkakU3g4UuBjnhZoI,542
 subsurface/optional_requirements.py,sha256=Wg36RqxzPiLtN-3qSg5K9QVEeXCB0-EjSzHERAoO8EE,2883
 subsurface/api/__init__.py,sha256=UiOBKQcZJGMeh_5ZNhXqT2iEdiIk721djLX30aFxEa4,341
 subsurface/api/interfaces/__init__.py,sha256=rqUtJyMLicobcyhmr74TepjmUQAEmlazKT3vjV_n3aA,6
@@ -49,7 +49,7 @@ subsurface/modules/reader/mesh/_trimesh_reader.py,sha256=-cmm-BYIUC9x6tqABNgKzNM
 subsurface/modules/reader/mesh/csv_mesh_reader.py,sha256=0iXYg-JOLUg7yH6Rw6qCoxXvKh0hOUTwjYxbhSlGfGM,1969
 subsurface/modules/reader/mesh/dxf_reader.py,sha256=JDhzFRE46sdwMGBB8enHNluH07ohqt6LhgLHiSQRL-I,6525
 subsurface/modules/reader/mesh/glb_reader.py,sha256=dierR9AYM5Q2szLuemfLlM_JcPRNtDrD5fpF8zNjBS8,1118
-subsurface/modules/reader/mesh/mx_reader.py,sha256=o1OPnGSSOjJCpLCzazRsmjhFxhbYrCi6zTTRnKtCJ30,8419
+subsurface/modules/reader/mesh/mx_reader.py,sha256=YQqvOJ4FuPrlz_3bHIdqT-9YKkirF_Vbjnv6cVQnwAw,8587
 subsurface/modules/reader/mesh/obj_reader.py,sha256=LXf-N-So5xWhnZ6uHJPjcCfQM71a_mqJa3hQEikOGzU,2207
 subsurface/modules/reader/mesh/omf_mesh_reader.py,sha256=0gewosxlLVTQQoUyvYB91AOZ_SByQqxw53coSwCKeMI,1436
 subsurface/modules/reader/mesh/surface_reader.py,sha256=EcRjr3sAJbwZpqm7WHHe1bnMZyGO5MSgF6qm5bSBLtQ,2420
@@ -60,7 +60,7 @@ subsurface/modules/reader/profiles/profiles_core.py,sha256=kqlt79hjdWWQNBjWqLGlu
 subsurface/modules/reader/topography/__init__.py,sha256=zkaTX5JxsNfjF-dFeEbHfUB58vhPMjm6Iiqx9HgJOrY,14
 subsurface/modules/reader/topography/topo_core.py,sha256=6rkDp9XrUSif8ZuraDrUK2I8-yqEp8CRm4r4l2lQuw0,3542
 subsurface/modules/reader/volume/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-subsurface/modules/reader/volume/read_volume.py,sha256=Dlv7G5GYikdZCp9H5SMfL9vSsUAKpc4b3vBB-P7IVBM,4025
+subsurface/modules/reader/volume/read_volume.py,sha256=nn0C047jsty_kusZZ-nfZ2bWbyfkaakLsDy_ADxb5sw,6368
 subsurface/modules/reader/volume/segy_reader.py,sha256=oBS1FwwzFTMBmAR3odJMvW-as_0YMudPcFmndpcApW4,3958
 subsurface/modules/reader/volume/seismic.py,sha256=dRA7YKw9fkrkAYS7Bnfm7GfCPdfxVsDyfM7frQK56V4,4950
 subsurface/modules/reader/volume/volume_utils.py,sha256=7ToIdVwq04lMyYGJE9PzYVQt9xl9mjbXXrzvMfM6wGw,1367
@@ -86,8 +86,8 @@ subsurface/modules/writer/to_rex/material_encoder.py,sha256=zGlqF9X_Civ9VvtGwo-I
 subsurface/modules/writer/to_rex/mesh_encoder.py,sha256=6TBtJhYJEAMEBHxQkbweXrJO1jIUx1ClM8l5ajVCrLc,6443
 subsurface/modules/writer/to_rex/to_rex.py,sha256=njsm2d3e69pRVfF_TOC_hexvXPmgNTZdJvhbnXcvyIo,3800
 subsurface/modules/writer/to_rex/utils.py,sha256=HEpJ95LjHOK24ePpmLpPP5uFyv6i_kN3AWh031q-1Uc,379
-subsurface_terra-2025.1.0rc8.dist-info/licenses/LICENSE,sha256=GSXh9K5TZauM89BeGbYg07oST_HMhOTiZoEGaUeKBtA,11606
-subsurface_terra-2025.1.0rc8.dist-info/METADATA,sha256=8FPwCzETpUqDGDVQ4uiRn9Q2hk2WRarAUOhJs6zeNoc,7093
-subsurface_terra-2025.1.0rc8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-subsurface_terra-2025.1.0rc8.dist-info/top_level.txt,sha256=f32R_tUSf83CfkpB4vjv5m2XcD8TmDX9h7F4rnEXt5A,11
-subsurface_terra-2025.1.0rc8.dist-info/RECORD,,
+subsurface_terra-2025.1.0rc10.dist-info/licenses/LICENSE,sha256=GSXh9K5TZauM89BeGbYg07oST_HMhOTiZoEGaUeKBtA,11606
+subsurface_terra-2025.1.0rc10.dist-info/METADATA,sha256=jBJ-O1dvs0h0JLz8AC8pa_DvztAmPpJk5f_CivFG0n4,7094
+subsurface_terra-2025.1.0rc10.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+subsurface_terra-2025.1.0rc10.dist-info/top_level.txt,sha256=f32R_tUSf83CfkpB4vjv5m2XcD8TmDX9h7F4rnEXt5A,11
+subsurface_terra-2025.1.0rc10.dist-info/RECORD,,