Skip to content

GEOPY-2565: Air cells not taken into account for rotation angle models #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −7
Open

GEOPY-2565: Air cells not taken into account for rotation angle models #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions simpeg_drivers/components/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 14 additions & 4 deletions simpeg_drivers/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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:
Expand All @@ -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):
Expand Down