subsurface-terra 2025.1.0rc19__tar.gz → 2026.1.0__tar.gz

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

@@ -66,7 +66,7 @@ VENVPY="venv/bin/python -E -s"
 VENVPIP="venv/bin/python -E -s -m pip"
 
 $VENVPIP install --upgrade pip setuptools wheel
-$VENVPIP install --verbose -r requirements/requirements_dev.txt
+$VENVPIP install --verbose --pre -r requirements/requirements_dev.txt
 $VENVPIP install --verbose teamcity-messages
 
 # Sanity probe

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subsurface_terra
-Version: 2025.1.0rc19
+Version: 2026.1.0
 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.0rc19 → subsurface_terra-2026.1.0}/subsurface/_version.py

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

{subsurface_terra-2025.1.0rc19 → subsurface_terra-2026.1.0}/subsurface/core/geological_formats/boreholes/_map_attrs_to_survey.py

@@ -216,7 +216,7 @@ def _map_attrs_to_measured_depths(attrs: pd.DataFrame, survey_trajectory: LineSe
                 continue
 
             attr_values = attrs_well[col]
-            is_categorical = attr_values.dtype == 'O' or isinstance(attr_values.dtype, pd.CategoricalDtype)
+            is_categorical = attr_values.dtype == 'O' or isinstance(attr_values.dtype, pd.CategoricalDtype) or isinstance(attr_values.dtype, pd.StringDtype)
 
             # Skip columns that can't be interpolated and aren't categorical
             if is_categorical and col not in ['lith_ids', 'component lith']:
@@ -231,6 +231,11 @@ def _map_attrs_to_measured_depths(attrs: pd.DataFrame, survey_trajectory: LineSe
                 is_categorical
             )
 
+            # Convert to appropriate dtype to avoid pandas 3.0 dtype coercion errors
+            target_dtype = new_attrs[col].dtype
+            if pd.api.types.is_numeric_dtype(target_dtype) and not is_categorical:
+                interpolated_values = np.asarray(interpolated_values, dtype=target_dtype)
+                
             new_attrs.loc[well_mask, col] = interpolated_values
 
     return new_attrs

{subsurface_terra-2025.1.0rc19 → subsurface_terra-2026.1.0}/subsurface/core/structs/base_structures/structured_data.py

@@ -14,6 +14,10 @@ class StructuredDataType(enum.Enum):
     IRREGULAR_AXIS_ALIGNED = 2  #: Irregular axis aligned grid. Distance between consecutive points is not constant
     IRREGULAR_AXIS_UNALIGNED = 3  #: Irregular axis unaligned grid. Distance between consecutive points is not constant
 
+    # [CLN] This terminology looks odd to me.
+    # "Uniform" vs. "non-uniform" is what PyVista uses instead of "regular" vs. "irregular".
+    # "Rectilinear" vs. "curvilinear" is what Pyvista uses instead of "axis-aligned" vs "axis-unaligned".
+    # As of right now it's not clear to me that anything other than REGULAR_AXIS_ALIGNED is actually valid in this file.
 
 @dataclass(frozen=False)
 class StructuredData:
@@ -85,12 +89,49 @@ class StructuredData:
         return cls(dataset, data_array_name)
 
     @classmethod
-    def from_pyvista_structured_grid(
+    def from_pyvista(
             cls,
-            grid: Union["pyvista.ExplicitStructuredGrid", "pyvista.StructuredGrid"],
+            pyvista_object: 'pyvista.DataSet',
             data_array_name: str = "data_array"
     ):
         pyvista = require_pyvista()
+
+        def rectilinear_is_uniform(
+                rectilinear_grid: pyvista.RectilinearGrid,
+                relative_tolerance: float = 1e-6,
+                absolute_tolerance: float = 1e-12,
+            ) -> bool:
+
+            def axis_is_uniform(v: np.ndarray) -> bool:
+                v = np.asarray(v, dtype=float)
+                if v.size <= 2:
+                    # 0, 1 or 2 points → treat as uniform for our purposes
+                    return True
+                diffs = np.diff(v)
+                first = diffs[0]
+                return np.allclose(diffs, first, rtol=relative_tolerance, atol=absolute_tolerance)
+
+            return (axis_is_uniform(rectilinear_grid.x)
+                and axis_is_uniform(rectilinear_grid.y)
+                and axis_is_uniform(rectilinear_grid.z))
+
+        extended_help_message = "Only uniform rectilinear grids are currently supported. The VTK format is developed by KitWare and you can use their free software ParaView to further inspect your file. In ParaView, in Information > Data Statistics, the Type must be Image (Uniform Rectilinear Grid). Furthermore, you can use ParaView to interpolate your data on to a uniform rectilinear grid and to export it as Image type."
+
+        match pyvista_object:
+            case pyvista.UnstructuredGrid():
+                # In a previous version of Subsurface there was an ill-formed attempt at supporting some unstructured grids here.
+                # I've left this function to minimize downstream changes and also in case we decide to revive anything in that direction.
+                raise ValueError(f"Cannot generally convert unstructured grids to structured grids. {extended_help_message}")
+            case pyvista.ImageData():
+                pass
+            case pyvista.RectilinearGrid() as rectilinear:
+                if not rectilinear_is_uniform(rectilinear):
+                    raise NotImplementedError(f"Non-uniform rectilinear grid conversion is not yet implemented. {extended_help_message}")
+            case _:
+                raise ValueError(f"Unexpected VTK grid type. {extended_help_message}")
+
+        grid = pyvista_object.cast_to_structured_grid()
+
         # Extract p
 
         # Extract cell data and point data (if any)

{subsurface_terra-2025.1.0rc19 → subsurface_terra-2026.1.0}/subsurface/modules/reader/mesh/mx_reader.py

@@ -82,7 +82,7 @@ def _process_mesh(mesh_lines) -> Optional[GOCADMesh]:
     in_header = False
     in_coord_sys = False
     in_property_class_header = False
-    in_tface = False
+    in_geometry = False
     current_property_class_header = {}
     vertex_list = []
     vertex_indices = []
@@ -152,11 +152,16 @@ def _process_mesh(mesh_lines) -> Optional[GOCADMesh]:
                         current_property_class_header[line.strip()] = None
             continue
 
-        if line == 'TFACE':
-            in_tface = True
-            continue
+        if not in_geometry:
+            if line == 'TFACE':
+                in_geometry = True
+                continue
+            if line.startswith(("VRTX", "PVRTX", "ATOM", "TRGL", "BSTONE", "BORDER")):
+                # Some TSurf files omit TFACE; geometry can start immediately.
+                in_geometry = True
+                # Do not `continue`. The geometry is already in the current line.
 
-        if in_tface:
+        if in_geometry:
             if line.startswith('VRTX') or line.startswith('PVRTX'):
                 # Parse vertex line
                 parts = line.split()
@@ -207,7 +212,7 @@ def _process_mesh(mesh_lines) -> Optional[GOCADMesh]:
                     mesh.borders.append({'id': int(bid), 'v1': int(v1), 'v2': int(v2)})
                 continue
             elif line == 'END':
-                in_tface = False
+                in_geometry = False
                 continue
             else:
                 pass

subsurface_terra-2026.1.0/subsurface/modules/reader/volume/read_volume.py

@@ -0,0 +1,109 @@
+import os
+from io import BytesIO
+from typing import Union
+
+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
+
+
+def read_VTK_structured_grid(file_or_buffer: Union[str, BytesIO], active_scalars: str) -> StructuredData:
+    pv = optional_requirements.require_pyvista()
+
+    if isinstance(file_or_buffer, BytesIO):
+        # If file_or_buffer is a BytesIO, write it to a temporary file
+        from tempfile import NamedTemporaryFile
+        with NamedTemporaryFile('wb', suffix='.vtk', delete=False) as temp_file:
+            # Write the BytesIO content to the temporary file
+            getvalue: bytes = file_or_buffer.getvalue()
+            temp_file.write(getvalue)
+            temp_file.flush()  # Make sure all data is written
+            temp_file_name = temp_file.name  # Store the temporary file name
+        try:
+            # Use pyvista.read() to read from the temporary file
+            pyvista_obj = pv.read(temp_file_name)
+        finally:
+            # Ensure the temporary file is deleted after reading
+            os.remove(temp_file_name)
+    else:
+        # If it's a file path, read directly
+        pyvista_obj = pv.read(file_or_buffer)
+
+    try:
+        struct: StructuredData = StructuredData.from_pyvista(
+            pyvista_object=pyvista_obj,
+            data_array_name=active_scalars
+        )
+    except Exception as e:
+        raise ValueError(f"Failed to convert to StructuredData: {e}")
+
+    return struct
+
+
+def read_volumetric_mesh_to_subsurface(reader_helper_coord: GenericReaderFilesHelper,
+                                       reader_helper_attr: GenericReaderFilesHelper) -> UnstructuredData:
+    df_coord = read_volumetric_mesh_coord_file(reader_helper_coord)
+    if len(df_coord.columns) == 1:
+        raise ValueError(
+            "The attributes file has only one column, probably the columns are not being separated correctly. Use 'sep' in Additional Reader Arguments"
+        )
+
+    df_attr = read_volumetric_mesh_attr_file(reader_helper_attr)
+    # Check if there are more than one column and if it is only one raise an error that probably the columns have not been properly separated. Use "sep" in Additional Reader Arguments
+    if len(df_attr.columns) == 1:
+        raise ValueError(
+            "The attributes file has only one column, probably the columns are not being separated correctly. Use 'sep' in Additional Reader Arguments"
+        )
+    
+    combined_df = df_coord.merge(df_attr, left_index=True, right_index=True)
+    ud = UnstructuredData.from_array(
+        vertex=combined_df[['x', 'y', 'z']], cells="points",
+        attributes=combined_df[['pres', 'temp', 'sg', 'xco2']]
+    )
+    return ud
+
+
+def read_volumetric_mesh_coord_file(reader_helper: GenericReaderFilesHelper) -> pd.DataFrame:
+    df = pd.read_csv(
+        filepath_or_buffer=reader_helper.file_or_buffer,
+        **reader_helper.pandas_reader_kwargs
+    )
+    if reader_helper.columns_map is not None:
+        df.rename(
+            mapper=reader_helper.columns_map,
+            axis="columns",
+            inplace=True
+        )
+
+    df.dropna(axis=0, inplace=True)
+
+    df.x = df.x.astype(float)
+    df.y = df.y.astype(float)
+    df.z = df.z.astype(float)
+    # Throw error if empty
+    if df.empty:
+        raise ValueError("The file is empty")
+    
+    return df
+
+
+def read_volumetric_mesh_attr_file(reader_helper: GenericReaderFilesHelper) -> pd.DataFrame:
+    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_structured_grid(pyvista_object: 'pv.DataSet') -> 'pv.StructuredGrid':
+    pv = optional_requirements.require_pyvista()
+
+    match pyvista_object:
+        case pv.UnstructuredGrid():
+            # In a previous version of Subsurface there was an ill-formed attempt at supporting some unstructured grids here.
+            # I've left this function to minimize downstream changes and also in case we decide to revive anything in that direction.
+            raise ValueError("Cannot generally convert unstructured grids to structured grids.")
+        case _:
+            return pyvista_object.cast_to_structured_grid()

{subsurface_terra-2025.1.0rc19 → subsurface_terra-2026.1.0}/subsurface/modules/reader/wells/_read_to_df.py

@@ -16,6 +16,7 @@ def check_format_and_read_to_df(reader_helper: GenericReaderFilesHelper) -> pd.D
             d = reader(
                 filepath_or_buffer=reader_helper.file_or_buffer,
                 sep=reader_helper.separator,
+                engine='python',
                 **reader_helper.pandas_reader_kwargs
             )
         case (bytes() | io.BytesIO() | io.StringIO() | io.TextIOWrapper()), _:

{subsurface_terra-2025.1.0rc19 → subsurface_terra-2026.1.0}/subsurface_terra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subsurface_terra
-Version: 2025.1.0rc19
+Version: 2026.1.0
 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.0rc19/subsurface/modules/reader/volume/read_volume.py

@@ -1,331 +0,0 @@
-import os
-from io import BytesIO
-from typing import Union
-
-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
-
-
-def read_VTK_structured_grid(file_or_buffer: Union[str, BytesIO], active_scalars: str) -> StructuredData:
-    pv = optional_requirements.require_pyvista()
-
-    if isinstance(file_or_buffer, BytesIO):
-        # If file_or_buffer is a BytesIO, write it to a temporary file
-        from tempfile import NamedTemporaryFile
-        with NamedTemporaryFile('wb', suffix='.vtk', delete=False) as temp_file:
-            # Write the BytesIO content to the temporary file
-            getvalue: bytes = file_or_buffer.getvalue()
-            temp_file.write(getvalue)
-            temp_file.flush()  # Make sure all data is written
-            temp_file_name = temp_file.name  # Store the temporary file name
-        try:
-            # Use pyvista.read() to read from the temporary file
-            pyvista_obj = pv.read(temp_file_name)
-        finally:
-            # Ensure the temporary file is deleted after reading
-            os.remove(temp_file_name)
-    else:
-        # If it's a file path, read directly
-        pyvista_obj = pv.read(file_or_buffer)
-    try:
-        pyvista_struct: pv.ExplicitStructuredGrid = pv_cast_to_explicit_structured_grid(pyvista_obj)
-    except Exception as e:
-        raise ValueError(f"The file is not a structured grid: {e}")
-
-    if PLOT := False:
-        pyvista_struct.set_active_scalars(active_scalars)
-        pyvista_struct.plot()
-
-    struct: StructuredData = StructuredData.from_pyvista_structured_grid(
-        grid=pyvista_struct,
-        data_array_name=active_scalars
-    )
-
-    return struct
-
-
-def read_volumetric_mesh_to_subsurface(reader_helper_coord: GenericReaderFilesHelper,
-                                       reader_helper_attr: GenericReaderFilesHelper) -> UnstructuredData:
-    df_coord = read_volumetric_mesh_coord_file(reader_helper_coord)
-    if len(df_coord.columns) == 1:
-        raise ValueError(
-            "The attributes file has only one column, probably the columns are not being separated correctly. Use 'sep' in Additional Reader Arguments"
-        )
-
-    df_attr = read_volumetric_mesh_attr_file(reader_helper_attr)
-    # Check if there are more than one column and if it is only one raise an error that probably the columns have not been properly separated. Use "sep" in Additional Reader Arguments
-    if len(df_attr.columns) == 1:
-        raise ValueError(
-            "The attributes file has only one column, probably the columns are not being separated correctly. Use 'sep' in Additional Reader Arguments"
-        )
-    
-    combined_df = df_coord.merge(df_attr, left_index=True, right_index=True)
-    ud = UnstructuredData.from_array(
-        vertex=combined_df[['x', 'y', 'z']], cells="points",
-        attributes=combined_df[['pres', 'temp', 'sg', 'xco2']]
-    )
-    return ud
-
-
-def read_volumetric_mesh_coord_file(reader_helper: GenericReaderFilesHelper) -> pd.DataFrame:
-    df = pd.read_csv(
-        filepath_or_buffer=reader_helper.file_or_buffer,
-        **reader_helper.pandas_reader_kwargs
-    )
-    if reader_helper.columns_map is not None:
-        df.rename(
-            mapper=reader_helper.columns_map,
-            axis="columns",
-            inplace=True
-        )
-
-    df.dropna(axis=0, inplace=True)
-
-    df.x = df.x.astype(float)
-    df.y = df.y.astype(float)
-    df.z = df.z.astype(float)
-    # Throw error if empty
-    if df.empty:
-        raise ValueError("The file is empty")
-    
-    return df
-
-
-def read_volumetric_mesh_attr_file(reader_helper: GenericReaderFilesHelper) -> pd.DataFrame:
-    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.DataSet') -> 'pv.ExplicitStructuredGrid':
-    pv = optional_requirements.require_pyvista()
-
-    match pyvista_object:
-        case pv.RectilinearGrid() as rectl_grid:
-            return __pv_convert_rectilinear_to_explicit(rectl_grid)
-        case pv.UnstructuredGrid() as unstr_grid:
-            return __pv_convert_unstructured_to_explicit(unstr_grid)
-        case _:
-            return pyvista_object.cast_to_explicit_structured_grid()
-
-
-def __pv_convert_unstructured_to_explicit(unstr_grid):
-    """
-    Convert a PyVista UnstructuredGrid to an ExplicitStructuredGrid if possible.
-    """
-    pv = optional_requirements.require_pyvista()
-
-    # First check if the grid has the necessary attributes to be treated as structured
-    if not hasattr(unstr_grid, 'n_cells') or unstr_grid.n_cells == 0:
-        raise ValueError("The unstructured grid has no cells.")
-    
-    # Try to detect if the grid has a structured topology
-    # Check if the grid has cell type 11 (VTK_VOXEL) or 12 (VTK_HEXAHEDRON)
-    cell_types = unstr_grid.celltypes
-    
-    # Voxels (11) and hexahedra (12) are the cell types used in structured grids
-    if not all(ct in [11, 12] for ct in cell_types):
-        raise ValueError("The unstructured grid contains non-hexahedral cells and cannot be converted to explicit structured.")
-    
-    # Try to infer dimensions from the grid
-    try:
-        # Method 1: Try PyVista's built-in conversion if available
-        return unstr_grid.cast_to_explicit_structured_grid()
-    except (AttributeError, TypeError):
-        pass
-    
-    try:
-        # Method 2: If the grid has dimensions stored as field data
-        if "dimensions" in unstr_grid.field_data:
-            dims = unstr_grid.field_data["dimensions"]
-            if len(dims) == 3:
-                nx, ny, nz = dims
-                # Verify that dimensions match the number of cells
-                if (nx-1)*(ny-1)*(nz-1) != unstr_grid.n_cells:
-                    raise ValueError("Stored dimensions do not match the number of cells.")
-                
-                # Extract points and reorder if needed
-                points = unstr_grid.points.reshape((nx, ny, nz, 3))
-                
-                # Create explicit structured grid
-                explicit_grid = pv.ExplicitStructuredGrid((nx, ny, nz), points.reshape((-1, 3)))
-                explicit_grid.compute_connectivity()
-                
-                # Transfer data arrays
-                for name, array in unstr_grid.cell_data.items():
-                    explicit_grid.cell_data[name] = array.copy()
-                for name, array in unstr_grid.point_data.items():
-                    explicit_grid.point_data[name] = array.copy()
-                for name, array in unstr_grid.field_data.items():
-                    if name != "dimensions":  # Skip dimensions field
-                        explicit_grid.field_data[name] = array.copy()
-                
-                return explicit_grid
-    except (ValueError, KeyError):
-        pass
-    
-    # If none of the above methods work, use PyVista's extract_cells function
-    # to reconstruct the structured grid if possible
-    try:
-        # This is a best-effort approach that tries multiple strategies
-        return pv.core.filters.convert_unstructured_to_structured_grid(unstr_grid)
-    except Exception as e:
-        raise ValueError(f"Failed to convert unstructured grid to explicit structured grid: {e}")
-
-
-def __pv_convert_rectilinear_to_explicit(rectl_grid, *, temp_dtype=None):
-    """
-    Convert a PyVista RectilinearGrid to an ExplicitStructuredGrid with low peak memory.
-
-    Behavior:
-      - Output points are in world coordinates, dtype matches rectl_grid.points.dtype.
-      - Data arrays are shallow-transferred (no deep copies).
-      - temp_dtype controls the large temporary `corners` buffer dtype.
-        * If temp_dtype is None (default), use float32 when the output dtype is wider (e.g., float64),
-          else use the output dtype. This reduces peak memory automatically.
-        * If temp_dtype < output dtype, coordinates are recentred for precision and origin is added back after.
-
-    Parameters
-    ----------
-    rectl_grid : pv.RectilinearGrid
-    temp_dtype : numpy dtype or None
-        Dtype for building the temporary `corners` array. Examples:
-          - None (default): auto -> float32 if output dtype is wider, else output dtype.
-          - np.float32: memory-friendly; auto recenters & restores origin.
-          - np.float64: highest precision (more memory).
-
-    Returns
-    -------
-    pv.ExplicitStructuredGrid
-    """
-    import numpy as np
-    pv = optional_requirements.require_pyvista()
-
-    # Output dtype follows source grid points (usually float64)
-    out_dtype = getattr(rectl_grid.points, "dtype", np.float64)
-
-    # Auto-pick temp dtype: prefer float32 when output is wider (e.g., float64)
-    if temp_dtype is None:
-        temp_dtype = np.float32 if (
-                    np.dtype(out_dtype).kind == 'f' and np.dtype(out_dtype).itemsize > 4) else out_dtype
-
-    # Coordinate arrays
-    x = np.asarray(rectl_grid.x)
-    y = np.asarray(rectl_grid.y)
-    z = np.asarray(rectl_grid.z)
-
-    # Decide if we must recenter (when temp dtype is lower precision than output dtype)
-    def _is_lower_precision(src, dst):
-        s, d = np.dtype(src), np.dtype(dst)
-        if s.kind != 'f' or d.kind != 'f':
-            return s != d
-        return s.itemsize < d.itemsize
-
-    if _is_lower_precision(temp_dtype, out_dtype):
-        origin = np.array([x[0], y[0], z[0]], dtype=np.float64)
-        x_base, y_base, z_base = x - origin[0], y - origin[1], z - origin[2]
-    else:
-        origin = None
-        x_base, y_base, z_base = x, y, z
-
-    # Double coordinates (interior duplication expected by ExplicitStructuredGrid ctor)
-    def _doubled(arr):
-        # [a,b,c,d] -> [a, b,b, c,c, d]
-        return np.repeat(arr, 2)[1:-1]
-
-    xcorn = _doubled(x_base)
-    ycorn = _doubled(y_base)
-    zcorn = _doubled(z_base)
-
-    nx2, ny2, nz2 = len(xcorn), len(ycorn), len(zcorn)
-    slab = ny2 * nz2
-    N = nx2 * slab
-
-    # Build corners via slab/chunked fill (avoids N-sized intermediates)
-    yz = np.empty((slab, 2), dtype=temp_dtype)
-    yz[:, 0] = np.repeat(ycorn, nz2).astype(temp_dtype, copy=False)  # Y pattern
-    yz[:, 1] = np.tile(zcorn, ny2).astype(temp_dtype, copy=False)  # Z pattern
-
-    corners = np.empty((N, 3), dtype=temp_dtype)
-    for i, xv in enumerate(xcorn):
-        start = i * slab
-        end = start + slab
-        corners[start:end, 0] = xv
-        corners[start:end, 1:3] = yz
-
-    # Construct explicit grid
-    dims = (len(x), len(y), len(z))
-    explicit = pv.ExplicitStructuredGrid(dims, corners)
-    explicit.compute_connectivity()
-
-    # Always return world coordinates; add origin back and cast to out_dtype in one fused pass
-    if origin is not None:
-        new_pts = np.empty_like(explicit.points, dtype=out_dtype)
-        np.add(explicit.points, origin, out=new_pts, dtype=out_dtype)
-        explicit.points = new_pts
-    else:
-        if explicit.points.dtype != out_dtype:
-            explicit.points = explicit.points.astype(out_dtype, copy=False)
-
-    # Shallow-transfer all data arrays (no deep copies)
-    for name, arr in rectl_grid.cell_data.items():
-        explicit.cell_data[name] = arr
-    for name, arr in rectl_grid.point_data.items():
-        explicit.point_data[name] = arr
-    for name, arr in rectl_grid.field_data.items():
-        explicit.field_data[name] = arr
-
-    __validate_rectilinear_to_explicit_conversion(rectl_grid, explicit)
-
-    return explicit
-
-
-def __validate_rectilinear_to_explicit_conversion(rectl_grid, explicit_grid, *, atol=1e-6, rtol=1e-8) -> None:
-    """
-    Validate core equivalence between a RectilinearGrid and its ExplicitStructuredGrid.
-    Raises ValueError on mismatch. Avoids large 3D uniques / big temporaries.
-    """
-    import numpy as np
-
-    # dims & counts
-    nx, ny, nz = map(int, rectl_grid.dimensions)
-    if tuple(map(int, explicit_grid.dimensions)) != (nx, ny, nz):
-        raise ValueError(f"Dimensions differ: explicit {tuple(explicit_grid.dimensions)} vs rect {tuple(rectl_grid.dimensions)}")
-
-    expected_cells = (nx - 1) * (ny - 1) * (nz - 1)
-    if explicit_grid.n_cells != expected_cells:
-        raise ValueError(f"Cell count mismatch: explicit {explicit_grid.n_cells} vs expected {expected_cells}")
-
-    # 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, 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])
-
-    x_rect = np.asarray(rectl_grid.x)
-    y_rect = np.asarray(rectl_grid.y)
-    z_rect = np.asarray(rectl_grid.z)
-
-    if len(x_exp) != len(x_rect) or not np.allclose(x_exp, x_rect, rtol=rtol, atol=atol):
-        raise ValueError("X axis coordinates differ.")
-    if len(y_exp) != len(y_rect) or not np.allclose(y_exp, y_rect, rtol=rtol, atol=atol):
-        raise ValueError("Y axis coordinates differ.")
-    if len(z_exp) != len(z_rect) or not np.allclose(z_exp, z_rect, rtol=rtol, atol=atol):
-        raise ValueError("Z axis coordinates differ.")