subsurface-terra 2025.1.0rc17__py3-none-any.whl → 2025.1.0rc19__py3-none-any.whl

subsurface/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2025.1.0rc17'
-__version_tuple__ = version_tuple = (2025, 1, 0, 'rc17')
+__version__ = version = '2025.1.0rc19'
+__version_tuple__ = version_tuple = (2025, 1, 0, 'rc19')
 
 __commit_id__ = commit_id = None

subsurface/core/structs/base_structures/unstructured_data.py

@@ -278,15 +278,27 @@ class UnstructuredData:
         return file
 
     def _set_binary_header(self):
+        from subsurface.core.structs.base_structures._aux import safe_convert_to_float32
+        
+        # Get the filtered dataframes (same as in _to_bytearray)
+        filtered_cell_attrs = safe_convert_to_float32(
+            self.attributes,
+            error_handling='drop'
+        )
+        filtered_vertex_attrs = safe_convert_to_float32(
+            self.points_attributes,
+            error_handling='drop'
+        )
+        
         header = {
                 "vertex_shape"     : self.vertex.shape,
                 "cell_shape"       : self.cells.shape,
-                "cell_attr_shape"  : self.attributes.shape,
-                "vertex_attr_shape": self.points_attributes.shape,
-                "cell_attr_names"  : self.attributes.columns.to_list(),
-                "cell_attr_types"  : self.attributes.dtypes.astype(str).to_list(),
-                "vertex_attr_names": self.points_attributes.columns.to_list(),
-                "vertex_attr_types": self.attributes.dtypes.astype(str).to_list(),
+                "cell_attr_shape"  : filtered_cell_attrs.shape,
+                "vertex_attr_shape": filtered_vertex_attrs.shape,
+                "cell_attr_names"  : filtered_cell_attrs.columns.to_list(),
+                "cell_attr_types"  : filtered_cell_attrs.dtypes.astype(str).to_list(),
+                "vertex_attr_names": filtered_vertex_attrs.columns.to_list(),
+                "vertex_attr_types": filtered_vertex_attrs.dtypes.astype(str).to_list(),
                 "xarray_attrs"     : self.data.attrs
         }
         return header

subsurface/modules/reader/volume/read_volume.py

@@ -35,7 +35,7 @@ def read_VTK_structured_grid(file_or_buffer: Union[str, BytesIO], active_scalars
     try:
         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}"
+        raise ValueError(f"The file is not a structured grid: {e}")
 
     if PLOT := False:
         pyvista_struct.set_active_scalars(active_scalars)
