Merge branch 'GEOPY-2048' into GEOPY-2025

# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	environments/py-3.11-linux-64-dev.conda.lock.yml
#	environments/py-3.11-linux-64.conda.lock.yml
#	environments/py-3.11-win-64-dev.conda.lock.yml
#	environments/py-3.11-win-64.conda.lock.yml
#	environments/py-3.12-linux-64-dev.conda.lock.yml
#	environments/py-3.12-linux-64.conda.lock.yml
#	environments/py-3.12-win-64-dev.conda.lock.yml
#	environments/py-3.12-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	py-3.12.conda-lock.yml

Author: domfournier

simpeg_drivers/components/factories/directives_factory.py

@@ -59,7 +59,7 @@ def beta_estimate_by_eigenvalues_directive(self):
         ):
             self._beta_estimate_by_eigenvalues_directive = (
                 directives.BetaEstimateDerivative(
-                    beta0_ratio=self.params.initial_beta_ratio, seed=0
+                    beta0_ratio=self.params.initial_beta_ratio, random_seed=0
                 )
             )
 

simpeg_drivers/components/factories/simulation_factory.py

@@ -168,20 +168,20 @@ def assemble_keyword_arguments(
             )
 
     def _magnetic_vector_keywords(self, kwargs, active_cells=None):
-        kwargs["ind_active"] = active_cells
+        kwargs["active_cells"] = active_cells
         kwargs["chiMap"] = maps.IdentityMap(nP=int(active_cells.sum()) * 3)
         kwargs["model_type"] = "vector"
         kwargs["chunk_format"] = "row"
         return kwargs
 
     def _magnetic_scalar_keywords(self, kwargs, active_cells=None):
-        kwargs["ind_active"] = active_cells
+        kwargs["active_cells"] = active_cells
         kwargs["chiMap"] = maps.IdentityMap(nP=int(active_cells.sum()))
         kwargs["chunk_format"] = "row"
         return kwargs
 
     def _gravity_keywords(self, kwargs, active_cells=None):
-        kwargs["ind_active"] = active_cells
+        kwargs["active_cells"] = active_cells
         kwargs["rhoMap"] = maps.IdentityMap(nP=int(active_cells.sum()))
         kwargs["chunk_format"] = "row"
         return kwargs
@@ -192,13 +192,17 @@ def _induced_polarization_keywords(
         mesh,
         active_cells=None,
     ):
-        etamap = maps.InjectActiveCells(mesh, indActive=active_cells, valInactive=0)
+        etamap = maps.InjectActiveCells(
+            mesh, active_cells=active_cells, value_inactive=0
+        )
         kwargs["etaMap"] = etamap
         kwargs["solver"] = self.solver
         return kwargs
 
     def _conductivity_keywords(self, kwargs, mesh, active_cells=None):
-        actmap = maps.InjectActiveCells(mesh, active_cells, valInactive=np.log(1e-8))
+        actmap = maps.InjectActiveCells(
+            mesh, active_cells=active_cells, value_inactive=np.log(1e-8)
+        )
         kwargs["sigmaMap"] = maps.ExpMap(mesh) * actmap
         kwargs["solver"] = self.solver
         return kwargs

simpeg_drivers/utils/testing.py

@@ -457,12 +457,12 @@ def topo_drape(x, y):
             depth_core=100.0,
             padding_distance=padDist,
             mesh_type="TREE",
+            tree_diagonal_balance=False,
         )
         mesh = OctreeDriver.refine_tree_from_surface(
             mesh,
             topography,
             levels=refinement,
-            diagonal_balance=False,
             finalize=False,
         )
 
@@ -471,7 +471,6 @@ def topo_drape(x, y):
                 mesh,
                 vertices,
                 levels=[2],
-                diagonal_balance=False,
                 finalize=False,
             )
 

tests/data_test.py

@@ -100,12 +100,12 @@ def test_survey_data(tmp_path: Path):
             [20, 20, 20],
             depth_core=50,
             mesh_type="TREE",
+            tree_diagonal_balance=False,
         )
         mesh = OctreeDriver.refine_tree_from_surface(
             mesh,
             test_topo_object,
             levels=[2],
-            diagonal_balance=False,
             finalize=True,
         )