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

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

@@ -150,6 +150,7 @@ python -m pytest --teamcity -v]]></param>
           <param name="github_host" value="https://api.github.com" />
           <param name="publisherId" value="githubStatusPublisher" />
           <param name="secure:github_access_token" value="credentialsJSON:4df4bdb0-1278-4834-a702-18ae3a286003" />
+          <param name="vcsRootId" value="Subsurface_HttpsGithubComTerranigmaSolutionsSubsurfaceRefsHeadsMain2" />
         </parameters>
       </extension>
       <extension id="BUILD_EXT_6" type="pullRequests">

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

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

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

subsurface_terra-2025.1.0rc17/subsurface/core/structs/base_structures/_aux.py

@@ -0,0 +1,69 @@
+import pandas as pd
+
+
+def safe_convert_to_float32(df: pd.DataFrame, error_handling: str = 'raise') -> pd.DataFrame:
+    """
+    Convert DataFrame columns to float32, handling non-convertible columns.
+
+    Args:
+        df: DataFrame to convert
+        error_handling: How to handle non-convertible columns:
+            - 'raise': Raise an error
+            - 'skip': Skip non-convertible columns
+            - 'drop': Drop non-convertible columns
+
+    Returns:
+        DataFrame with converted columns
+    """
+    convertible, non_convertible = _check_convertible_to_float32(df)
+
+    if non_convertible:
+        if error_handling == 'raise':
+            raise ValueError(
+                f"Cannot convert columns to float32: {non_convertible}. "
+                f"These columns contain non-numeric data."
+            )
+        elif error_handling == 'skip':
+            # Only convert the convertible columns
+            result = df.copy()
+            for col in convertible:
+                result[col] = df[col].astype('float32')
+            return result
+        elif error_handling == 'drop':
+            # Drop non-convertible columns
+            return df[convertible].astype('float32')
+        else:
+            raise ValueError(f"Invalid error_handling: {error_handling}")
+
+    return df.astype('float32')
+
+
+def _check_convertible_to_float32(df: pd.DataFrame) -> tuple[list[str], list[str]]:
+    """
+    Check which columns in a DataFrame can be safely converted to float32.
+
+    Returns:
+        tuple: (convertible_columns, non_convertible_columns)
+    """
+    convertible = []
+    non_convertible = []
+
+    for col in df.columns:
+        if pd.api.types.is_numeric_dtype(df[col]):
+            # Already numeric, can convert
+            convertible.append(col)
+        elif pd.api.types.is_bool_dtype(df[col]):
+            # Boolean can be converted (True->1.0, False->0.0)
+            convertible.append(col)
+        elif pd.api.types.is_string_dtype(df[col]) or pd.api.types.is_object_dtype(df[col]):
+            # Try to convert to numeric
+            try:
+                pd.to_numeric(df[col], errors='raise')
+                convertible.append(col)
+            except (ValueError, TypeError):
+                non_convertible.append(col)
+        else:
+            # Other types (datetime, timedelta, categorical, etc.)
+            non_convertible.append(col)
+
+    return convertible, non_convertible

{subsurface_terra-2025.1.0rc16 → subsurface_terra-2025.1.0rc17}/subsurface/core/structs/base_structures/unstructured_data.py

@@ -299,6 +299,25 @@ class UnstructuredData:
         bytearray_le = vertex + cells + cell_attribute + vertex_attribute
         return bytearray_le
 
+    def _to_bytearray(self, order):
+        from subsurface.core.structs.base_structures._aux import safe_convert_to_float32
+        vertex = self.vertex.astype('float32').tobytes(order)
+        cells = self.cells.astype('int32').tobytes(order)
+
+        # Only include numeric columns
+        cell_attribute = safe_convert_to_float32(
+            self.attributes,
+            error_handling='drop'
+        ).values.tobytes(order)
+
+        vertex_attribute = safe_convert_to_float32(
+            self.points_attributes,
+            error_handling='drop'
+        ).values.tobytes(order)
+
+        bytearray_le = vertex + cells + cell_attribute + vertex_attribute
+        return bytearray_le
+
     def _validate(self):
         try:
             _ = self.data[self.cells_attr_name]['cell']

