GEOPY-2884: Change data groups saved for MVI as requested by users

simpeg/directives/__init__.py

@@ -125,6 +125,7 @@
     SaveDataGeoH5,
     SaveLogFilesGeoH5,
     SaveLPModelGroup,
+    SaveModelGroup,
     SaveModelGeoH5,
     SavePGIModel,
     SavePropertyGroup,

simpeg/directives/_save_geoh5.py

@@ -510,6 +510,32 @@ def write(self, iteration: int, **_):
                     prop_group.add_properties(properties)
 
 
+class SaveModelGroup(SavePropertyGroup):
+    """
+    Save the model as a property group in the geoh5 file
+    """
+
+    def __init__(
+        self,
+        h5_object,
+        group_type: GroupTypeEnum = GroupTypeEnum.MULTI,
+        **kwargs,
+    ):
+        self.group_type = group_type
+
+        super().__init__(h5_object, **kwargs)
+
+    def get_names(
+        self, component: str, channel: int | None, iteration: int
+    ) -> tuple[str, str]:
+        """
+        Format the data and property_group name.
+        """
+        channel_name, _ = super().get_names(component, channel, iteration)
+
+        return channel_name, component
+
+
 class SaveLPModelGroup(SavePropertyGroup):
     """
     Save the model as a property group in the geoh5 file

simpeg/directives/_vector_models.py

@@ -161,8 +161,10 @@ def endIter(self):
                 self.opt.xc = model
 
         if (
-            self.invProb.phi_d < self.target
-        ) and self.mode == "cartesian" and self.inversion_type == "magnetic vector":
+            (self.invProb.phi_d < self.target)
+            and self.mode == "cartesian"
+            and self.inversion_type == "magnetic vector"
+        ):
             print("Switching MVI to spherical coordinates")
             self.mode = "spherical"
             self.cartesian_model = model