Merge branch 'GEOPY-2075' of https://github.com/MiraGeoscience/simpeg-drivers into GEOPY-2075

Author: domfournier

simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json

@@ -285,6 +285,7 @@
         "label": "Gradient rotation",
         "optional": true,
         "enabled": false,
+        "visible": false,
         "parent": "mesh",
         "value": ""
     },

simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json

@@ -267,6 +267,7 @@
         "label": "Gradient rotation",
         "optional": true,
         "enabled": false,
+        "visible": false,
         "parent": "mesh",
         "value": ""
     },

simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json

@@ -294,6 +294,7 @@
         "label": "Gradient rotation",
         "optional": true,
         "enabled": false,
+        "visible": false,
         "parent": "mesh",
         "value": ""
     },

simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json

@@ -278,6 +278,7 @@
         "label": "Gradient rotation",
         "optional": true,
         "enabled": false,
+        "visible": false,
         "parent": "mesh",
         "value": ""
     },

simpeg_drivers/components/models.py

@@ -58,6 +58,8 @@ class InversionModelCollection:
 
     """
 
+    model_types = MODEL_TYPES
+
     def __init__(self, driver: InversionDriver):
         """
         :param driver: Parental InversionDriver class.

simpeg_drivers/driver.py

@@ -473,7 +473,7 @@ def get_regularization(self):
                 components, weight_names, reg_func.objfcts
             ):
                 if getattr(self.models, weight_name) is None:
-                    setattr(reg_funcs, weight_name, 0.0)
+                    setattr(reg_func, weight_name, 0.0)
                     functions.append(fun)
                     continue
 

tests/models_test.py

@@ -72,7 +72,7 @@ def test_zero_reference_model(tmp_path: Path):
     geoh5 = params.geoh5
     with geoh5.open():
         driver = MVIInversionDriver(params)
-        _ = InversionModel(driver, "reference")
+        _ = InversionModel(driver, "reference", is_vector=True)
         incl = np.unique(geoh5.get_entity("reference_inclination")[0].values)
         decl = np.unique(geoh5.get_entity("reference_declination")[0].values)
     assert len(incl) == 1
@@ -87,7 +87,7 @@ def test_collection(tmp_path: Path):
         driver = MVIInversionDriver(params)
         models = InversionModelCollection(driver)
         models.remove_air(driver.models.active_cells)
-        starting = InversionModel(driver, "starting")
+        starting = InversionModel(driver, "starting", is_vector=True)
         starting.remove_air(driver.models.active_cells)
         np.testing.assert_allclose(models.starting, starting.model, atol=1e-7)
 
@@ -96,7 +96,7 @@ def test_initialize(tmp_path: Path):
     params = get_mvi_params(tmp_path)
     with params.geoh5.open():
         driver = MVIInversionDriver(params)
-        starting_model = InversionModel(driver, "starting")
+        starting_model = InversionModel(driver, "starting", is_vector=True)
         assert len(starting_model.model) == 3 * driver.inversion_mesh.n_cells
         assert len(np.unique(starting_model.model)) == 3
 
@@ -117,7 +117,7 @@ def test_model_from_object(tmp_path: Path):
         point_object.add_data({"test_data": {"values": vals}})
         data_object = geoh5.get_entity("test_data")[0]
         params.lower_bound = data_object
-        lower_bound = InversionModel(driver, "lower_bound")
+        lower_bound = InversionModel(driver, "lower_bound", is_vector=True)
         nc = int(len(lower_bound.model) / 3)
         A = driver.inversion_mesh.mesh.cell_centers
         b = lower_bound.model[:nc]

tests/run_tests/driver_grav_test.py

@@ -15,7 +15,6 @@
 
 import numpy as np
 from geoapps_utils.utils.importing import GeoAppsError
-from geoh5py.groups import PropertyGroup
 from geoh5py.workspace import Workspace
 from pytest import raises
 