{subsurface_terra-2025.1.0rc16 → subsurface_terra-2025.1.0rc17}/subsurface/modules/reader/volume/read_grav3d.py

@@ -106,10 +106,9 @@ class GridData:
         )
 
 
-from typing import Literal
 
 def read_msh_structured_grid(grid_stream: TextIO, values_stream: TextIO, missing_value: Optional[float],
-                             attr_name: Optional[str], ordering: Literal['ijk', 'xyz', 'xyz_reverse'] = 'ijk') -> StructuredData:
+                             attr_name: Optional[str]) -> StructuredData:
     """
     Read a structured grid mesh and values from streams and return a StructuredData object.
 
@@ -121,12 +120,7 @@ def read_msh_structured_grid(grid_stream: TextIO, values_stream: TextIO, missing
         values_stream: TextIO stream containing the property values (.mod format)
         missing_value: Value to replace with NaN in the output array
         attr_name: Name for the data attribute
-        ordering: Data ordering in the file:
-                  - 'ijk': i (x) varies fastest, then j (y), then k (z)
-                  - 'xyz': z varies fastest, then x, then y
-                  - 'xyz_reverse': z varies fastest (reversed), then x, then y
-                  Default is 'ijk'.
-
+        
     Returns:
         StructuredData object containing the grid and property values
 
@@ -154,7 +148,7 @@ def read_msh_structured_grid(grid_stream: TextIO, values_stream: TextIO, missing
         # Read all values from the stream
         lines = [line.strip() for line in values_stream if line.strip()]
 
-        model_array = _parse_mod_file(grid, lines, missing_value=missing_value, ordering=ordering)
+        model_array = _parse_mod_file(grid, lines, missing_value=missing_value)
 
     except Exception as e:
         # Add context to any errors
@@ -206,7 +200,7 @@ def read_msh_file(filepath: Union[str, Path]) -> GridData:
 
 def read_mod_file(filepath: Union[str, Path], grid: GridData,
                   missing_value: float = -99_999.0,
-                  ordering: Literal['ijk', 'xyz', 'xyz_reverse'] = 'ijk') -> np.ndarray:
+                  ) -> np.ndarray:
     """
     Read a model file containing property values for a 3D grid.
 
