Update targets and squeeze tolerance

domfournier · domfournier · commit 7d4744b3d205 · 2025-03-14T09:47:05.000-07:00
diff --git a/simpeg_drivers/utils/testing.py b/simpeg_drivers/utils/testing.py
@@ -78,7 +78,7 @@ def make(self):
             return self.ws
 
 
-def check_target(output: dict, target: dict, tolerance=0.1):
+def check_target(output: dict, target: dict, tolerance=0.05):
     """
     Check inversion output metrics against hard-valued target.
     :param output: Dictionary containing keys for 'data', 'phi_d' and 'phi_m'.
diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py
@@ -32,7 +32,7 @@
 
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
-target_run = {"data_norm": 7.05481e-08, "phi_d": 198200000, "phi_m": 7806}
+target_run = {"data_norm": 7.05481e-08, "phi_d": 198000000, "phi_m": 7540}
 
 
 def test_bad_waveform(tmp_path: Path):
@@ -199,7 +199,7 @@ def test_airborne_tem_run(tmp_path: Path, max_iterations=1, pytest=True):
         )
         output["data"] = orig_dBzdt
         if pytest:
-            check_target(output, target_run, tolerance=0.1)
+            check_target(output, target_run)
             nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values)
             inactive_ind = run_ws.get_entity("active_cells")[0].values == 0
             assert np.all(nan_ind == inactive_ind)
diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py
@@ -36,8 +36,8 @@
 
 target_run = {
     "data_norm": 0.59563,
-    "phi_d": 2814,
-    "phi_m": 15.88,
+    "phi_d": 2820,
+    "phi_m": 16.8,
 }
 
 
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": 194.2, "phi_m": 346.2}
+target_run = {"data_norm": 0.150326, "phi_d": 212, "phi_m": 374}
 
 
 def test_dc_3d_fwr_run(
diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py
@@ -165,7 +165,7 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True):
         )
 
         if pytest:
-            check_target(output, target_run, tolerance=0.1)
+            check_target(output, target_run)
             nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values)
             inactive_ind = run_ws.get_entity("active_cells")[0].values == 0
             assert np.all(nan_ind == inactive_ind)
diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py
@@ -36,7 +36,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 8.806897e-07, "phi_d": 152.8, "phi_m": 12850}
+target_run = {"data_norm": 8.806897e-07, "phi_d": 153, "phi_m": 13100}
 
 
 def test_tiling_ground_tem(
@@ -230,7 +230,7 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True):
         assert driver.inversion_data.entity.tx_id_property.name == "tx_id"
         output["data"] = orig_dBzdt
         if pytest:
-            check_target(output, target_run, tolerance=0.1)
+            check_target(output, target_run)
             nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values)
             inactive_ind = run_ws.get_entity("active_cells")[0].values == 0
             assert np.all(nan_ind == inactive_ind)
diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py
@@ -32,7 +32,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": 24910, "phi_m": 0.1845}
+target_run = {"data_norm": 0.09052544, "phi_d": 24900, "phi_m": 0.185}
 
 
 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
@@ -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.0919313, "phi_d": 25480, "phi_m": 0.2008}
+target_run = {"data_norm": 0.0919313, "phi_d": 25600, "phi_m": 0.201}
 
 
 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": 180.9, "phi_m": 0.6749}
+target_run = {"data_norm": 0.0082997, "phi_d": 178, "phi_m": 0.684}
 
 
 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
@@ -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": 10590, "phi_m": 0.1336}
+target_run = {"data_norm": 53.29601, "phi_d": 10200, "phi_m": 0.123}
 
 
 def test_joint_cross_gradient_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": 1411, "phi_m": 74.54}
+target_run = {"data_norm": 0.2997791602206556, "phi_d": 1410, "phi_m": 74.4}
 
 
 def test_joint_surveys_fwr_run(
diff --git a/tests/run_tests/driver_mag_test.py b/tests/run_tests/driver_mag_test.py
@@ -32,7 +32,7 @@
 # To test the full run and validate the inversion.
 # Move this file out of the test directory and run.
 
-target_run = {"data_norm": 8.71227951689941, "phi_d": 37.52, "phi_m": 5.717e-06}
+target_run = {"data_norm": 8.71227951689941, "phi_d": 37.5, "phi_m": 5.72e-06}
 
 
 def test_susceptibility_fwr_run(
diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_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.032649770, "phi_d": 6.676, "phi_m": 212.3}
+target_run = {"data_norm": 0.032649770, "phi_d": 6.68, "phi_m": 263}
 
 
 def test_magnetotellurics_fwr_run(
@@ -177,7 +177,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True):
         )
         output["data"] = orig_zyy_real_1
         if pytest:
-            check_target(output, target_run, tolerance=0.5)
+            check_target(output, target_run)
             nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values)
             inactive_ind = run_ws.get_entity("active_cells")[0].values == 0
             assert np.all(nan_ind == inactive_ind)
diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py
@@ -112,7 +112,6 @@ def test_magnetic_vector_run(
             y_norm=1.0,
             z_norm=1.0,
             gradient_type="components",
-            tmi_channel_bool=True,
             tmi_channel=tmi,
             tmi_uncertainty=4.0,
             max_global_iterations=max_iterations,
@@ -142,7 +141,7 @@ def test_magnetic_vector_run(
         out_group = run_ws.get_entity("Magnetic Vector Inversion")[0]
         mesh = out_group.get_entity("mesh")[0]
         assert len(mesh.property_groups) == 3
-        assert len(mesh.property_groups[0].properties) == 3
+        assert len(mesh.property_groups[0].properties) == 2
         assert mesh.property_groups[1].property_group_type == GroupTypeEnum.DIPDIR
 
 
diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py
@@ -32,7 +32,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.006549595043425509, "phi_d": 221.4, "phi_m": 270.5}
+target_run = {"data_norm": 0.006549595043425509, "phi_d": 223, "phi_m": 255}
 
 
 def test_tipper_fwr_run(
@@ -166,7 +166,7 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True):
         )
         output["data"] = orig_tyz_real_1
         if pytest:
-            check_target(output, target_run, tolerance=0.1)
+            check_target(output, target_run)
             nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values)
             inactive_ind = run_ws.get_entity("active_cells")[0].values == 0
             assert np.all(nan_ind == inactive_ind)

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`
`37`	`37`	`target_run = {`
`38`	`38`	`"data_norm": 0.59563,`
`39`		`- "phi_d": 2814,`
`40`		`- "phi_m": 15.88,`
	`39`	`+ "phi_d": 2820,`
	`40`	`+ "phi_m": 16.8,`
`41`	`41`	`}`
`42`	`42`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True):`
`165`	`165`	`)`
`166`	`166`
`167`	`167`	`if pytest:`
`168`		`- check_target(output, target_run, tolerance=0.1)`
	`168`	`+ check_target(output, target_run)`
`169`	`169`	`nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values)`
`170`	`170`	`inactive_ind = run_ws.get_entity("active_cells")[0].values == 0`
`171`	`171`	`assert np.all(nan_ind == inactive_ind)`