Bulk save

Author: domfournier

simpeg_drivers/components/data.py

@@ -242,7 +242,7 @@ def save_data(self):
                     data_dict[component] = data_entity
                     uncert_dict[component] = uncert_entity
 
-                data_types[component][ind] = data_entity.entity_type
+                data_types[component][channel] = data_entity.entity_type
 
         self._observed_data_types = data_types
         self.update_params(data_dict, uncert_dict)

simpeg_drivers/components/factories/directives_factory.py

@@ -674,7 +674,7 @@ def reshape(values):
                     for comp in components
                 ]
             ),
-            "channels": np.arange(len(channels)),
+            "channels": channels,
             "components": components,
             "sorting": sorting,
             "_reshape": reshape,

simpeg_drivers/electricals/induced_polarization/three_dimensions/options.py

@@ -25,6 +25,14 @@
 )
 
 
+class IP3DModelOptions(ConductivityModelOptions):
+    """
+    ModelOptions class with defaulted lower bound.
+    """
+
+    lower_bound: float | FloatData | None = 0
+
+
 class IP3DForwardOptions(BaseForwardOptions):
     """
     Induced Polarization 3D forward options.

simpeg_drivers/joint/joint_petrophysics/options.py

@@ -46,8 +46,6 @@ class JointPetrophysicsOptions(BaseJointOptions):
     )
 
     title: str = "Joint Petrophysically Guided Inversion (PGI)"
-    physical_property: list[str] = [""]
-
     inversion_type: str = "joint petrophysics"
 
     group_b_multiplier: float | None = None

simpeg_drivers/joint/options.py

@@ -38,6 +38,9 @@ class BaseJointOptions(CoreOptions):
 
     model_config = ConfigDict(frozen=False)
 
+    forward_only: bool = False
+    physical_property: str = ""
+
     group_a: SimPEGGroup
     group_a_multiplier: float = 1.0
     group_b: SimPEGGroup

simpeg_drivers/potential_fields/magnetic_scalar/options.py

@@ -17,7 +17,19 @@
 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,
+    ModelOptions,
+)
+
+
+class MagneticModelOptions(ModelOptions):
+    """
+    ModelOptions class with defaulted lower bound.
+    """
+
+    lower_bound: float | FloatData | None = 0
 
 
 class MagneticForwardOptions(BaseForwardOptions):
@@ -59,6 +71,8 @@ class MagneticForwardOptions(BaseForwardOptions):
     inducing_field_inclination: float | FloatData
     inducing_field_declination: float | FloatData
 
+    models: MagneticModelOptions
+
 
 class MagneticInversionOptions(BaseInversionOptions):
     """
@@ -121,3 +135,5 @@ class MagneticInversionOptions(BaseInversionOptions):
     inducing_field_strength: float | FloatData
     inducing_field_inclination: float | FloatData
     inducing_field_declination: float | FloatData
+
+    models: MagneticModelOptions

tests/run_tests/driver_joint_cross_gradient_test.py

@@ -239,7 +239,7 @@ def test_joint_cross_gradient_inv_run(
                 drivers.append(MVIInversionDriver(params))
 
         # Run the inverse
-        joint_params = JointCrossGradientOptions(
+        joint_params = JointCrossGradientOptions.build(
             geoh5=geoh5,
             topography_object=topography,
             group_a=drivers[0].params.out_group,

tests/run_tests/driver_joint_pgi_homogeneous_test.py

@@ -229,7 +229,7 @@ def test_homogeneous_run(
                 )
                 drivers.append(MagneticInversionDriver(params))
 
-        params = JointPetrophysicsOptions(
+        params = JointPetrophysicsOptions.build(
             topography_object=topography,
             geoh5=geoh5,
             group_a=drivers[0].params.out_group,

tests/run_tests/driver_joint_surveys_test.py

@@ -139,7 +139,7 @@ def test_joint_surveys_inv_run(
 
         active_model = drivers[0].params.mesh.get_entity("active_cells")[0]
         # Run the inverse
-        joint_params = JointSurveysOptions(
+        joint_params = JointSurveysOptions.build(
             geoh5=geoh5,
             active_cells=ActiveCellsOptions(active_model=active_model),
             mesh=drivers[0].params.mesh,

tests/run_tests/driver_mag_test.py

@@ -116,7 +116,7 @@ def test_susceptibility_run(
         )
         params.write_ui_json(path=tmp_path / "Inv_run.ui.json")
 
-    assert params.lower_bound == 0.0
+    assert params.models.lower_bound == 0.0
     driver = MagneticInversionDriver.start(str(tmp_path / "Inv_run.ui.json"))
 
     with Workspace(driver.params.geoh5.h5file) as run_ws: