Skip to content

Commit b9e5e7d

Browse files
committed
2d at least initializes correctly
1 parent e103aa4 commit b9e5e7d

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

mtpy/modeling/simpeg/data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def te_data(self):
206206
return data.Data(
207207
self.te_survey,
208208
dobs=self.te_observations,
209-
standard_deviations=self.te_data_errors,
209+
standard_deviation=self.te_data_errors,
210210
)
211211

212212
@property
@@ -222,5 +222,5 @@ def tm_data(self):
222222
return data.Data(
223223
self.tm_survey,
224224
dobs=self.tm_observations,
225-
standard_deviations=self.tm_data_errors,
225+
standard_deviation=self.tm_data_errors,
226226
)

mtpy/modeling/simpeg/recipes/inversion_2d.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,13 @@ def tm_data_misfit(self):
178178
data=self.data.tm_data, simulation=self.tm_simulation
179179
)
180180

181+
@property
182+
def data_misfit(self):
183+
"""
184+
data misfit of all components TE + TM
185+
"""
186+
return self.te_data_misfit + self.tm_data_misfit
187+
181188
@property
182189
def reference_model(self):
183190
"""
@@ -207,14 +214,12 @@ def regularization(self):
207214

208215
reg = regularization.Sparse(
209216
self.quad_tree.mesh,
210-
indActive=self.quad_tree.active_cell_index,
211-
mref=self.reference_model,
217+
active_cells=self.quad_tree.active_cell_index,
218+
reference_model=self.reference_model,
212219
alpha_s=self.alpha_s,
213220
alpha_x=self.alpha_y,
214221
alpha_z=self.alpha_z,
215-
mappings=maps.IdentityMap(
216-
nP=self.quad_tree.number_of_active_cells
217-
),
222+
mapping=maps.IdentityMap(nP=self.quad_tree.number_of_active_cells),
218223
)
219224

220225
if self.use_irls:
@@ -244,7 +249,7 @@ def inverse_problem(self):
244249
245250
"""
246251
return inverse_problem.BaseInvProblem(
247-
self.data.data_misfit, self.regularization, self.optimization
252+
self.data_misfit, self.regularization, self.optimization
248253
)
249254

250255
@property

tests/modeling/simpeg/test_simpeg_2d_inversion_recipe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def target_misfit(self):
149149
)
150150

151151
def test_directives(self):
152-
self.assertEqual(4, len(self.simpeg_inversions.directives))
152+
self.assertEqual(4, len(self.simpeg_inversion.directives))
153153

154154

155155
# =============================================================================

0 commit comments

Comments
 (0)