Merge pull request #443 from MiraGeoscience/release/0.9.0

GEOPY-693: merge release/0.9.0 to main

Author: andrewg-mira

docs/conf.py

@@ -97,7 +97,7 @@
 # The short X.Y version.
 version = "0.9.0"
 # The full version, including alpha/beta/rc tags.
-release = "0.9.0-rc.4"
+release = "0.9.0"
 
 
 # List of patterns, relative to source directory, that match files and

geoapps/__init__.py

@@ -5,4 +5,4 @@
 #  geoapps is distributed under the terms and conditions of the MIT License
 #  (see LICENSE file at the root of this source code package).
 
-__version__ = "0.9.0-rc.4"
+__version__ = "0.9.0"

geoapps/inversion/components/data.py

@@ -145,7 +145,6 @@ def _initialize(self) -> None:
             if any(np.isnan(self.radar)):
                 self.mask[np.isnan(self.radar)] = False
 
-        self.locations = self.locations[self.mask, :]
         self.observed = self.filter(self.observed)
         self.radar = self.filter(self.radar)
         self.uncertainties = self.filter(self.uncertainties)

geoapps/inversion/components/factories/entity_factory.py

@@ -115,9 +115,14 @@ def _build_dcip(self, inversion_data: InversionData):
         return entity
 
     def _build(self, inversion_data: InversionData):
+
         entity = inversion_data.create_entity(
             "Data", inversion_data.locations, geoh5_object=self.concrete_object
         )
+
+        if np.any(~inversion_data.mask):
+            entity.remove_vertices(~inversion_data.mask)
+
         if getattr(self.params.data_object, "base_stations", None) is not None:
             entity.base_stations = type(self.params.data_object.base_stations).create(
                 entity.workspace,
@@ -128,27 +133,6 @@ def _build(self, inversion_data: InversionData):
         if getattr(self.params.data_object, "channels", None) is not None:
             entity.channels = [float(val) for val in self.params.data_object.channels]
 
-        if getattr(self.params.data_object, "cells", None) is not None:
-
-            indices = np.where(
-                [c not in self.params.data_object.cells for c in entity.cells]
-            )
-            if indices:
-                entity.remove_cells(
-                    indices
-                )  # Remove auto-generated cells that connect different lines
-
-            active_cells = inversion_data.mask[self.params.data_object.cells]
-            active_ind = np.all(active_cells, axis=1)
-            indices = np.where(
-                [
-                    c not in self.params.data_object.cells[active_ind, :]
-                    for c in entity.cells
-                ]
-            )[0]
-            if indices:
-                entity.remove_cells(indices)
-
         return entity
 
     @staticmethod

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geoapps"
-version = "0.9.0-rc.4"
+version = "0.9.0"
 description = "Open-sourced Applications in Geoscience"
 authors = ["Mira Geoscience <dominiquef@mirageoscience.com>"]
 repository = "https://github.com/MiraGeoscience/geoapps"

tests/run_tests/driver_mvi_test.py

@@ -8,6 +8,7 @@
 import os
 
 import numpy as np
+from geoh5py.objects import Curve
 from geoh5py.workspace import Workspace
 from SimPEG import utils
 
@@ -34,14 +35,19 @@ def test_magnetic_vector_fwr_run(
     np.random.seed(0)
     inducing_field = (50000.0, 90.0, 0.0)
     # Run the forward
-    geoh5, _, model, survey, topography = setup_inversion_workspace(
+    geoh5, _, model, points, topography = setup_inversion_workspace(
         tmp_path,
         background=0.0,
         anomaly=0.05,
         refinement=refinement,
         n_electrodes=n_grid_points,
         n_lines=n_grid_points,
     )
+
+    # Unitest dealing with Curve
+    survey = Curve.create(geoh5, name=points.name, vertices=points.vertices)
+    geoh5.remove_entity(points)
+
     params = MagneticVectorParams(
         forward_only=True,
         geoh5=geoh5,