Skip to content

Commit 7034c63

Browse files
committed
Fix test for new property groups
1 parent 1cc34d0 commit 7034c63

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

simpeg_drivers/utils/utils.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from geoapps_utils.utils.conversions import string_to_numeric
2323
from geoapps_utils.utils.numerical import running_mean, traveling_salesman
2424
from geoh5py import Workspace
25+
from geoh5py.data import NumericData
2526
from geoh5py.groups import Group, SimPEGGroup
2627
from geoh5py.objects import DrapeModel, Octree
2728
from geoh5py.objects.surveys.direct_current import PotentialElectrode
@@ -38,12 +39,6 @@
3839
from simpeg.survey import BaseSurvey
3940
from simpeg.utils import mkvc
4041

41-
42-
if TYPE_CHECKING:
43-
from simpeg_drivers.components.data import InversionData
44-
from simpeg_drivers.driver import InversionDriver
45-
46-
4742
from simpeg_drivers import DRIVER_MAP
4843
from simpeg_drivers.utils.surveys import (
4944
compute_alongline_distance,
@@ -52,6 +47,11 @@
5247
)
5348

5449

50+
if TYPE_CHECKING:
51+
from simpeg_drivers.components.data import InversionData
52+
from simpeg_drivers.driver import InversionDriver
53+
54+
5555
def calculate_2D_trend(
5656
points: np.ndarray, values: np.ndarray, order: int = 0, method: str = "all"
5757
):
@@ -258,12 +258,19 @@ def drape_to_octree(
258258
f"Found more than one data set with name {names[ind]} in"
259259
f"model {model.name}."
260260
)
261+
262+
if not isinstance(datum[0], NumericData):
263+
continue
264+
261265
if method == "nearest":
262266
octree_model.append(datum[0].values)
263267
else:
264268
lookup_inds = mesh.get_containing_cells(model.centroids)
265269
octree_model[lookup_inds] = datum[0].values
266270

271+
if len(octree_model) == 0:
272+
continue
273+
267274
if method == "nearest":
268275
octree_model = np.hstack(octree_model)[lookup_inds]
269276

tests/run_tests/driver_mvi_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def test_magnetic_vector_run(
154154

155155
out_group = run_ws.get_entity("Magnetic Vector Inversion")[0]
156156
mesh = out_group.get_entity("mesh")[0]
157-
assert len(mesh.property_groups) == 3
157+
assert len(mesh.property_groups) == 5
158158
assert len(mesh.property_groups[0].properties) == 2
159159
assert mesh.property_groups[1].property_group_type == GroupTypeEnum.DIPDIR
160160

0 commit comments

Comments
 (0)