Merge branch 'develop' into GEOPY-2561

Author: domfournier

simpeg_drivers/components/factories/directives_factory.py

@@ -144,7 +144,7 @@ def save_directives(self):
         ]:
             save_directive = getattr(self, directive)
             if save_directive is not None:
-                directives_list.append(getattr(self, directive))
+                directives_list.append(save_directive)
 
                 if (
                     isinstance(save_directive, directives.SaveDataGeoH5)
@@ -200,8 +200,10 @@ def save_property_group(self):
     @property
     def save_sensitivities_directive(self):
         """"""
-        if self._save_sensitivities_directive is None and isinstance(
-            self.params, BaseInversionOptions
+        if (
+            self._save_sensitivities_directive is None
+            and isinstance(self.params, BaseInversionOptions)
+            and self.params.directives.save_sensitivities
         ):
             self._save_sensitivities_directive = SaveSensitivitiesGeoh5Factory(
                 self.params

simpeg_drivers/components/factories/simulation_factory.py

@@ -121,19 +121,17 @@ def assemble_arguments(
         survey=None,
         mesh=None,
         models=None,
+        **kwargs,
     ):
         if "1d" in self.factory_type:
             return ()
 
         return [mesh]
 
-    def assemble_keyword_arguments(
-        self,
-        survey=None,
-        mesh=None,
-        models=None,
-    ):
-        kwargs = {}
+    def assemble_keyword_arguments(self, survey=None, mesh=None, models=None, **kwargs):
+        if not kwargs:
+            kwargs = {}
+
         kwargs["survey"] = survey
         kwargs["max_chunk_size"] = self.params.compute.max_chunk_size
         kwargs["store_sensitivities"] = (

simpeg_drivers/components/models.py

@@ -637,10 +637,9 @@ def _get_value(self, model: float | NumericData) -> np.ndarray:
         if isinstance(model, NumericData):
             model = self.obj_2_mesh(model, self.driver.inversion_mesh.entity)
             model = (self.driver.inversion_mesh.permutation @ model).astype(model.dtype)
-        else:
+        elif isinstance(model, int | float):
             nc = self.driver.inversion_mesh.mesh.n_cells
-            if isinstance(model, int | float):
-                model *= np.ones(nc)
+            model *= np.ones(nc)
 
         return model
 

simpeg_drivers/electromagnetics/base_1d_driver.py

@@ -97,6 +97,7 @@ def simulation(self):
                 mesh=self.inversion_mesh.mesh,
                 models=self.models,
                 survey=self.inversion_data.survey,
+                topo=[0, 0, -np.inf],  # Bypass check for global simulation
             )
 
             self._simulation.mesh = self.inversion_mesh.mesh

simpeg_drivers/options.py

@@ -17,6 +17,7 @@
 
 import numpy as np
 from geoapps_utils.base import Options
+from geoapps_utils.utils.numerical import weighted_average
 from geoh5py.data import (
     BooleanData,
     DataAssociationEnum,
@@ -29,7 +30,6 @@
 from geoh5py.objects import DrapeModel, Grid2D, Octree, Points
 from geoh5py.objects.surveys.electromagnetics.base import BaseEMSurvey
 from geoh5py.ui_json import InputFile
-from geoh5py.ui_json.utils import fetch_active_workspace
 from pydantic import (
     AliasChoices,
     BaseModel,
@@ -285,6 +285,8 @@ class ModelOptions(BaseModel):
     y_norm: float | FloatData | None = 2.0
     z_norm: float | FloatData = 2.0
 
+    _gradient_orientations: np.ndarray | None = None
+
     @property
     def gradient_direction(self) -> np.ndarray:
         if self.gradient_orientations is None:
@@ -306,12 +308,20 @@ def gradient_orientations(self) -> tuple(float, float):
         and clockwise from horizontal for dip.
         """
 
-        if self.gradient_rotation is not None:
+        if self._gradient_orientations is None and self.gradient_rotation is not None:
             orientations = direction_and_dip(self.gradient_rotation)
 
-            return np.deg2rad(orientations)
+            angles = np.deg2rad(orientations)
+            # Deal with aircells here
+            orientations = weighted_average(
+                self.gradient_rotation.parent.centroids,
+                self.gradient_rotation.parent.centroids,
+                [angles[:, 0], angles[:, 1]],
+            )
+
+            self._gradient_orientations = np.vstack(orientations).T
 
-        return None
+        return self._gradient_orientations
 
 
 class ConductivityModelOptions(ModelOptions):

tests/run_tests/driver_mt_test.py

@@ -178,6 +178,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True):
             driver.params.geoh5.h5file, driver.params.out_group.uid
         )
         output["data"] = orig_zyy_real_1
+        assert not run_ws.get_entity("Iteration_0_sensitivities")[0]
         if pytest:
             check_target(output, target_run, tolerance=0.2)
             nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values)