@@ -217,11 +211,6 @@ def read_mod_file(filepath: Union[str, Path], grid: GridData,
         filepath: Path to the model file
         grid: GridData object containing the grid dimensions
         missing_value: Value to replace with NaN in the output array (default: -99_999.0)
-        ordering: Data ordering in the file. Options:
-                  - 'ijk': i (x) varies fastest, then j (y), then k (z) - standard VTK/Fortran ordering
-                  - 'xyz': z varies fastest, then x, then y - legacy Grav3D ordering
-                  - 'xyz_reverse': z varies fastest (reversed direction), then x, then y
-                  Default is 'ijk'.
 
     Returns:
         3D numpy array of property values with shape (ny, nx, nz)
@@ -239,7 +228,7 @@ def read_mod_file(filepath: Union[str, Path], grid: GridData,
         with open(filepath, 'r') as f:
             lines = [line.strip() for line in f if line.strip()]
 
-        model_array = _parse_mod_file(grid, lines, missing_value, ordering)
+        model_array = _parse_mod_file(grid, lines, missing_value)
 
         return model_array
 
@@ -265,7 +254,7 @@ def structured_data_from(array: np.ndarray, grid: GridData,
         ValueError: If array shape doesn't match grid dimensions
     """
     # Verify array shape matches grid dimensions
-    expected_shape = (grid.dimensions.ny, grid.dimensions.nx, grid.dimensions.nz)
+    expected_shape = (grid.dimensions.nx, grid.dimensions.ny, grid.dimensions.nz)
     if array.shape != expected_shape:
         raise ValueError(
             f"Array shape {array.shape} doesn't match grid dimensions {expected_shape}"
@@ -277,7 +266,7 @@ def structured_data_from(array: np.ndarray, grid: GridData,
     # Create the xarray DataArray with proper coordinates
     xr_data_array = xr.DataArray(
         data=array,
-        dims=['y', 'x', 'z'],  # Dimensions in the order they appear in the array
+        dims=['x', 'y', 'z'],  # Dimensions in the order they appear in the array
         coords={
                 'x': centers['x'],
                 'y': centers['y'],
@@ -424,8 +413,7 @@ def _calculate_cell_centers(grid: GridData) -> Dict[str, np.ndarray]:
     }
 
 
-def _parse_mod_file(grid: GridData, lines: List[str], missing_value: Optional[float],
-                   ordering: Literal['ijk', 'xyz', 'xyz_reverse'] = 'ijk') -> np.ndarray:
+def _parse_mod_file(grid: GridData, lines: List[str], missing_value: Optional[float]) -> np.ndarray:
     """
     Parse model file values into a 3D numpy array.
 
@@ -433,13 +421,9 @@ def _parse_mod_file(grid: GridData, lines: List[str], missing_value: Optional[fl
         grid: GridData object containing grid dimensions
         lines: List of lines containing the values
         missing_value: Value to replace with NaN
-        ordering: Data ordering in the file:
-                  - 'ijk': i (x) varies fastest, then j (y), then k (z)
-                  - 'xyz': z varies fastest, then x, then y
-                  - 'xyz_reverse': z varies fastest (reversed), then x, then y
 
     Returns:
-        3D numpy array with shape (ny, nx, nz)
+        3D numpy array with shape (nx, ny, nz)
     """
     # Convert each line to a float
     values = np.array([float(line) for line in lines], dtype=float)
@@ -453,23 +437,8 @@ def _parse_mod_file(grid: GridData, lines: List[str], missing_value: Optional[fl
             f"Invalid model file: expected {expected_count} values, got {len(values)}"
         )
     
-    # Reshape based on ordering
-    if ordering == 'ijk':
-        # i (x) varies fastest, then j (y), then k (z)
-        # This is standard VTK/Fortran ordering: (k, j, i) in array dimensions
-        model_array = values.reshape((nz, ny, nx), order='C')
-        # Transpose to (ny, nx, nz) to match expected output shape
-        model_array = np.transpose(model_array, (1, 2, 0))
-    elif ordering == 'xyz':
-        # z varies fastest, then x, then y (legacy Grav3D ordering)
-        model_array = values.reshape((ny, nx, nz))
-    elif ordering == 'xyz_reverse':
-        # z varies fastest (but in reverse direction), then x, then y
-        model_array = values.reshape((ny, nx, nz))
-        # Reverse the z-axis (last dimension)
-        model_array = np.flip(model_array, axis=2)
-    else:
-        raise ValueError(f"Invalid ordering: {ordering}. Must be 'ijk', 'xyz', or 'xyz_reverse'")
+    model_array = values.reshape((nz, nx, ny), order='F')
+    model_array = np.transpose(model_array, (1, 2, 0))[:, :, ::-1]
     
     # Replace missing values with NaN
     if missing_value is not None:

{subsurface_terra-2025.1.0rc16 → subsurface_terra-2025.1.0rc17}/subsurface_terra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subsurface_terra
-Version: 2025.1.0rc16
+Version: 2025.1.0rc17
 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.0rc16 → subsurface_terra-2025.1.0rc17}/subsurface_terra.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ subsurface/core/reader_helpers/readers_wells.py
 subsurface/core/structs/README.rst
 subsurface/core/structs/__init__.py
 subsurface/core/structs/base_structures/__init__.py
+subsurface/core/structs/base_structures/_aux.py
 subsurface/core/structs/base_structures/_liquid_earth_mesh.py
 subsurface/core/structs/base_structures/_unstructured_data_constructor.py
 subsurface/core/structs/base_structures/base_structures_enum.py