[WIP] Fixing null references to grid transforms

Author: Leguark

gempy/API/initialization_API.py

@@ -46,7 +46,6 @@ def create_geomodel(
     if resolution is None:
         grid: Grid = Grid(extent=extent)
         grid.octree_levels = refinement
-        grid.set_inactive("regular")
     else:
         grid = Grid(
             extent=extent,

gempy/core/data/geo_model.py

@@ -171,7 +171,7 @@ def surface_points_copy(self):
         """This is a copy! Returns a SurfacePointsTable for all surface points across the structural elements"""
         surface_points_table = self.structural_frame.surface_points_copy
         if self.input_transform is not None:
-            transform = self.input_transform + self.grid.dense_grid.transform
+            transform = self.input_transform + self.grid.transform
             surface_points_table.model_transform = transform
         return surface_points_table
 
@@ -189,7 +189,7 @@ def orientations_copy(self) -> OrientationsTable:
         """This is a copy! Returns a OrientationsTable for all orientations across the structural elements"""
         orientations_table = self.structural_frame.orientations_copy
         if self.input_transform is not None:
-            transform = self.input_transform + self.grid.dense_grid.transform
+            transform = self.input_transform + self.grid.transform
             orientations_table.model_transform = transform
         return orientations_table
 

gempy/core/data/grid.py

@@ -6,6 +6,7 @@
 from typing import Optional
 
 from gempy_engine.core.data.centered_grid import CenteredGrid
+from gempy_engine.core.data.transforms import Transform
 from .grid_modules import RegularGrid, CustomGrid, Sections
 from .grid_modules.topography import Topography
 
@@ -35,6 +36,7 @@ class GridTypes(enum.Flag):
     length: np.ndarray = np.empty(0)
 
     _active_grids = GridTypes.NONE
+    _transform: Optional[Transform] = None
 
     _octree_levels: int = -1
 
@@ -52,6 +54,23 @@ def __str__(self):
         grid_summary_str = "\n".join(grid_summary)
         return f"Grid Object:\n{grid_summary_str}"
 
+
+
+    @property
+    def transform(self) -> Transform:
+        if self._transform is None:
+            if self.dense_grid is not None:
+                return self.dense_grid.transform
+            elif self.octree_grid is not None:
+                return self.octree_grid.transform
+            else:
+                return Transform.init_neutral()
+        return self._transform
+
+    @transform.setter
+    def transform(self, value: Transform):
+        self._transform = value
+        
     @property
     def extent(self):
         if self._extent is None:

gempy/core/data/grid_modules/grid_types.py

@@ -69,12 +69,12 @@ def set_regular_grid(self, extent: Sequence[float], resolution: Sequence[int], t
 
     @property
     def transform(self) -> Transform:
+        if self._transform is None:
+            return Transform.init_neutral()
         return self._transform
 
     @transform.setter
     def transform(self, value: Transform):
-        if value is None:
-            self._transform = Transform.init_neutral()
         self._transform = value
 
     @classmethod

gempy/modules/data_manipulation/engine_factory.py

@@ -18,7 +18,7 @@ def interpolation_input_from_structural_frame(structural_frame: StructuralFrame,
     if LEGACY_COORDS := False:
         _legacy_factor = 0.5
 
-    total_transform: Transform = input_transform + grid.dense_grid.transform
+    total_transform: Transform = input_transform + grid.transform
 
     surface_points_copy = structural_frame.surface_points_copy
     surface_points: SurfacePoints = SurfacePoints(

test/test_core/test_transfoms.py

@@ -88,33 +88,3 @@ def test_transform_operations_rotate():
     assert np.allclose(original_points, inv_transformed_points)
 
 
-def test_transformed_data():
-    if transfromed_data := True:  # TODO: Expose this to user
-        xyz2 = surface_points.model_transform.apply_with_pivot(
-            points=xyz,
-            # pivot=np.array([5_478_256.5, 5_698_528.946534388,0]),
-            pivot=np.array([5.47825650e+06, 5.69852895e+06, -1.48920000e+03])
-
-        )
-
-        xyz = np.vstack([xyz, xyz2])
-
-
-    agggg = np.concatenate([mapped_array, mapped_array])
-
-    if transfromed_data := True:
-        orientations_xyz2 = orientations.model_transform.apply_with_pivot(
-            points=orientations_xyz,
-            pivot=np.array([5.47825650e+06, 5.69852895e+06, -1.48920000e+03])
-        )
-        orientations_grads2 = orientations.model_transform.transform_gradient(orientations_grads)
-        arrows_factor /= orientations.model_transform.isometric_scale
-
-        orientations_xyz = np.vstack([orientations_xyz, orientations_xyz2])
-
-
-        input_transform = regular_grid.input_transform
-        transformed = input_transform.apply(regular_grid.bounding_box)  # ! grid already has the grid transform applied
-        new_extents = np.array([transformed[:, 0].min(), transformed[:, 0].max(),
-                                transformed[:, 1].min(), transformed[:, 1].max(),
-                                transformed[:, 2].min(), transformed[:, 2].max()])

test/test_modules/.benchmarks/test_transformed_space.py

@@ -0,0 +1,44 @@
+import gempy as gp
+from gempy.core.data.enumerators import ExampleModel
+from gempy.optional_dependencies import require_gempy_viewer
+
+PLOT = True
+
+
+def test_plot_transformed_data():
+    model = gp.generate_example_model(ExampleModel.ANTICLINE, compute_model=True)
+    print(model.structural_frame)
+
+    if PLOT:
+        gpv = require_gempy_viewer()
+        gpv.plot_3d(model, image=True)
+
+
+def test_transformed_data():
+    if transfromed_data := True:  # TODO: Expose this to user
+        xyz2 = surface_points.model_transform.apply_with_pivot(
+            points=xyz,
+            # pivot=np.array([5_478_256.5, 5_698_528.946534388,0]),
+            pivot=np.array([5.47825650e+06, 5.69852895e+06, -1.48920000e+03])
+
+        )
+
+        xyz = np.vstack([xyz, xyz2])
+
+    agggg = np.concatenate([mapped_array, mapped_array])
+
+    if transfromed_data := True:
+        orientations_xyz2 = orientations.model_transform.apply_with_pivot(
+            points=orientations_xyz,
+            pivot=np.array([5.47825650e+06, 5.69852895e+06, -1.48920000e+03])
+        )
+        orientations_grads2 = orientations.model_transform.transform_gradient(orientations_grads)
+        arrows_factor /= orientations.model_transform.isometric_scale
+
+        orientations_xyz = np.vstack([orientations_xyz, orientations_xyz2])
+
+        input_transform = regular_grid.input_transform
+        transformed = input_transform.apply(regular_grid.bounding_box)  # ! grid already has the grid transform applied
+        new_extents = np.array([transformed[:, 0].min(), transformed[:, 0].max(),
+                                transformed[:, 1].min(), transformed[:, 1].max(),
+                                transformed[:, 2].min(), transformed[:, 2].max()])