Merge branch 'develop' into GEOPY-2310

domfournier · web-flow · commit b1d150dc7626 · 2025-07-10T10:15:11.000-07:00
diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json
@@ -432,7 +432,7 @@
     "cooling_rate": {
         "group": "Optimization",
         "label": "Iterations per beta",
-        "value": 2,
+        "value": 1,
         "min": 1,
         "LineEdit": false,
         "max": 10,
@@ -489,7 +489,7 @@
         "group": "Update sensitivity weights directive",
         "tooltip": "Update sensitivity weight threshold",
         "label": "Threshold (%)",
-        "value": 0.001,
+        "value": 1.0,
         "max": 100.0,
         "min": 0.0,
         "precision": 3,
diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json
@@ -402,7 +402,7 @@
     "cooling_rate": {
         "group": "Optimization",
         "label": "Iterations per beta",
-        "value": 2,
+        "value": 1,
         "min": 1,
         "LineEdit": false,
         "max": 10,
@@ -459,7 +459,7 @@
         "group": "Update sensitivity weights directive",
         "tooltip": "Update sensitivity weight threshold",
         "label": "Threshold (%)",
-        "value": 0.001,
+        "value": 1.0,
         "max": 100.0,
         "min": 0.0,
         "precision": 3,
diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json
@@ -413,7 +413,7 @@
     "cooling_rate": {
         "group": "Optimization",
         "label": "Iterations per beta",
-        "value": 2,
+        "value": 1,
         "min": 1,
         "LineEdit": false,
         "max": 10,
@@ -470,7 +470,7 @@
         "group": "Update sensitivity weights directive",
         "tooltip": "Update sensitivity weight threshold",
         "label": "Threshold (%)",
-        "value": 0.001,
+        "value": 1.0,
         "max": 100.0,
         "min": 0.0,
         "precision": 3,
diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json
@@ -443,7 +443,7 @@
     "cooling_rate": {
         "group": "Optimization",
         "label": "Iterations per beta",
-        "value": 2,
+        "value": 1,
         "min": 1,
         "LineEdit": false,
         "max": 10,
@@ -500,7 +500,7 @@
         "group": "Update sensitivity weights directive",
         "tooltip": "Update sensitivity weight threshold",
         "label": "Threshold (%)",
-        "value": 0.001,
+        "value": 1.0,
         "max": 100.0,
         "min": 0.0,
         "precision": 3,
diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json
@@ -418,7 +418,7 @@
     "cooling_rate": {
         "group": "Optimization",
         "label": "Iterations per beta",
-        "value": 2,
+        "value": 1,
         "min": 1,
         "LineEdit": false,
         "max": 10,
@@ -475,7 +475,7 @@
         "group": "Update sensitivity weights directive",
         "tooltip": "Update sensitivity weight threshold",
         "label": "Threshold (%)",
-        "value": 0.001,
+        "value": 1.0,
         "max": 100.0,
         "min": 0.0,
         "precision": 3,
diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json
@@ -425,7 +425,7 @@
     "cooling_rate": {
         "group": "Optimization",
         "label": "Iterations per beta",
-        "value": 2,
+        "value": 1,
         "min": 1,
         "LineEdit": false,
         "max": 10,
@@ -482,7 +482,7 @@
         "group": "Update sensitivity weights directive",
         "tooltip": "Update sensitivity weight threshold",
         "label": "Threshold (%)",
-        "value": 0.001,
+        "value": 1.0,
         "max": 100.0,
         "min": 0.0,
         "precision": 3,
diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py
@@ -413,7 +413,7 @@ class DirectiveOptions(BaseModel):
     auto_scale_misfits: bool = False
     every_iteration_bool: bool = True
     save_sensitivities: bool = False
-    sens_wts_threshold: float | None = 1e-3
+    sens_wts_threshold: float | None = 1e-0
 
 
 class DrapeModelOptions(BaseModel):
diff --git a/simpeg_drivers/potential_fields/gravity/options.py b/simpeg_drivers/potential_fields/gravity/options.py
@@ -17,7 +17,11 @@
 from geoh5py.data import FloatData
 
 from simpeg_drivers import assets_path
-from simpeg_drivers.options import BaseForwardOptions, BaseInversionOptions
+from simpeg_drivers.options import (
+    BaseForwardOptions,
+    BaseInversionOptions,
+    DirectiveOptions,
+)
 
 
 class GravityForwardOptions(BaseForwardOptions):
@@ -105,3 +109,5 @@ class GravityInversionOptions(BaseInversionOptions):
     gyy_uncertainty: FloatData | float | None = None
     gyz_uncertainty: FloatData | float | None = None
     gzz_uncertainty: FloatData | float | None = None
+
+    directives: DirectiveOptions = DirectiveOptions(sens_wts_threshold=1e-3)
diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/options.py b/simpeg_drivers/potential_fields/magnetic_scalar/options.py
@@ -20,6 +20,7 @@
 from simpeg_drivers.options import (
     BaseForwardOptions,
     BaseInversionOptions,
+    DirectiveOptions,
     ModelOptions,
 )
 
@@ -137,3 +138,5 @@ class MagneticInversionOptions(BaseInversionOptions):
     inducing_field_declination: float | FloatData
 
     models: MagneticModelOptions
+
+    directives: DirectiveOptions = DirectiveOptions(sens_wts_threshold=1e-3)
diff --git a/simpeg_drivers/potential_fields/magnetic_vector/options.py b/simpeg_drivers/potential_fields/magnetic_vector/options.py
@@ -21,6 +21,7 @@
 from simpeg_drivers.options import (
     BaseForwardOptions,
     BaseInversionOptions,
+    DirectiveOptions,
     ModelOptions,
 )
 
@@ -140,3 +141,5 @@ class MVIInversionOptions(BaseInversionOptions):
     inducing_field_inclination: float | FloatData
     inducing_field_declination: float | FloatData
     models: VectorModelOptions
+
+    directives: DirectiveOptions = DirectiveOptions(sens_wts_threshold=1e-3)
diff --git a/tests/driver_test.py b/tests/driver_test.py
@@ -51,7 +51,6 @@ def test_smallness_terms(tmp_path: Path):
             max_global_iterations=1,
             initial_beta_ratio=1e-2,
             percentile=100,
-            store_sensitivities="ram",
         )
         params.alpha_s = None
         driver = GravityInversionDriver(params)
diff --git a/tests/run_tests/driver_2d_rotated_gradients_test.py b/tests/run_tests/driver_2d_rotated_gradients_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.6345768240307744, "phi_d": 1090, "phi_m": 3.99}
+target_run = {"data_norm": 0.63464358755296, "phi_d": 1100, "phi_m": 5.04}
 
 
 def test_dc2d_rotated_grad_fwr_run(
@@ -154,7 +154,7 @@ def test_dc2d_rotated_grad_run(
             reference_model=100.0,
             s_norm=1.0,
             x_norm=0.0,
-            z_norm=0.0,
+            z_norm=2.0,
             max_global_iterations=max_iterations,
             initial_beta=None,
             initial_beta_ratio=1e0,
diff --git a/tests/run_tests/driver_airborne_fem_1d_test.py b/tests/run_tests/driver_airborne_fem_1d_test.py
@@ -34,7 +34,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 638.15180, "phi_d": 59500, "phi_m": 168}
+target_run = {"data_norm": 638.1518041350254, "phi_d": 177000, "phi_m": 2860}
 
 
 def test_fem_fwr_1d_run(
@@ -143,8 +143,6 @@ def test_fem_1d_run(tmp_path: Path, max_iterations=1, pytest=True):
             percentile=100,
             cooling_rate=3,
             chi_factor=0.25,
-            store_sensitivities="ram",
-            sens_wts_threshold=1.0,
             **data_kwargs,
         )
         params.write_ui_json(path=tmp_path / "Inv_run.ui.json")
diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py
@@ -184,8 +184,6 @@ def test_airborne_tem_run(tmp_path: Path, max_iterations=1, pytest=True):
             cooling_rate=4,
             max_cg_iterations=200,
             percentile=5,
-            sens_wts_threshold=1.0,
-            store_sensitivities="ram",
             solver_type="Mumps",
             **data_kwargs,
         )
diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py
@@ -37,11 +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.59563,
-    "phi_d": 2820,
-    "phi_m": 16.8,
-}
+target_run = {"data_norm": 0.5963140277544549, "phi_d": 2640, "phi_m": 20.4}
 
 
 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
@@ -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": 1.1038993594022803, "phi_d": 308, "phi_m": 0.0237}
+target_run = {"data_norm": 1.1039080237658845, "phi_d": 185, "phi_m": 0.491}
 
 
 def test_dc_rotated_p3d_fwr_run(
@@ -147,7 +147,6 @@ def test_dc_rotated_gradient_p3d_run(
             s_norm=0.0,
             x_norm=0.0,
             z_norm=0.0,
-            gradient_type="components",
             max_global_iterations=max_iterations,
             initial_beta=None,
             initial_beta_ratio=10.0,
diff --git a/tests/run_tests/driver_dc_b2d_test.py b/tests/run_tests/driver_dc_b2d_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": 1.099, "phi_d": 8657, "phi_m": 1.217}
+target_run = {"data_norm": 1.0999182820848885, "phi_d": 3060, "phi_m": 19.1}
 
 
 def test_dc_p3d_fwr_run(
diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py
@@ -31,7 +31,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.150326, "phi_d": 212, "phi_m": 374}
+target_run = {"data_norm": 0.1503264550032795, "phi_d": 43.9, "phi_m": 935}
 
 
 def test_dc_3d_fwr_run(
@@ -111,7 +111,6 @@ def test_dc_3d_run(
             percentile=100,
             upper_bound=10,
             tile_spatial=n_lines,
-            store_sensitivities="ram",
             auto_scale_misfits=False,
             save_sensitivities=True,
             cooling_rate=1,
diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py
@@ -180,8 +180,6 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True):
             percentile=100,
             cooling_rate=3,
             chi_factor=0.25,
-            store_sensitivities="ram",
-            sens_wts_threshold=1.0,
             **data_kwargs,
         )
         params.write_ui_json(path=tmp_path / "Inv_run.ui.json")
diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py
@@ -34,7 +34,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.0028055269276044915, "phi_d": 8.32e-05, "phi_m": 0.0038}
+target_run = {"data_norm": 0.0028055270497087128, "phi_d": 8.24e-06, "phi_m": 0.0234}
 
 
 def test_gravity_fwr_run(
@@ -156,7 +156,6 @@ def test_gravity_run(
             starting_model=1e-4,
             topography_object=topography,
             reference_model=0.0,
-            store_sensitivities="ram",
             save_sensitivities=True,
         )
         params.write_ui_json(path=tmp_path / "Inv_run.ui.json")
diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py
@@ -227,8 +227,6 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True):
             cooling_rate=2,
             max_cg_iterations=200,
             percentile=100,
-            sens_wts_threshold=1.0,
-            store_sensitivities="ram",
             solver_type="Mumps",
             **data_kwargs,
         )
diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py
@@ -31,7 +31,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.09052544, "phi_d": 24900, "phi_m": 0.185}
+target_run = {"data_norm": 0.09045976331683352, "phi_d": 19600, "phi_m": 0.213}
 
 
 def test_ip_2d_fwr_run(
@@ -107,7 +107,6 @@ def test_ip_2d_run(
             initial_beta_ratio=1e0,
             percentile=100,
             upper_bound=0.1,
-            store_sensitivities="ram",
             cooling_rate=1,
         )
         params.write_ui_json(path=tmp_path / "Inv_run.ui.json")
diff --git a/tests/run_tests/driver_ip_b2d_test.py b/tests/run_tests/driver_ip_b2d_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.0919313, "phi_d": 25600, "phi_m": 0.201}
+target_run = {"data_norm": 0.09218916148142815, "phi_d": 3490, "phi_m": 0.473}
 
 
 def test_ip_p3d_fwr_run(
diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py
@@ -30,7 +30,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.0082997, "phi_d": 178, "phi_m": 0.684}
+target_run = {"data_norm": 0.008301530028556213, "phi_d": 107, "phi_m": 0.863}
 
 
 def test_ip_3d_fwr_run(
@@ -101,7 +101,6 @@ def test_ip_3d_run(
             percentile=100,
             upper_bound=0.1,
             tile_spatial=n_lines,
-            store_sensitivities="ram",
             cooling_rate=1,
         )
         params.write_ui_json(path=tmp_path / "Inv_run.ui.json")
diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_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": 53.29601, "phi_d": 10200, "phi_m": 0.123}
+target_run = {"data_norm": 53.29585552088844, "phi_d": 7970, "phi_m": 26.7}
 
 
 def test_joint_cross_gradient_fwr_run(
@@ -256,7 +256,6 @@ def test_joint_cross_gradient_inv_run(
             y_norm=0.0,
             z_norm=0.0,
             percentile=100,
-            store_sensitivities="ram",
         )
 
     driver = JointCrossGradientDriver(joint_params)
diff --git a/tests/run_tests/driver_joint_pgi_homogeneous_test.py b/tests/run_tests/driver_joint_pgi_homogeneous_test.py
@@ -45,7 +45,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 390.65805009978556, "phi_d": 2470, "phi_m": 0.674}
+target_run = {"data_norm": 390.70695894864303, "phi_d": 2020, "phi_m": 8.98}
 
 
 def test_homogeneous_fwr_run(
diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py
@@ -29,7 +29,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": 1410, "phi_m": 74.4}
+target_run = {"data_norm": 0.2997791660779469, "phi_d": 398, "phi_m": 102}
 
 
 def test_joint_surveys_fwr_run(
@@ -155,7 +155,6 @@ def test_joint_surveys_inv_run(
             max_global_iterations=max_iterations,
             initial_beta_ratio=1e-2,
             percentile=100,
-            store_sensitivities="ram",
         )
 
     driver = JointSurveyDriver(joint_params)
diff --git a/tests/run_tests/driver_mag_test.py b/tests/run_tests/driver_mag_test.py
diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py
diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py
diff --git a/tests/run_tests/driver_rotated_gradients_test.py b/tests/run_tests/driver_rotated_gradients_test.py
diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py
diff --git a/tests/run_tests/sensitivity_cutoff_test.py b/tests/run_tests/sensitivity_cutoff_test.py
