From 06e8059e3cb2ec64e1e40ad37d313adcf16f98e9 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Sun, 18 May 2014 16:39:39 -0700 Subject: [PATCH] more mesh and model updates. --- simpegEM/Tests/test_TDEM_forward_Analytic.py | 2 +- simpegEM/Tests/test_TDEM_inversion.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simpegEM/Tests/test_TDEM_forward_Analytic.py b/simpegEM/Tests/test_TDEM_forward_Analytic.py index deaecd9c..8400dcf2 100644 --- a/simpegEM/Tests/test_TDEM_forward_Analytic.py +++ b/simpegEM/Tests/test_TDEM_forward_Analytic.py @@ -25,7 +25,7 @@ def halfSpaceProblemAnaDiff(meshType, sig_half=1e-2, rxOffset=50., bounds=[1e-5, active = mesh.vectorCCz<0. actMap = Maps.ActiveCells(mesh, active, np.log(1e-8), nC=mesh.nCz) - mapping = Maps.ComboMap(mesh, [Maps.ExpMap, Maps.Vertical1DMap, actMap]) + mapping = Maps.ExpMap(mesh) * Maps.Vertical1DMap(mesh) * actMap rx = EM.TDEM.RxTDEM(np.array([[rxOffset, 0., 0.]]), np.logspace(-5,-4, 21), 'bz') tx = EM.TDEM.TxTDEM(np.array([0., 0., 0.]), 'VMD_MVP', [rx]) diff --git a/simpegEM/Tests/test_TDEM_inversion.py b/simpegEM/Tests/test_TDEM_inversion.py index 7c73b703..7facf67e 100644 --- a/simpegEM/Tests/test_TDEM_inversion.py +++ b/simpegEM/Tests/test_TDEM_inversion.py @@ -69,7 +69,7 @@ if __name__ == '__main__': active = mesh.vectorCCz<0. layer = (mesh.vectorCCz<0.) & (mesh.vectorCCz>=-100.) actMap = Maps.ActiveCells(mesh, active, np.log(1e-8), nC=mesh.nCz) - mapping = Maps.ComboMap(mesh, [Maps.ExpMap, Maps.Vertical1DMap, actMap]) + mapping = Maps.ExpMap(mesh) * Maps.Vertical1DMap(mesh) * actMap sig_half = 2e-3 sig_air = 1e-8 sig_layer = 1e-3