Merge branch 'develop' into GEOPY-1383

domfournier · domfournier · commit c42b3262ce20 · 2026-02-09T09:43:10.000-08:00
diff --git a/simpeg_drivers/utils/synthetics/meshes/octrees.py b/simpeg_drivers/utils/synthetics/meshes/octrees.py
@@ -75,7 +75,7 @@ def get_octree_mesh(
     :return mesh: The discretize TreeMesh object for computations.
     """
 
-    mesh = get_base_octree(survey, topography, cell_size, (0, 0, 2), padding_distance)
+    mesh = get_base_octree(survey, topography, cell_size, (0, 1), padding_distance)
 
     mesh = OctreeDriver.refine_tree_from_points(
         mesh, survey.vertices, levels=refinement, finalize=False
diff --git a/tests/plate_simulation/runtest/sweep_test.py b/tests/plate_simulation/runtest/sweep_test.py
@@ -16,17 +16,16 @@
 from simpeg_drivers import assets_path
 from simpeg_drivers.plate_simulation.options import PlateSimulationOptions
 from simpeg_drivers.plate_simulation.sweep.driver import PlateSweepDriver
-from simpeg_drivers.plate_simulation.sweep.options import SweepOptions
 from simpeg_drivers.potential_fields.gravity.options import GravityForwardOptions
-from simpeg_drivers.utils.synthetics.options import SurveyOptions
+from simpeg_drivers.utils.synthetics.options import SyntheticsComponentsOptions
 from simpeg_drivers.utils.synthetics.surveys.factory import get_survey
 from simpeg_drivers.utils.synthetics.topography import get_topography_surface
 
 
 def setup_plate_sweep(workspace) -> SimPEGGroup:
-    survey_options = SurveyOptions()
-    data = get_survey(workspace, method="gravity", options=survey_options)
-    topo = get_topography_surface(workspace, survey_options)
+    options = SyntheticsComponentsOptions()
+    data = get_survey(workspace, method="gravity", options=options.survey)
+    topo = get_topography_surface(workspace, options)
 
     gravity = SimPEGGroup.create(workspace, name="gravity fwd")
     options = GravityForwardOptions.model_construct()
diff --git a/tests/run_tests/driver_2d_rotated_gradients_test.py b/tests/run_tests/driver_2d_rotated_gradients_test.py
@@ -42,7 +42,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.688327405060795, "phi_d": 190, "phi_m": 70.5}
+target_run = {"data_norm": 0.644727102942656, "phi_d": 182, "phi_m": 66.3}
 
 
 def test_dc2d_rotated_grad_fwr_run(
diff --git a/tests/run_tests/driver_airborne_fem_1d_test.py b/tests/run_tests/driver_airborne_fem_1d_test.py
@@ -41,7 +41,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 654.2956399855235, "phi_d": 58300, "phi_m": 396}
+target_run = {"data_norm": 652.4097142104288, "phi_d": 52800, "phi_m": 341}
 
 
 def test_fem_fwr_1d_run(
diff --git a/tests/run_tests/driver_airborne_tem_1d_test.py b/tests/run_tests/driver_airborne_tem_1d_test.py
@@ -38,7 +38,7 @@
 
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
-target_run = {"data_norm": 5.08855682e-10, "phi_d": 20.2, "phi_m": 169000}
+target_run = {"data_norm": 5.043446361560613e-10, "phi_d": 23, "phi_m": 194000}
 
 
 def test_airborne_tem_1d_fwr_run(
diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py
@@ -39,7 +39,7 @@
 
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
-target_run = {"data_norm": 4.0476883635425e-08, "phi_d": 22700000, "phi_m": 1030}
+target_run = {"data_norm": 4.047707815081421e-08, "phi_d": 22100000, "phi_m": 2920}
 
 
 def test_bad_waveform(tmp_path: Path):
diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py
@@ -43,7 +43,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.6441011110410102, "phi_d": 644, "phi_m": 107}
+target_run = {"data_norm": 0.606697124141973, "phi_d": 693, "phi_m": 88.5}
 
 
 def test_dc_2d_fwr_run(
diff --git a/tests/run_tests/driver_dc_b2d_rotated_gradients_test.py b/tests/run_tests/driver_dc_b2d_rotated_gradients_test.py
@@ -49,7 +49,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 1.1462051301574965, "phi_d": 59.3, "phi_m": 7.24}
+target_run = {"data_norm": 1.1067294238524659, "phi_d": 55.6, "phi_m": 7.08}
 
 
 def test_dc_rotated_p3d_fwr_run(
diff --git a/tests/run_tests/driver_dc_b2d_test.py b/tests/run_tests/driver_dc_b2d_test.py
@@ -47,7 +47,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 1.1290474826747758, "phi_d": 2550, "phi_m": 31.9}
+target_run = {"data_norm": 1.0912968903879878, "phi_d": 2060, "phi_m": 34.3}
 
 
 def test_dc_p3d_fwr_run(
diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py
@@ -38,7 +38,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.1404580196636685, "phi_d": 1.9, "phi_m": 127}
+target_run = {"data_norm": 0.1434420468146182, "phi_d": 5.27, "phi_m": 231}
 
 
 def test_dc_3d_fwr_run(
diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py
@@ -43,7 +43,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 90.93296256260754, "phi_d": 4270, "phi_m": 918}
+target_run = {"data_norm": 90.98397054326658, "phi_d": 4290, "phi_m": 916}
 
 
 def test_fem_name_change(tmp_path, caplog):
diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py
@@ -41,7 +41,7 @@
 
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
-target_run = {"data_norm": 0.0008191079906769513, "phi_d": 1.62e-07, "phi_m": 0.00202}
+target_run = {"data_norm": 0.002805526927601853, "phi_d": 1.77e-05, "phi_m": 0.023}
 
 
 def test_gravity_fwr_run(
diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py
@@ -44,7 +44,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 9.310904038470233e-07, "phi_d": 257, "phi_m": 67400}
+target_run = {"data_norm": 9.165423633989594e-07, "phi_d": 314, "phi_m": 4270}
 
 
 def test_tiling_ground_tem(
@@ -157,12 +157,12 @@ def test_ground_tem_fwr_run(
         assert fwr_driver.inversion_data.survey.source_list[0].n_segments == 16
 
     if pytest and caplog:
-        assert len(caplog.records) == 3
-        for record in caplog.records[1:]:
+        assert len(caplog.records) == 2
+        for record in caplog.records:
             assert record.levelname == "INFO"
             assert "counter-clockwise" in record.message
 
-        assert "closed" in caplog.records[1].message
+        assert "closed" in caplog.records[0].message
 
         assert (
             fwr_driver.data_misfit.objfcts[0].simulation.simulations[0].solver == Mumps
diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py
@@ -39,7 +39,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.06364250336901277, "phi_d": 101000, "phi_m": 4.34e-09}
+target_run = {"data_norm": 0.09193270736303862, "phi_d": 211000, "phi_m": 3.11e-08}
 
 
 def test_ip_2d_fwr_run(
diff --git a/tests/run_tests/driver_ip_b2d_test.py b/tests/run_tests/driver_ip_b2d_test.py
@@ -47,7 +47,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.09536558519786646, "phi_d": 227000, "phi_m": 4.73e-08}
+target_run = {"data_norm": 0.09310413606088193, "phi_d": 217000, "phi_m": 5.09e-08}
 
 
 def test_ip_p3d_fwr_run(
diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py
@@ -37,7 +37,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.006803670345605742, "phi_d": 1140, "phi_m": 8.28e-06}
+target_run = {"data_norm": 0.007217903416312316, "phi_d": 1280, "phi_m": 2.52e-05}
 
 
 def test_ip_3d_fwr_run(
diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py
@@ -57,7 +57,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 53.29582613045845, "phi_d": 9210, "phi_m": 0.133}
+target_run = {"data_norm": 53.295837974010844, "phi_d": 9360, "phi_m": 0.126}
 INDUCING_FIELD = (50000.0, 90.0, 0.0)
 
 
diff --git a/tests/run_tests/driver_joint_pgi_homogeneous_test.py b/tests/run_tests/driver_joint_pgi_homogeneous_test.py
@@ -54,7 +54,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 440.08021575766554, "phi_d": 1010, "phi_m": 42500}
+target_run = {"data_norm": 448.4376876605882, "phi_d": 1030, "phi_m": 36200}
 INDUCING_FIELD = (50000.0, 90.0, 0.0)
 
 
@@ -80,7 +80,7 @@ def test_homogeneous_fwr_run(
         components = SyntheticsComponents(geoh5, options=opts)
 
         # Change half the model
-        ind = components.mesh.centroids[:, 0] > 0
+        ind = components.mesh.centroids[:, 0] > -2
         components.model.values[ind] = 0.05
 
         params = GravityForwardOptions.build(
@@ -107,7 +107,7 @@ def test_homogeneous_fwr_run(
         )
         components = SyntheticsComponents(geoh5, options=opts)
         # Change half the model
-        ind = components.mesh.centroids[:, 0] > 0
+        ind = components.mesh.centroids[:, 0] > -2
         components.model.values[ind] = 0.01
 
         params = MVIForwardOptions.build(
diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py
@@ -51,7 +51,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.2997791602206556, "phi_d": 1510, "phi_m": 41}
+target_run = {"data_norm": 0.29977916022065554, "phi_d": 1340, "phi_m": 40.5}
 
 
 def test_joint_surveys_fwr_run(
@@ -192,7 +192,7 @@ def test_joint_surveys_inv_run(
     # The rescaling is done evenly on the two tiles for both surveys
     np.testing.assert_allclose(
         driver.data_misfit.multipliers,
-        [1.0, 1.0, 0.8341, 0.8341],
+        [1.0, 1.0, 0.92959756, 0.92959756],
         atol=1e-3,
     )
 
diff --git a/tests/run_tests/driver_mag_test.py b/tests/run_tests/driver_mag_test.py
@@ -39,7 +39,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 13.010175158724156, "phi_d": 91.4, "phi_m": 1.01e-05}
+target_run = {"data_norm": 8.712244667781324, "phi_d": 46.6, "phi_m": 3.23e-06}
 
 
 def test_susceptibility_fwr_run(
diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py
@@ -40,7 +40,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.0197168136860386, "phi_d": 1.85, "phi_m": 22.9}
+target_run = {"data_norm": 0.020014421089872222, "phi_d": 1.63, "phi_m": 27.6}
 
 
 def setup_data(workspace, survey):
diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py
@@ -46,7 +46,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_mvi_run = {"data_norm": 149.10117434016036, "phi_d": 5.49, "phi_m": 0.0315}
+target_mvi_run = {"data_norm": 149.1011743401604, "phi_d": 188, "phi_m": 0.0303}
 
 
 def test_magnetic_vector_fwr_run(
diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py
@@ -39,7 +39,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 0.01938047698245966, "phi_d": 1.54, "phi_m": 59.3}
+target_run = {"data_norm": 0.021515656856259276, "phi_d": 1.57, "phi_m": 44.8}
 
 
 def test_tipper_fwr_run(
diff --git a/tests/run_tests/sensitivity_cutoff_test.py b/tests/run_tests/sensitivity_cutoff_test.py
@@ -116,7 +116,7 @@ def test_sensitivity_percent_cutoff_run(tmp_path):
     SensitivityCutoffDriver.start(str(tmp_path / "sensitivity_cutoff_percent.ui.json"))
     with Workspace(tmp_path / "inversion_test.ui.geoh5") as geoh5:
         mask = geoh5.get_entity("5 percent cutoff")[0]
-        assert mask.values.sum() == 457
+        assert mask.values.sum() == 722
 
 
 def test_sensitivity_cutoff_percentile_run(tmp_path):
@@ -144,7 +144,7 @@ def test_sensitivity_cutoff_percentile_run(tmp_path):
     )
     with Workspace(tmp_path / "inversion_test.ui.geoh5") as geoh5:
         mask = geoh5.get_entity("5 percentile cutoff")[0]
-        assert mask.values.sum() == 4288
+        assert mask.values.sum() == 9743
 
 
 def test_sensitivity_cutoff_log_percent_run(tmp_path):
@@ -172,4 +172,4 @@ def test_sensitivity_cutoff_log_percent_run(tmp_path):
     )
     with Workspace(tmp_path / "inversion_test.ui.geoh5") as geoh5:
         mask = geoh5.get_entity("5 percent log cutoff")[0]
-        assert mask.values.sum() == 4329
+        assert mask.values.sum() == 9830
