[TEST] Fixed tests that did not refactor properly

[ENH] Improved way to set octree grids in a robust manner

Author: Leguark

gempy/API/grid_API.py

@@ -37,19 +37,19 @@ def set_topography_from_random(grid: Grid, fractal_dimension: float = 2.0, d_z:
         values_2d=random_topography
     )
 
-    set_active_grid(grid, [GridTypes.TOPOGRAPHY])
+    set_active_grid(grid, [Grid.GridTypes.TOPOGRAPHY])
     return grid.topography
 
 
 def set_topography_from_subsurface_structured_grid(grid: Grid, struct: "subsurface.StructuredData"):
     grid.topography = Topography.from_subsurface_structured_data(struct, grid.regular_grid)
-    set_active_grid(grid, [GridTypes.TOPOGRAPHY])
+    set_active_grid(grid, [Grid.GridTypes.TOPOGRAPHY])
     return grid.topography
 
 
 def set_topography_from_arrays(grid: Grid,  xyz_vertices: np.ndarray):
     grid.topography = Topography.from_unstructured_mesh(grid.regular_grid, xyz_vertices)
-    set_active_grid(grid, [GridTypes.TOPOGRAPHY])
+    set_active_grid(grid, [Grid.GridTypes.TOPOGRAPHY])
     return grid.topography
 
 
@@ -66,7 +66,7 @@ def set_custom_grid(grid: Grid, xyz_coord: np.ndarray):
     custom_grid = CustomGrid(xyx_coords=xyz_coord)
     grid.custom_grid = custom_grid
 
-    set_active_grid(grid, [GridTypes.CUSTOM])
+    set_active_grid(grid, [Grid.GridTypes.CUSTOM])
     return grid.custom_grid
 
 
@@ -78,7 +78,7 @@ def set_centered_grid(grid: Grid, centers: np.ndarray, resolution: Sequence[floa
         radius=radius
     )
     grid.centered_grid = centered_grid
-    set_active_grid(grid, [GridTypes.CENTERED])
+    set_active_grid(grid, [Grid.GridTypes.CENTERED])
     return grid.centered_grid
 
 
@@ -92,7 +92,7 @@ def set_topography_from_array():
 
 def set_active_grid(grid: Grid, grid_type: list[Grid.GridTypes], reset: bool = False):
     if reset is True:
-        grid.active_grids = GridTypes.NONE
+        grid.active_grids = Grid.GridTypes.NONE
     for grid_type in grid_type:
         grid.active_grids |= grid_type
 

gempy/core/data/grid.py

@@ -139,8 +139,8 @@ def octree_grid(self):
     def octree_grid(self, value):
         raise AttributeError('Octree grid is not allowed to be set directly. Use init_octree_grid instead')
 
-    def set_octree_grid(self, value: RegularGrid, evaluation_options: EvaluationOptions):
-        regular_grid_resolution = value.resolution
+    def set_octree_grid(self, regular_grid: RegularGrid, evaluation_options: EvaluationOptions):
+        regular_grid_resolution = regular_grid.resolution
         # Check all directions has the same res
         if not np.all(regular_grid_resolution == regular_grid_resolution[0]):
             raise AttributeError('Octree resolution must be isotropic')
@@ -149,9 +149,29 @@ def set_octree_grid(self, value: RegularGrid, evaluation_options: EvaluationOpti
         if octree_levels != evaluation_options.number_octree_levels:
             raise AttributeError('Regular grid resolution does not match octree levels. Resolution must be 2^n')
 
-        self._octree_grid = value
+        self._octree_grid = regular_grid
         self.active_grids |= self.GridTypes.OCTREE
         self._update_values()
+    
+    def set_octree_grid_by_levels(self, octree_levels: int, evaluation_options: EvaluationOptions, extent: Optional[np.ndarray] = None):
+        if extent is None:
+            extent = self.extent
+        
+        self._octree_grid = RegularGrid(
+            extent=extent,
+            resolution=np.array([2 ** octree_levels] * 3),
+        )
+        evaluation_options.number_octree_levels = octree_levels
+        self.active_grids |= self.GridTypes.OCTREE
+        self._update_values()
+    
+    @property
+    def octree_levels(self):
+        return self._octree_levels
+    
+    @octree_levels.setter
+    def octree_levels(self, value):
+        raise AttributeError('Octree levels are not allowed to be set directly. Use set_octree_grid instead')
 
     @property
     def custom_grid(self):

test/test_modules/_geophysics_TO_UPDATE/test_gravity.py

@@ -1,6 +1,3 @@
-# These two lines are necessary only if GemPy is not installed
-# sys.path.append("../..")
-
 # Importing GemPy
 import gempy as gp
 

test/test_modules/test_grids/test_grids_sections.py

@@ -14,8 +14,11 @@ def test_section_grids():
         example_model=ExampleModel.ANTICLINE,
         compute_model=False
     )
-    geo_model.grid.octree_levels = 2
-    geo_model.interpolation_options.number_octree_levels = 2
+
+    geo_model.grid.set_octree_grid_by_levels(
+        octree_levels=2,
+        evaluation_options=geo_model.interpolation_options.evaluation_options
+    )
 
     gp.set_section_grid(
         grid=geo_model.grid,