Skip to content

GEOPY-1888: Nan data values not handled by the inversion #114

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
Dec 5, 2024
Merged

GEOPY-1888: Nan data values not handled by the inversion #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
210bb44
Standardize handling of nan in data
domfournier Dec 2, 2024
1d0cdbf
Merge branch 'release/0.2.0' into GEOPY-1888
domfournier Dec 5, 2024
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
21 changes: 7 additions & 14 deletions simpeg_drivers/components/factories/survey_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ def _add_data(self, survey, data, local_index, channel):
dobs.append(data_stack[component_id][channel_id, rx_id])
uncerts.append(uncert_stack[component_id][channel_id, rx_id])

survey.dobs = np.vstack([dobs]).flatten()
survey.std = np.vstack([uncerts]).flatten()
data_vec = np.vstack([dobs]).flatten()
uncertainty_vec = np.vstack([uncerts]).flatten()

elif self.factory_type in ["magnetotellurics", "tipper"]:
local_data = {}
Expand All @@ -235,12 +235,6 @@ def _add_data(self, survey, data, local_index, channel):

data_vec = self._stack_channels(local_data, "row")
uncertainty_vec = self._stack_channels(local_uncertainties, "row")
uncertainty_vec[np.isnan(data_vec)] = np.inf
data_vec[np.isnan(data_vec)] = (
self.dummy
) # Nan's handled by inf uncertainties
survey.dobs = data_vec
survey.std = uncertainty_vec

else:
local_data = {k: v[local_index] for k, v in data.observed.items()}
Expand All @@ -250,12 +244,11 @@ def _add_data(self, survey, data, local_index, channel):

data_vec = self._stack_channels(local_data, "column")
uncertainty_vec = self._stack_channels(local_uncertainties, "column")
uncertainty_vec[np.isnan(data_vec)] = np.inf
data_vec[np.isnan(data_vec)] = (
self.dummy
) # Nan's handled by inf uncertainties
survey.dobs = data_vec
survey.std = uncertainty_vec

uncertainty_vec[np.isnan(data_vec)] = np.inf
data_vec[np.isnan(data_vec)] = self.dummy # Nan's handled by inf uncertainties
survey.dobs = data_vec
survey.std = uncertainty_vec

def _stack_channels(self, channel_data: dict[str, np.ndarray], mode: str):
"""
Expand Down
2 changes: 1 addition & 1 deletion simpeg_drivers/electromagnetics/time_domain/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def __init__(self, input_file=None, forward_only=False, **kwargs):
self._y_channel_bool = None
self._y_channel = None
self._y_uncertainty = None
self._inversion_type = "tipper"

self._model_type = "Conductivity (S/m)"

super().__init__(input_file=input_file, forward_only=forward_only, **kwargs)
Expand Down
Loading