Skip to content

GEOPY-2147: Name of conductivity_model does not match the selection for resistivity #200

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

Merged
domfournier merged 2 commits into from
Apr 29, 2025
Merged

GEOPY-2147: Name of conductivity_model does not match the selection for resistivity #200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b718381
Switch name if needed
domfournier Apr 28, 2025
b398ebe
Merge branch 'release/0.3.0' into GEOPY-2147
domfournier Apr 29, 2025
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
24 changes: 17 additions & 7 deletions simpeg_drivers/components/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,20 +499,30 @@ def save_model(self):
remapped_model.reshape((-1, 3), order="F"), axis=1
)

self.driver.inversion_mesh.entity.add_data(
{f"{self.model_type}_model": {"values": remapped_model}}
)
model_type = self.model_type
if (
model_type == "conductivity"
and getattr(self.driver.params, "model_type", None) == "Resistivity (Ohm-m)"
):
model_type = "resistivity"

# TODO: Standardize names for upper_model and lower_model
if model_type in ["starting", "reference", "conductivity"]:
model_type += "_model"
self.driver.inversion_mesh.entity.add_data(
{f"{model_type}_model": {"values": remapped_model}}
)

def edit_ndv_model(self, model):
"""Change values to NDV on models and save to workspace."""
for field in ["model", "inclination", "declination"]:
model_type = self.model_type
if (
model_type == "conductivity"
and getattr(self.driver.params, "model_type", None)
== "Resistivity (Ohm-m)"
):
model_type = "resistivity"

data_obj = self.driver.inversion_mesh.entity.get_data(
f"{self.model_type}_{field}"
f"{model_type}_{field}"
)
if (
any(data_obj)
Expand Down