Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions omf/fileio/geoh5.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import numpy as np
from geoh5py.data import (
Data,
DataTypeEnum,
FloatData,
GeometricDataConstants,
IntegerData,
Expand All @@ -33,7 +32,8 @@
)
from geoh5py.groups import ContainerGroup, RootGroup
from geoh5py.objects import BlockModel, Curve, Grid2D, ObjectBase, Points, Surface
from geoh5py.shared import FLOAT_NDV, INTEGER_NDV, Entity
from geoh5py.shared import FLOAT_NDV, INTEGER_NDV, DataTypeEnum
from geoh5py.shared.entity import Entity
from geoh5py.shared.utils import DEFAULT_PAGE_SIZE
from geoh5py.workspace import Workspace

Expand Down Expand Up @@ -1149,13 +1149,7 @@ def collect_h5_attributes(
geometry["axis_u"] = rot.dot(np.c_[1.0, 0.0, 0.0].T).flatten()
geometry["axis_v"] = rot.dot(np.c_[0.0, 1.0, 0.0].T).flatten()

geometry.update(
{
"origin": np.r_[
entity.origin["x"], entity.origin["y"], entity.origin["z"]
]
}
)
geometry.update({"origin": entity.origin})
kwargs.update({"geometry": geometry})
return kwargs

Expand Down Expand Up @@ -1246,13 +1240,7 @@ def collect_h5_attributes(
geometry["axis_w"] = np.r_[0, 0, axis[2]]

if hasattr(entity, "origin"):
geometry.update(
{
"origin": np.r_[
entity.origin["x"], entity.origin["y"], entity.origin["z"]
]
}
)
geometry.update({"origin": entity.origin})
kwargs.update({"geometry": geometry})

return kwargs
Expand Down
1 change: 0 additions & 1 deletion omf/fileio/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def compare_elements(elem_a, elem_b):

if hasattr(elem_a, "array"):
testing.assert_allclose(elem_a.array.array, elem_b.array.array)

if hasattr(elem_a, "data") and elem_a.data:
for data_a in elem_a.data:
for data_b in elem_b.data:
Expand Down
Loading
Loading