subsurface-terra 2025.1.0rc10__tar.gz → 2025.1.0rc12__tar.gz

subsurface_terra-2025.1.0rc12/.teamcity/Subsurface/buildTypes/Subsurface_ReleaseSubsurface.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="671f325d-03f3-4855-994a-eb6080da9084" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>Release Subsurface</name>
+  <settings>
+    <parameters>
+      <param name="env.PACKAGE_VERSION" value="" spec="text description='The version that I want to release' label='Package version' validationMode='any' display='prompt'" />
+      <param name="env.TWINE_PASSWORD" value="credentialsJSON:e9a0b402-f8b3-4f86-978c-9c88c456dc9c" spec="password display='normal'" />
+    </parameters>
+    <build-runners>
+      <runner id="Git_Tagging" name="Git Tagging" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[git tag v%env.PACKAGE_VERSION%
+git push origin v%env.PACKAGE_VERSION%]]></param>
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="Build" name="Build" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[python -m pip install --upgrade build
+python -m build]]></param>
+          <param name="teamcity.kubernetes.executor.pull.policy" value="IfNotPresent" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="Push_to_PyPi" name="Push to PyPi" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[python -m pip install --upgrade twine
+python -m twine upload dist/* -u __token__ -p %env.TWINE_PASSWORD%]]></param>
+          <param name="teamcity.kubernetes.executor.pull.policy" value="IfNotPresent" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="Push_To_GitHub" name="Push To GitHub" type="simpleRunner">
+        <parameters>
+          <param name="script.content" value="gh release create %env.PACKAGE_VERSION% dist/* --title &quot;%env.PACKAGE_VERSION%&quot; --notes &quot;Release notes here&quot;" />
+          <param name="teamcity.kubernetes.executor.pull.policy" value="IfNotPresent" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+    </build-runners>
+    <vcs-settings>
+      <vcs-entry-ref root-id="Subsurface_HttpsGithubComTerranigmaSolutionsSubsurfaceRefsHeadsMain" />
+    </vcs-settings>
+    <requirements />
+    <build-triggers />
+    <build-extensions>
+      <extension id="BUILD_EXT_1" type="perfmon">
+        <parameters>
+          <param name="teamcity.perfmon.feature.enabled" value="true" />
+        </parameters>
+      </extension>
+    </build-extensions>
+    <cleanup />
+  </settings>
+</template>
+

subsurface_terra-2025.1.0rc12/.teamcity/Subsurface/buildTypes/Subsurface_ReleaseSubsurface_2.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="c15fb876-7044-47cd-a3b0-676767e4ca63" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>Release Subsurface</name>
+  <description />
+  <settings ref="ReleasePythonPackage">
+    <parameters />
+    <build-runners order="Git_Tagging, Build, Push_to_PyPi, Push_To_GitHub">
+      <runner id="Build" name="Build" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[echo Cleaning build artifacts...
+rmdir /s /q dist
+rmdir /s /q build
+echo Clean complete.
+
+python -m pip install --upgrade build
+python -m build]]></param>
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="Push_To_GitHub" name="Push To GitHub" type="simpleRunner">
+        <parameters>
+          <param name="script.content" value="gh release create %env.PACKAGE_VERSION% dist/*  --notes &quot;Release notes here&quot; --repo terranigma-solutions/subsurface" />
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+    </build-runners>
+    <vcs-settings>
+      <vcs-entry-ref root-id="Subsurface_HttpsGithubComTerranigmaSolutionsSubsurfaceRefsHeadsMain1" />
+    </vcs-settings>
+    <requirements />
+    <build-triggers />
+    <cleanup />
+  </settings>
+</build-type>
+

subsurface_terra-2025.1.0rc12/.teamcity/Subsurface/buildTypes/Subsurface_Testing.xml

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="ed495f4f-4df2-4a37-bbfe-2489430a46e8" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2025.3/project-config.xsd">
+  <name>Testing</name>
+  <description />
+  <settings>
+    <options>
+      <option name="shouldFailBuildOnBadExitCode" value="false" />
+    </options>
+    <parameters>
+      <param name="REQUIREMENT_LEVEL" value="READ_MESH" />
+      <param name="env.MPLBACKEND" value="Agg" />
+      <param name="env.PATH_TO_ASCII_DRILLHOLES" value="%env.TERRA_PATH_DEVOPS%/boreholes/ASCII_drillholes/" />
+      <param name="env.PATH_TO_BGR" value="%env.TERRA_PATH_DEVOPS%/boreholes/" />
+      <param name="env.PATH_TO_BOLIDEN" value="%env.TERRA_PATH_DEVOPS%/combined/Leapfrog_OMF/Garpenberg_global_20220715.omf" />
+      <param name="env.PATH_TO_GLB" value="%env.TERRA_PATH_DEVOPS%/meshes/GLB - GLTF/Duck.glb" />
+      <param name="env.PATH_TO_GLB_COMPLEX" value="%env.TERRA_PATH_DEVOPS%/meshes/GLB - GLTF/GlbFile.glb" />
+      <param name="env.PATH_TO_GRAV3D_MOD" value="%env.TERRA_PATH_DEVOPS%/volume/MSH/19_simpeg_inv_result_25ft_7.62m_psi2_Sep.mod" />
+      <param name="env.PATH_TO_GRAV3D_MSH" value="%env.TERRA_PATH_DEVOPS%/volume/MSH/client_voxel.msh" />
+      <param name="env.PATH_TO_GRAV3D_MSH_II" value="%env.TERRA_PATH_DEVOPS%/volume/MSH/IDN-65/ubc_mesh_mod" />
+      <param name="env.PATH_TO_INTERPRETATION" value="%env.TERRA_PATH_DEVOPS%/meshes/Seismic/Anl2-1.tif" />
+      <param name="env.PATH_TO_MAGNETIC_INTERPRETATION" value="%env.TERRA_PATH_DEVOPS%/meshes/Magnetic/Plate 2a - Profile 1 2D inversion.pdf" />
+      <param name="env.PATH_TO_MTL" value="%env.TERRA_PATH_DEVOPS%/meshes/OBJ/Broadhaven_Obj/model/model.mtl" />
+      <param name="env.PATH_TO_OBJ" value="%env.TERRA_PATH_DEVOPS%/meshes/OBJ/Broadhaven_Obj/model/model.obj" />
+      <param name="env.PATH_TO_OBJ_FACE_I" value="%env.TERRA_PATH_DEVOPS%/meshes/OBJ/Faces/face1.obj" />
+      <param name="env.PATH_TO_OBJ_FACE_II" value="%env.TERRA_PATH_DEVOPS%/meshes/OBJ/Faces/Lapp_458_Rum_19_2_2024-02-21_0820_scan5_geoim4.obj" />
+      <param name="env.PATH_TO_OBJ_GALLERIES_I" value="%env.TERRA_PATH_DEVOPS%/meshes/OBJ/Galleries/Solid1.obj" />
+      <param name="env.PATH_TO_OBJ_MULTIMATERIAL_II" value="%env.TERRA_PATH_DEVOPS%/meshes/OBJ/MultiMaterialObj/MultiMaterialObj.obj" />
+      <param name="env.PATH_TO_OBJ_SCANS" value="%env.TERRA_PATH_DEVOPS%/meshes/OBJ/Core scans Boliden/rsrbF9l2zc/model.obj" />
+      <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_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_WEISWEILER" value="%env.TERRA_PATH_DEVOPS%/meshes/Weisweiler/" />
+      <param name="env.TERRA_PATH_DEVOPS" value="D:\OneDrive - Terranigma Solutions GmbH/Documents - Terranigma Base/DevOps/SubsurfaceTestData/" />
+    </parameters>
+    <build-runners>
+      <runner id="Setup" name="Setup" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[@echo on
+python -m venv venv
+call venv\Scripts\activate
+venv\Scripts\python -m pip install --upgrade pip
+
+echo Checking directory...
+dir
+dir .requirements
+
+venv\Scripts\pip install --verbose -r requirements/requirements_dev.txt
+venv\Scripts\pip install --verbose teamcity-messages]]></param>
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="Run_Test" name="Run Test: Core" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[venv\Scripts\pip install --verbose -r requirements/requirements_plot.txt
+
+@echo on
+set REQUIREMENT_LEVEL=READ_MESH
+echo REQUIREMENT_LEVEL is %REQUIREMENT_LEVEL%
+venv\Scripts\python -m pytest --teamcity -v -m core]]></param>
+          <param name="teamcity.step.mode" value="default" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+      <runner id="Run_Test_2" name="Run Test: Mesh" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[venv\Scripts\pip install --verbose -r requirements/requirements_mesh.txt
+
+@echo on
+set REQUIREMENT_LEVEL=READ_MESH
+echo REQUIREMENT_LEVEL is %REQUIREMENT_LEVEL%
+venv\Scripts\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_wells" name="Run Test: Wells" type="simpleRunner">
+        <parameters>
+          <param name="script.content"><![CDATA[venv\Scripts\pip install --verbose -r requirements/requirements_wells.txt
+
+@echo on
+set REQUIREMENT_LEVEL=READ_WELL
+echo REQUIREMENT_LEVEL is %REQUIREMENT_LEVEL%
+venv\Scripts\python -m pytest --teamcity -v]]></param>
+          <param name="teamcity.step.mode" value="execute_if_failed" />
+          <param name="use.custom.script" value="true" />
+        </parameters>
+      </runner>
+    </build-runners>
+    <vcs-settings>
+      <vcs-entry-ref root-id="Subsurface_HttpsGithubComTerranigmaSolutionsSubsurfaceRefsHeadsMain2" />
+    </vcs-settings>
+    <build-triggers>
+      <build-trigger id="TRIGGER_4" type="vcsTrigger">
+        <parameters>
+          <param name="branchFilter"><![CDATA[+pr:draft=false
++:refs/heads/main]]></param>
+          <param name="enableQueueOptimization" value="true" />
+          <param name="quietPeriodMode" value="DO_NOT_USE" />
+        </parameters>
+      </build-trigger>
+    </build-triggers>
+    <build-extensions>
+      <extension id="perfmon" type="perfmon">
+        <parameters>
+          <param name="teamcity.perfmon.feature.enabled" value="true" />
+        </parameters>
+      </extension>
+      <extension id="BUILD_EXT_5" type="commit-status-publisher">
+        <parameters>
+          <param name="github_authentication_type" value="token" />
+          <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" />
+        </parameters>
+      </extension>
+      <extension id="BUILD_EXT_6" type="pullRequests">
+        <parameters>
+          <param name="authenticationType" value="token" />
+          <param name="filterAuthorRole" value="MEMBER" />
+          <param name="providerType" value="github" />
+          <param name="secure:accessToken" value="credentialsJSON:4df4bdb0-1278-4834-a702-18ae3a286003" />
+        </parameters>
+      </extension>
+    </build-extensions>
+  </settings>
+</build-type>
+

subsurface_terra-2025.1.0rc12/.teamcity/Subsurface/project-config.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="02a92682-f6c2-4edf-af46-08d095b0ce77" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>Subsurface</name>
+  <parameters />
+  <project-extensions>
+    <extension id="PROJECT_EXT_15" type="versionedSettings">
+      <parameters>
+        <param name="buildSettings" value="ALWAYS_USE_CURRENT" />
+        <param name="credentialsStorageType" value="credentialsJSON" />
+        <param name="enabled" value="true" />
+        <param name="ignoreChangesInDependenciesAndVcsSettings" value="false" />
+        <param name="rootId" value="Subsurface_HttpsGithubComTerranigmaSolutionsSubsurfaceRefsHeadsMain" />
+        <param name="showChanges" value="false" />
+      </parameters>
+    </extension>
+  </project-extensions>
+  <cleanup />
+</project>
+

subsurface_terra-2025.1.0rc12/.teamcity/Subsurface/vcsRoots/Subsurface_HttpsGithubComTerranigmaSolutionsSubsurfaceRefsHeadsMain.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vcs-root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="b5c00aa4-356b-4c94-8113-009cde53f17b" type="jetbrains.git" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>https://github.com/terranigma-solutions/subsurface#refs/heads/main</name>
+  <param name="agentCleanFilesPolicy" value="ALL_UNTRACKED" />
+  <param name="agentCleanPolicy" value="ON_BRANCH_CHANGE" />
+  <param name="authMethod" value="PASSWORD" />
+  <param name="branch" value="refs/heads/main" />
+  <param name="ignoreKnownHosts" value="true" />
+  <param name="secure:password" value="credentialsJSON:4df4bdb0-1278-4834-a702-18ae3a286003" />
+  <param name="submoduleCheckout" value="CHECKOUT" />
+  <param name="teamcity:branchSpec" value="refs/heads/*" />
+  <param name="url" value="https://github.com/terranigma-solutions/subsurface" />
+  <param name="useAlternates" value="AUTO" />
+  <param name="username" value="Leguark" />
+  <param name="usernameStyle" value="USERID" />
+</vcs-root>
+

subsurface_terra-2025.1.0rc12/.teamcity/Subsurface/vcsRoots/Subsurface_HttpsGithubComTerranigmaSolutionsSubsurfaceRefsHeadsMain1.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vcs-root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="e9cb014a-3f5f-4e33-8d40-9c5cb180a9d6" type="jetbrains.git" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>https://github.com/terranigma-solutions/subsurface#refs/heads/main (1)</name>
+  <param name="agentCleanFilesPolicy" value="ALL_UNTRACKED" />
+  <param name="agentCleanPolicy" value="ON_BRANCH_CHANGE" />
+  <param name="authMethod" value="PASSWORD" />
+  <param name="branch" value="refs/heads/main" />
+  <param name="ignoreKnownHosts" value="true" />
+  <param name="secure:password" value="credentialsJSON:4df4bdb0-1278-4834-a702-18ae3a286003" />
+  <param name="submoduleCheckout" value="CHECKOUT" />
+  <param name="url" value="https://github.com/terranigma-solutions/subsurface" />
+  <param name="useAlternates" value="AUTO" />
+  <param name="username" value="Leguark" />
+  <param name="usernameStyle" value="USERID" />
+</vcs-root>
+

subsurface_terra-2025.1.0rc12/.teamcity/Subsurface/vcsRoots/Subsurface_HttpsGithubComTerranigmaSolutionsSubsurfaceRefsHeadsMain2.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vcs-root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="a5d752d7-0d2a-4197-b779-2049040d97ba" type="jetbrains.git" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
+  <name>https://github.com/terranigma-solutions/subsurface#refs/heads/main (2)</name>
+  <param name="agentCleanFilesPolicy" value="ALL_UNTRACKED" />
+  <param name="agentCleanPolicy" value="ON_BRANCH_CHANGE" />
+  <param name="authMethod" value="PASSWORD" />
+  <param name="branch" value="refs/heads/main" />
+  <param name="ignoreKnownHosts" value="true" />
+  <param name="secure:password" value="credentialsJSON:4df4bdb0-1278-4834-a702-18ae3a286003" />
+  <param name="submoduleCheckout" value="CHECKOUT" />
+  <param name="url" value="https://github.com/terranigma-solutions/subsurface" />
+  <param name="useAlternates" value="AUTO" />
+  <param name="username" value="Leguark" />
+  <param name="usernameStyle" value="USERID" />
+</vcs-root>
+

{subsurface_terra-2025.1.0rc10/subsurface_terra.egg-info → subsurface_terra-2025.1.0rc12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subsurface_terra
-Version: 2025.1.0rc10
+Version: 2025.1.0rc12
 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.0rc10 → subsurface_terra-2025.1.0rc12}/requirements/requirements_wells.txt

@@ -1,3 +1,4 @@
 openpyxl
 wellpathpy
+scipy
 

{subsurface_terra-2025.1.0rc10 → subsurface_terra-2025.1.0rc12}/subsurface/_version.py

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

{subsurface_terra-2025.1.0rc10 → subsurface_terra-2025.1.0rc12}/subsurface/api/__init__.py

@@ -8,5 +8,6 @@ from .interfaces.stream import (
     VTK_stream_to_struct,  
     MX_stream_to_unstruc,
     OBJ_stream_to_trisurf,
-    GLTF_stream_to_trisurf
+    GLTF_stream_to_trisurf,
+    MSH_stream_to_struct,
 )

{subsurface_terra-2025.1.0rc10 → subsurface_terra-2025.1.0rc12}/subsurface/api/interfaces/stream.py

@@ -1,6 +1,6 @@
 import io
 from io import BytesIO
-from typing import TextIO
+from typing import TextIO, Optional
 
 import pandas
 
@@ -57,11 +57,17 @@ def GLTF_stream_to_trisurf(gltf_stream: io.BytesIO, coordinate_system: TriMeshTr
     tri_mesh: TriSurf = reader.load_gltf_with_trimesh(gltf_stream, coordinate_system)
     return tri_mesh
 
+
 def VTK_stream_to_struct(stream: BytesIO, attribute_name: str) -> list[StructuredData]:
     struct = read_VTK_structured_grid(stream, attribute_name)
     return [struct]
 
 
+def MSH_stream_to_struct(grid_stream: TextIO, values_stream: TextIO, missing_value: Optional[float], attr_name: Optional[str]) -> list[StructuredData]:
+    struct = reader.read_msh_structured_grid(grid_stream, values_stream, missing_value, attr_name)
+    return [struct]
+
+
 def CSV_wells_stream_to_unstruc(
         collars_reader: GenericReaderFilesHelper,
         surveys_reader: GenericReaderFilesHelper,

{subsurface_terra-2025.1.0rc10 → subsurface_terra-2025.1.0rc12}/subsurface/core/geological_formats/boreholes/survey.py

@@ -111,9 +111,11 @@ def _map_attrs_to_measured_depths(attrs: pd.DataFrame, survey: Survey) -> pd.Dat
 
     # Start with a copy of the existing attributes DataFrame
     new_attrs = survey.survey_trajectory.data.points_attributes.copy()
-    if 'component lith' in attrs.columns:
+    if 'component lith' in attrs.columns and 'lith_ids' not in attrs.columns:
         # Factorize lith components directly in-place
         attrs['lith_ids'], _ = pd.factorize(attrs['component lith'], use_na_sentinel=True)
+    else:
+        pass
 
     # Add missing columns from attrs, preserving their dtypes
     for col in attrs.columns.difference(new_attrs.columns):
@@ -152,7 +154,7 @@ def _map_attrs_to_measured_depths(attrs: pd.DataFrame, survey: Survey) -> pd.Dat
                 continue
             attr_to_interpolate = attrs_well[col]
             # make sure the attr_to_interpolate is not a string
-            if attr_to_interpolate.dtype == 'O':
+            if attr_to_interpolate.dtype == 'O' or isinstance(attr_to_interpolate.dtype, pd.CategoricalDtype): 
                 continue
             if col in ['lith_ids', 'component lith']:
                 interp_kind = 'nearest'

{subsurface_terra-2025.1.0rc10 → subsurface_terra-2025.1.0rc12}/subsurface/core/structs/structured_elements/structured_grid.py

@@ -33,6 +33,10 @@ class StructuredGrid:
         grid_3d = np.meshgrid(*cart_coord, indexing='ij')
         return grid_3d
 
+    @property
+    def active_attributes(self) -> np.ndarray:
+        return self.ds.data[self.ds.active_data_array_name].values
+
     def meshgrid_2d(self, attribute_name_coord_name: str = None) -> list:
         """
 

{subsurface_terra-2025.1.0rc10 → subsurface_terra-2025.1.0rc12}/subsurface/modules/reader/__init__.py

@@ -9,3 +9,5 @@ from .mesh.dxf_reader import dxf_stream_to_unstruct_input, dxf_file_to_unstruct_
 from .mesh.mx_reader import mx_to_unstruc_from_binary
 from .mesh.obj_reader import load_obj_with_trimesh, load_obj_with_trimesh_from_binary
 from .mesh.glb_reader import load_gltf_with_trimesh
+
+from .volume.read_grav3d import read_msh_structured_grid

{subsurface_terra-2025.1.0rc10 → subsurface_terra-2025.1.0rc12}/subsurface/modules/reader/mesh/_trimesh_reader.py

@@ -9,9 +9,14 @@ from .... import optional_requirements
 from ....core.structs import TriSurf, StructuredData
 
 
-class TriMeshTransformations(enum.Enum):
-    RIGHT_HANDED_Z_UP = "right_handed_z_up"
-    ORIGINAL = "original"
+class TriMeshTransformations(enum.Flag):
+    UP_Z = 2**1
+    UP_Y = 2**2
+    FORWARD_MINUS_Z = 2**3
+    FORWARD_PLUS_Z = 2**4
+    RIGHT_HANDED_Z_UP_Y_REVERSED = UP_Y | FORWARD_MINUS_Z
+    RIGHT_HANDED_Z_UP = UP_Y | FORWARD_PLUS_Z
+    ORIGINAL = UP_Z | FORWARD_MINUS_Z
 
 
 def load_with_trimesh(path_to_file_or_buffer, file_type: Optional[str] = None,
@@ -23,13 +28,10 @@ def load_with_trimesh(path_to_file_or_buffer, file_type: Optional[str] = None,
     trimesh = optional_requirements.require_trimesh()
     scene_or_mesh = LoadWithTrimesh.load_with_trimesh(path_to_file_or_buffer, file_type, plot)
 
-    # Compute a -90° rotation around the X axis
-    angle_rad = np.deg2rad(-90)
-    transform = trimesh.transformations.rotation_matrix(angle_rad, [1, 0, 0])
-    
     match coordinate_system:
         case TriMeshTransformations.ORIGINAL:
             return scene_or_mesh
+        # * Forward -Z up Y
         case TriMeshTransformations.RIGHT_HANDED_Z_UP:
             # Transform from Y-up (modeling software) to Z-up (scientific)
             # This rotates the model so that:
@@ -37,21 +39,29 @@ def load_with_trimesh(path_to_file_or_buffer, file_type: Optional[str] = None,
             # Old Z axis → New -Y axis
             # Old X axis → Remains as X axis
             transform = np.array([
-                    [1, 0, 0, 0],  # X → X
-                    [0, 0, 1, 0],  # Y → Z 
-                    [0, 1, 0, 0],  # Z → -Y
+                    [1, 0, 0, 0],  
+                    [0, 0, -1, 0],  
+                    [0, 1, 0, 0], 
                     [0, 0, 0, 1]
             ])
-
+        case TriMeshTransformations.RIGHT_HANDED_Z_UP_Y_REVERSED:
+            # * Forward Z Up Y
+            transform=np.array([
+                    [1, 0, 0, 0],
+                    [0, 0, 1, 0],
+                    [0, 1, 0, 0],
+                    [0, 0, 0, 1],
+            ])
             # Apply the coordinate transformation
-            if isinstance(scene_or_mesh, trimesh.Scene):
-                for geometry in scene_or_mesh.geometry.values():
-                    geometry.apply_transform(transform)
-            else:
-                scene_or_mesh.apply_transform(transform)
+        # TODO: Add all the options of blender
         case _:
             raise ValueError(f"Invalid coordinate system: {coordinate_system}")
 
+    if isinstance(scene_or_mesh, trimesh.Scene):
+        for geometry in scene_or_mesh.geometry.values():
+            geometry.apply_transform(transform)
+    else:
+        scene_or_mesh.apply_transform(transform)
     return scene_or_mesh