From 6e7d88de77363928810925cda072b7a236fa02aa Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Fri, 16 May 2014 22:06:59 -0700 Subject: [PATCH] Solver updates. --- .travis.yml | 3 --- simpegEM/Tests/test_FDEM_analytics.py | 2 +- simpegEM/Tests/test_TDEM_combos.py | 2 +- simpegEM/Tests/test_TDEM_forward_Analytic.py | 2 +- simpegEM/Tests/test_TDEM_inversion.py | 4 ++-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96c2995b..8223742c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,3 @@ after_success: notifications: - rowanc1@gmail.com - # - dwfmarchant@gmail.com - # - sgkang09@gmail.com - # - lindseyheagy@gmail.com diff --git a/simpegEM/Tests/test_FDEM_analytics.py b/simpegEM/Tests/test_FDEM_analytics.py index a1bb9fae..16c75cea 100644 --- a/simpegEM/Tests/test_FDEM_analytics.py +++ b/simpegEM/Tests/test_FDEM_analytics.py @@ -28,7 +28,7 @@ class FDEM_analyticTests(unittest.TestCase): prb = EM.FDEM.ProblemFDEM_b(mesh, mapping=mapping) prb.pair(survey) - prb.Solver = Utils.SolverUtils.DSolverWrap(sp.linalg.splu, checkAccuracy=False) + prb.Solver = SolverLU sig = 1e-1 sigma = np.ones(mesh.nC)*sig diff --git a/simpegEM/Tests/test_TDEM_combos.py b/simpegEM/Tests/test_TDEM_combos.py index f193ad66..02597cc8 100644 --- a/simpegEM/Tests/test_TDEM_combos.py +++ b/simpegEM/Tests/test_TDEM_combos.py @@ -5,7 +5,7 @@ import simpegEM as EM try: from pymatsolver import MumpsSolver except ImportError, e: - MumpsSolver = Utils.SolverUtils.DSolverWrap(sp.linalg.splu, factorize=True) + MumpsSolver = SolverLU plotIt = False diff --git a/simpegEM/Tests/test_TDEM_forward_Analytic.py b/simpegEM/Tests/test_TDEM_forward_Analytic.py index d44cfb19..deaecd9c 100644 --- a/simpegEM/Tests/test_TDEM_forward_Analytic.py +++ b/simpegEM/Tests/test_TDEM_forward_Analytic.py @@ -7,7 +7,7 @@ import matplotlib.pyplot as plt try: from pymatsolver import MumpsSolver except ImportError, e: - MumpsSolver = Utils.SolverUtils.DSolverWrap(sp.linalg.splu, factorize=True) + MumpsSolver = SolverLU def halfSpaceProblemAnaDiff(meshType, sig_half=1e-2, rxOffset=50., bounds=[1e-5,1e-3], showIt=False): diff --git a/simpegEM/Tests/test_TDEM_inversion.py b/simpegEM/Tests/test_TDEM_inversion.py index 12613ad5..7c73b703 100644 --- a/simpegEM/Tests/test_TDEM_inversion.py +++ b/simpegEM/Tests/test_TDEM_inversion.py @@ -83,8 +83,8 @@ if __name__ == '__main__': tx = EM.TDEM.TxTDEM(np.array([0., 0., 80]), 'VMD_MVP', [rx]) survey = EM.TDEM.SurveyTDEM([tx]) prb = EM.TDEM.ProblemTDEM_b(mesh, mapping=mapping) - prb.Solver = Utils.SolverUtils.DSolverWrap(sp.linalg.splu, factorize=True) - prb.timeSteps = [(1e-06, 20),(1e-05, 20), (0.0001, 20)] + prb.Solver = SolverLU + prb.timeSteps = [(1e-06, 20), (1e-05, 20), (0.0001, 20)] prb.pair(survey) dtrue = survey.dpred(mtrue)