@@ -35,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.00333}
+target_run = {"data_norm": 0.0028055269276044915, "phi_d": 8.32e-05, "phi_m": 0.0038}
 
 
 def test_gravity_fwr_run(
@@ -189,75 +188,6 @@ def test_gravity_run(
             assert np.all(nan_ind == inactive_ind)
 
 
-def test_rotated_gradient(
-    tmp_path: Path,
-    max_iterations=1,
-    pytest=True,
-):
-    workpath = tmp_path / "inversion_test.ui.geoh5"
-    if pytest:
-        workpath = tmp_path.parent / "test_gravity_fwr_run0" / "inversion_test.ui.geoh5"
-
-    with Workspace(workpath) as geoh5:
-        gz = geoh5.get_entity("Iteration_0_gz")[0]
-        mesh = geoh5.get_entity("mesh")[0]
-
-        inds = (mesh.centroids[:, 0] > -35) & (mesh.centroids[:, 0] < 35)
-        norms = np.ones(mesh.n_cells) * 2
-        norms[inds] = 0
-        gradient_norms = mesh.add_data({"norms": {"values": norms}})
-
-        topography = geoh5.get_entity("topography")[0]
-
-        # Turn some values to nan
-        values = gz.values.copy()
-        values[0] = np.nan
-        gz.values = values
-
-        # Rotate the gradients
-
-        direction, dip = mesh.add_data(
-            {
-                "gradient_direction": {"values": 90 * np.ones(mesh.n_cells)},
-                "gradient_dip": {"values": 45 * np.ones(mesh.n_cells)},
-            }
-        )
-        gradient_rotation = PropertyGroup(
-            parent=mesh,
-            name="gradient_rotation",
-            property_group_type="Dip direction & dip",
-            properties=[direction, dip],
-        )
-
-        # Run the inverse
-        active_cells = ActiveCellsOptions(topography_object=topography)
-        params = GravityInversionOptions(
-            geoh5=geoh5,
-            mesh=mesh,
-            active_cells=active_cells,
-            data_object=gz.parent,
-            starting_model=1e-4,
-            reference_model=0.0,
-            gradient_rotation=gradient_rotation,
-            s_norm=0.0,
-            x_norm=gradient_norms,
-            y_norm=gradient_norms,
-            z_norm=gradient_norms,
-            gradient_type="components",
-            gz_channel=gz,
-            gz_uncertainty=2e-3,
-            lower_bound=0.0,
-            max_global_iterations=max_iterations,
-            initial_beta_ratio=1e-2,
-            percentile=100,
-            store_sensitivities="ram",
-            save_sensitivities=True,
-        )
-        params.write_ui_json(path=tmp_path / "Inv_run.ui.json")
-
-    _ = GravityInversionDriver.start(str(tmp_path / "Inv_run.ui.json"))
-
-
 if __name__ == "__main__":
     # Full run
     test_gravity_fwr_run(

tests/run_tests/driver_rotated_gradients_test.py

@@ -35,10 +35,10 @@
 # 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.00333}
+target_run = {"data_norm": 0.006830937520353864, "phi_d": 0.0276, "phi_m": 0.0288}
 
 
-def test_gravity_fwr_run(
+def test_gravity_rotated_grad_fwr_run(
     tmp_path: Path,
     n_grid_points=2,
     refinement=(2,),
@@ -76,7 +76,11 @@ def test_rotated_grad_run(
 ):
     workpath = tmp_path / "inversion_test.ui.geoh5"
     if pytest:
-        workpath = tmp_path.parent / "test_gravity_fwr_run0" / "inversion_test.ui.geoh5"
+        workpath = (
+            tmp_path.parent
+            / "test_gravity_rotated_grad_fwr_0"
+            / "inversion_test.ui.geoh5"
+        )
 
     with Workspace(workpath) as geoh5:
         gz = geoh5.get_entity("Iteration_0_gz")[0]
@@ -141,7 +145,7 @@ def test_rotated_grad_run(
 
 if __name__ == "__main__":
     # Full run
-    test_gravity_fwr_run(
+    test_gravity_rotated_grad_fwr_run(
         Path("./"),
         n_grid_points=10,
         refinement=(4, 8),