From 20c35f3d160b604114809abded2ea993432da3ff Mon Sep 17 00:00:00 2001 From: seogi_macbook Date: Fri, 4 Mar 2016 11:04:11 -0800 Subject: [PATCH] clean up import solver --- tests/dcip/test_forward_IPproblem.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/dcip/test_forward_IPproblem.py b/tests/dcip/test_forward_IPproblem.py index b68995e7..ff7b1ab6 100644 --- a/tests/dcip/test_forward_IPproblem.py +++ b/tests/dcip/test_forward_IPproblem.py @@ -33,12 +33,14 @@ class IPforwardTests(unittest.TestCase): imap = Maps.IdentityMap(mesh) problem = DC.ProblemDC_CC(mesh, mapping=imap) + try: from pymatsolver import MumpsSolver - problem.Solver = MumpsSolver + solver = MumpsSolver except ImportError, e: - problem.Solver = SolverLU + solver = SolverLU + problem.Solver = solver problem.pair(survey) phi0 = survey.dpred(sigma0) @@ -50,11 +52,8 @@ class IPforwardTests(unittest.TestCase): problemIP = DC.ProblemIP(mesh, sigma=sigma) problemIP.pair(surveyIP) - try: - from pymatsolver import MumpsSolver - problemIP.Solver = MumpsSolver - except Exception, e: - pass + problemIP.Solver = solver + phiIP_approx = surveyIP.dpred(eta) err = np.linalg.norm(phiIP_true-phiIP_approx) / np.linalg.norm(phiIP_true)