@@ -301,16 +301,20 @@ def __validate_rectilinear_to_explicit_conversion(rectl_grid, explicit_grid, *,
     if explicit_grid.n_cells != expected_cells:
         raise ValueError(f"Cell count mismatch: explicit {explicit_grid.n_cells} vs expected {expected_cells}")
 
-    expected_points = nx * ny * nz
-    if explicit_grid.n_points != expected_points:
-        raise ValueError(f"Point count mismatch: explicit {explicit_grid.n_points} vs expected {expected_points}")
+    # Accept either nodes (M) or corners (N) for n_points, depending on PyVista/VTK version
+    M = nx * ny * nz
+    N = (2 * (nx - 1)) * (2 * (ny - 1)) * (2 * (nz - 1))
+    if explicit_grid.n_points not in (M, N):
+        raise ValueError(
+            f"Point count unexpected: explicit {explicit_grid.n_points}; expected either nodes {M} or corners {N}"
+        )
 
     # bounds
     if not np.allclose(explicit_grid.bounds, rectl_grid.bounds, rtol=rtol, atol=atol):
         raise ValueError(f"Bounds differ: explicit {explicit_grid.bounds} vs rect {rectl_grid.bounds}")
 
-    # axis coordinates (order-independent)
-    pts = explicit_grid.points  # shape (M,3), M = nx*ny*nz (already deduped/sorted by unique)
+    # axis coordinates (order-independent, light memory use: 1D uniques per axis)
+    pts = explicit_grid.points  # may be M×3 (unique nodes) or N×3 (corner lattice)
     x_exp = np.unique(pts[:, 0])
     y_exp = np.unique(pts[:, 1])
     z_exp = np.unique(pts[:, 2])

{subsurface_terra-2025.1.0rc17.dist-info → subsurface_terra-2025.1.0rc19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subsurface_terra
-Version: 2025.1.0rc17
+Version: 2025.1.0rc19
 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
@@ -45,6 +45,7 @@ Requires-Dist: pdf2image; extra == "opt"
 Requires-Dist: imagecodecs; extra == "opt"
 Requires-Dist: segyio; extra == "opt"
 Requires-Dist: segyio; extra == "opt"
+Requires-Dist: segysak; extra == "opt"
 Requires-Dist: imageio; extra == "opt"
 Requires-Dist: scipy; extra == "opt"
 Requires-Dist: geopandas; extra == "opt"
@@ -85,6 +86,7 @@ Requires-Dist: pdf2image; extra == "all"
 Requires-Dist: imagecodecs; extra == "all"
 Requires-Dist: segyio; extra == "all"
 Requires-Dist: segyio; extra == "all"
+Requires-Dist: segysak; extra == "all"
 Requires-Dist: imageio; extra == "all"
 Requires-Dist: scipy; extra == "all"
 Requires-Dist: geopandas; extra == "all"

{subsurface_terra-2025.1.0rc17.dist-info → subsurface_terra-2025.1.0rc19.dist-info}/RECORD

@@ -1,5 +1,5 @@
 subsurface/__init__.py,sha256=7_KttQl8rZeJG2AIZUEA_oXRWZYkJ6DUqKjqlLgF9cA,899
-subsurface/_version.py,sha256=gsxkMYFwv9EtAE0vhlbi1rqKVeK7ATfhxTYuf25JQK8,722
+subsurface/_version.py,sha256=Eu71ydzhRm4du5tKL1VhSCZmifO4qCBWUC1Wgfjx7ag,722
 subsurface/optional_requirements.py,sha256=SLaMSoiGTx8ea8rpHee4Zs4te0BXcxxDWC4SF0g0RuE,2767
 subsurface/api/__init__.py,sha256=Lfx7Dq0GzQsea19w8YO4v1ZSmgeLRgR6IvjvDDjjpDY,356
 subsurface/api/interfaces/__init__.py,sha256=ajz1GSNU9xYVrFEDSz6Xwg7amWQ_yvW75tQa1ZvRIWc,3
@@ -27,7 +27,7 @@ subsurface/core/structs/base_structures/_liquid_earth_mesh.py,sha256=ZIGLdxbOyC0
 subsurface/core/structs/base_structures/_unstructured_data_constructor.py,sha256=nSsmRqyGyrU5DKb0YQKy6FwZm6GVBTPwwTLZJsXPcyk,2671
 subsurface/core/structs/base_structures/base_structures_enum.py,sha256=_B1rsaTnPw6mJhYea0ZIfKmaF3mfkojh-3N5hGG6o5w,90
 subsurface/core/structs/base_structures/structured_data.py,sha256=N6KcAeZJSfd4Wa0PID8aOcw9IIXrNRZ_DspBzF8JPTY,10310
-subsurface/core/structs/base_structures/unstructured_data.py,sha256=-o7XIq886MU_uJHCLFCFklQLNjyLeAx05-cAFMT5y9w,13274
+subsurface/core/structs/base_structures/unstructured_data.py,sha256=8HzBq5gR_bw4xDa96Zwqhu4mmDx8seanNUWPfYISgCk,13727
 subsurface/core/structs/structured_elements/__init__.py,sha256=wQ8z6vioC98TNwnqMHlDMVFJ1yOKsmlVa6kHL1SOfZQ,43
 subsurface/core/structs/structured_elements/octree_mesh.py,sha256=3WIgKGPJ3xjjV06gGlLuW7W7POfsJi2z7p4egYD-Y7s,230
 subsurface/core/structs/structured_elements/structured_grid.py,sha256=S08sbGOu-r-rosHm6fwpqZgmkujxMMev7Z8WAwlsuak,1743
@@ -64,7 +64,7 @@ subsurface/modules/reader/topography/__init__.py,sha256=U41kQFNPpfYV6KJpMnkqgqLk
 subsurface/modules/reader/topography/topo_core.py,sha256=EzcRFJ_zBojVtZkZHbYaUpEIyFUiVaf6zeSWMuyAxxk,3442
 subsurface/modules/reader/volume/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 subsurface/modules/reader/volume/read_grav3d.py,sha256=5-g65mOMYiOiLqGu3_foDZDGFUIiavkKFC7uZ99v4Dk,14493
-subsurface/modules/reader/volume/read_volume.py,sha256=fg928kOBWxGgWnrLdeOvHDRr54cM5nxb_65-lM1BVsk,13581
+subsurface/modules/reader/volume/read_volume.py,sha256=pWZMCzJ6tDnJnVmeO8_ATRBWdXM3VG1J9qX3wN4g6NA,13789
 subsurface/modules/reader/volume/segy_reader.py,sha256=Yd1fguaKMrgv514Yc8tBm1NxDhWNtI1qOYWWTF_TgPU,3853
 subsurface/modules/reader/volume/seismic.py,sha256=Iy5zKpjVy7vV6lKyfh_MsUpex6yBMGbovu640NlKkMM,4777
 subsurface/modules/reader/volume/volume_utils.py,sha256=7Ih6JLrMRotQHO9g0bS43IgsefpiXwcx79EKUBDLhdE,1324
@@ -92,8 +92,8 @@ subsurface/modules/writer/to_rex/material_encoder.py,sha256=J5x1PCW2ljw4JZXLvefG
 subsurface/modules/writer/to_rex/mesh_encoder.py,sha256=dTGqHGbJKgtPgrrG2lrks5r8timfzluqj7JLMC-EBWQ,6291
 subsurface/modules/writer/to_rex/to_rex.py,sha256=dFCCWudTUzZebNrPxnM353_vaykE8PQobVtBAPQkb3E,3685
 subsurface/modules/writer/to_rex/utils.py,sha256=BmMT49WRvbbSuiW_muIvFm4ILR1vcVqh_J23leiMB44,364
-subsurface_terra-2025.1.0rc17.dist-info/licenses/LICENSE,sha256=QEY_TMj0mh5hY6jh6avflZOz0GmH1PgurVoF3FvwXaY,11403
-subsurface_terra-2025.1.0rc17.dist-info/METADATA,sha256=KdRIAeSl2985ykJvSweVD9Gn1mnwbSnMmiLzH8e_yeg,6900
-subsurface_terra-2025.1.0rc17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-subsurface_terra-2025.1.0rc17.dist-info/top_level.txt,sha256=f32R_tUSf83CfkpB4vjv5m2XcD8TmDX9h7F4rnEXt5A,11
-subsurface_terra-2025.1.0rc17.dist-info/RECORD,,
+subsurface_terra-2025.1.0rc19.dist-info/licenses/LICENSE,sha256=QEY_TMj0mh5hY6jh6avflZOz0GmH1PgurVoF3FvwXaY,11403
+subsurface_terra-2025.1.0rc19.dist-info/METADATA,sha256=GS3ViagAJ5WQfn0XCWo8aiHTmUJ98m_AM4WpLQog6rE,6978
+subsurface_terra-2025.1.0rc19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+subsurface_terra-2025.1.0rc19.dist-info/top_level.txt,sha256=f32R_tUSf83CfkpB4vjv5m2XcD8TmDX9h7F4rnEXt5A,11
+subsurface_terra-2025.1.0rc19.dist-info/RECORD,,