Merge branch 'develop' into GEOPY-2594

Author: benk-mira

simpeg_drivers/utils/nested.py

@@ -307,9 +307,13 @@ def create_simulation(
         # For DCIP-2D, create a projection from the global active cells to
         # the local active cells
         else:
-            # Map the line_ids to the mesh parts (assumes sequential numbering)
-            line_number = np.unique(local_survey.line_ids)
-            active_mesh_part = np.isin(simulation.mesh.parts, line_number)
+            # Map the survey locations (distances) to the mesh parts
+            in_cell = np.searchsorted(
+                simulation.mesh.cell_centers_x, local_survey.locations_a[:, 0]
+            )
+            unique_parts = np.unique(simulation.mesh.parts[in_cell])
+            active_mesh_part = np.isin(simulation.mesh.parts, unique_parts)
+
             n_actives = simulation.active_cells.sum()
             activate_ind = np.zeros(simulation.mesh.n_cells, dtype=int)
             activate_ind[np.where(simulation.active_cells)[0]] = np.arange(n_actives)

simpeg_drivers/utils/utils.py

@@ -419,8 +419,17 @@ def get_drape_model(
     distances = compute_alongline_distance(xyz_smooth)
     x_interp = interp1d(distances[:, 0], xyz_smooth[:, 0], fill_value="extrapolate")
     y_interp = interp1d(distances[:, 0], xyz_smooth[:, 1], fill_value="extrapolate")
+
+    # Round the values for mesh creation to avoid issue with floor (int) rounding
+    limits = np.vstack(
+        [
+            np.floor(distances.min(axis=0)),
+            np.ceil(distances.max(axis=0)),
+        ]
+    )
+
     mesh = mesh_utils.mesh_builder_xyz(
-        distances,
+        limits,
         h,
         padding_distance=[
             [pads[0], pads[1]],

tests/run_tests/driver_dc_2d_rotated_gradients_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": 10.305373769233688, "phi_d": 187000, "phi_m": 410}
+target_run = {"data_norm": 10.37631617283848, "phi_d": 199000, "phi_m": 421}
 
 
 def test_dc_rotated_2d_fwr_run(tmp_path: Path, n_electrodes=10, n_lines=3):

tests/run_tests/driver_dc_2d_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": 11.14351536256954, "phi_d": 6360, "phi_m": 245}
+target_run = {"data_norm": 11.136935742296085, "phi_d": 5570, "phi_m": 314}
 
 
 def test_dc_2d_fwr_run(

tests/run_tests/driver_ip_2d_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.1267394640365658, "phi_d": 16300, "phi_m": 6.05e-05}
+target_run = {"data_norm": 0.1244717397585979, "phi_d": 15500, "phi_m": 0.0002845}
 
 
 def test_ip_2d_fwr_run(