subsurface-terra 2025.1.0rc17__tar.gz → 2025.1.0rc19__tar.gz

{subsurface_terra-2025.1.0rc17 → subsurface_terra-2025.1.0rc19}/.teamcity/Subsurface/buildTypes/Subsurface_Testing.xml

@@ -32,11 +32,13 @@
       <param name="env.PATH_TO_OMF" value="%env.TERRA_PATH_DEVOPS%/combined/Leapfrog_OMF/Collinstown.omf" />
       <param name="env.PATH_TO_SECTION" value="%env.TERRA_PATH_DEVOPS%/meshes/Seismic/L1_CDP-Coords.txt" />
       <param name="env.PATH_TO_SEISMIC" value="%env.TERRA_PATH_DEVOPS%/meshes/Seismic/Linie01.segy" />
+      <param name="env.PATH_TO_SEISMIC_3D" value="%env.TERRA_PATH_DEVOPS%/volume/3D-SPRB-11-depth-converted.segy" />
       <param name="env.PATH_TO_SEISMIC_FINAL" value="%env.TERRA_PATH_DEVOPS%/meshes/Seismic/L1_final-mig.sgy" />
       <param name="env.PATH_TO_SPREMBERG_ASSAY" value="%env.TERRA_PATH_DEVOPS%/boreholes/Spremberg/Spremberg_assay.csv" />
       <param name="env.PATH_TO_SPREMBERG_COLLAR" value="%env.TERRA_PATH_DEVOPS%/boreholes/Spremberg/Spremberg_collar_updated.csv" />
       <param name="env.PATH_TO_SPREMBERG_STRATIGRAPHY" value="%env.TERRA_PATH_DEVOPS%/boreholes/Spremberg/Spremberg_stratigraphy.csv" />
       <param name="env.PATH_TO_SPREMBERG_SURVEY" value="%env.TERRA_PATH_DEVOPS%/boreholes/Spremberg/Spremberg_survey.csv" />
+      <param name="env.PATH_TO_VOLUME_NUMPY" value="%env.TERRA_PATH_DEVOPS%/volume/numpy/" />
       <param name="env.PATH_TO_WEISWEILER" value="%env.TERRA_PATH_DEVOPS%/meshes/Weisweiler/" />
       <param name="env.TERRA_PATH_DEVOPS" value="/home/leguark/DevOps/DevOps/SubsurfaceTestData/" />
     </parameters>
@@ -119,6 +121,21 @@ pip install --verbose -r requirements/requirements_wells.txt
 export REQUIREMENT_LEVEL="${REQUIREMENT_LEVEL:-READ_WELL}"
 echo "REQUIREMENT_LEVEL is ${REQUIREMENT_LEVEL}"
 
+python -m pytest --teamcity -v]]></param>
+          <param name="teamcity.step.mode" value="execute_if_failed" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="Run_Test_Volumes" name="Run Test: Volume" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[set -euo pipefail
+source venv/bin/activate
+
+pip install --verbose -r requirements/requirements_volume.txt
+
+export REQUIREMENT_LEVEL="${REQUIREMENT_LEVEL:-READ_VOLUME}"
+echo "REQUIREMENT_LEVEL is ${REQUIREMENT_LEVEL}"
+
 python -m pytest --teamcity -v]]></param>
           <param name="teamcity.step.mode" value="execute_if_failed" />
           <param name="use.custom.script" value="true" />

{subsurface_terra-2025.1.0rc17 → subsurface_terra-2025.1.0rc19}/PKG-INFO

@@ -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 → subsurface_terra-2025.1.0rc19}/requirements/requirements_volume.txt

@@ -1,3 +1,4 @@
 segyio
+segysak
 imageio
 scipy

{subsurface_terra-2025.1.0rc17 → subsurface_terra-2025.1.0rc19}/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 = 'g55a3a27a3'
+__commit_id__ = commit_id = 'ga7bce77b0'

{subsurface_terra-2025.1.0rc17 → subsurface_terra-2025.1.0rc19}/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_terra-2025.1.0rc17 → subsurface_terra-2025.1.0rc19}/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 → subsurface_terra-2025.1.0rc19}/subsurface_terra.egg-info/PKG-INFO

@@ -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 → subsurface_terra-2025.1.0rc19}/subsurface_terra.egg-info/requires.txt

@@ -19,6 +19,7 @@ tifffile
 pdf2image
 imagecodecs
 segyio
+segysak
 scipy
 geopandas
 rasterio
@@ -63,6 +64,7 @@ tifffile
 pdf2image
 imagecodecs
 segyio
+segysak
 scipy
 geopandas
 pooch