From f34314bba22dddf8afdd9e1d820e43b0605ab58d Mon Sep 17 00:00:00 2001 From: GudniRos Date: Tue, 31 May 2016 22:33:57 -0700 Subject: [PATCH] Fixed tests and Jvec --- SimPEG/NSEM/ProblemNSEM.py | 2 +- tests/mt/test_Problem1D_againstAnalyticHalfspace.py | 4 ++-- tests/mt/test_Problem3D_againstAnalytic.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/SimPEG/NSEM/ProblemNSEM.py b/SimPEG/NSEM/ProblemNSEM.py index 18a72981..e4f04299 100644 --- a/SimPEG/NSEM/ProblemNSEM.py +++ b/SimPEG/NSEM/ProblemNSEM.py @@ -104,7 +104,7 @@ class BaseNSEMProblem(BaseFDEMProblem): ATinv = self.Solver(AT, **self.solverOpts) for src in self.survey.getSrcByFreq(freq): - ftype = self._fieldType + 'Solution' + ftype = self._solutionType f_src = f[src, :] # Need to fix this... for rx in src.rxList: diff --git a/tests/mt/test_Problem1D_againstAnalyticHalfspace.py b/tests/mt/test_Problem1D_againstAnalyticHalfspace.py index 1951271b..d848c1ba 100644 --- a/tests/mt/test_Problem1D_againstAnalyticHalfspace.py +++ b/tests/mt/test_Problem1D_againstAnalyticHalfspace.py @@ -99,7 +99,7 @@ def appRes_psFieldNorm(sigmaHalf): # Make the survey survey, sigma, mesh = setupSurvey(sigmaHalf,False) - problem = NSEM.Problem1D.eForm_psField(mesh, sigmaPrimary = sigma) + problem = NSEM.Problem1D_ePrimSec(mesh, sigmaPrimary = sigma) problem.pair(survey) # Get the fields @@ -117,7 +117,7 @@ def appPhs_psFieldNorm(sigmaHalf): # Make the survey survey, sigma, mesh = setupSurvey(sigmaHalf,False) - problem = NSEM.Problem1D.eForm_psField(mesh, sigmaPrimary = sigma) + problem = NSEM.Problem1D_ePrimSec(mesh, sigmaPrimary = sigma) problem.pair(survey) # Get the fields diff --git a/tests/mt/test_Problem3D_againstAnalytic.py b/tests/mt/test_Problem3D_againstAnalytic.py index 9ad11a33..a267c9d7 100644 --- a/tests/mt/test_Problem3D_againstAnalytic.py +++ b/tests/mt/test_Problem3D_againstAnalytic.py @@ -7,6 +7,8 @@ from SimPEG import NSEM from SimPEG.Utils import meshTensor from scipy.constants import mu_0 +np.random.seed(1100) + TOLr = 5e-2 TOL = 1e-4 FLR = 1e-20 # "zero", so if residual below this --> pass regardless of order @@ -127,11 +129,11 @@ def setupSimpegNSEMfwd_eForm_ps(inputSetup,comp='Imp',singleFreq=False,expMap=Tr ## Setup the problem object sigma1d = M.r(sigBG,'CC','CC','M')[0,0,:] if expMap: - problem = NSEM.Problem3D.eForm_ps(M,sigmaPrimary= np.log(sigma1d) ) + problem = NSEM.Problem3D_ePrimSec(M,sigmaPrimary= np.log(sigma1d) ) problem.mapping = simpeg.Maps.ExpMap(problem.mesh) problem.curModel = np.log(sig) else: - problem = NSEM.Problem3D.eForm_ps(M,sigmaPrimary= sigma1d) + problem = NSEM.Problem3D_ePrimSec(M,sigmaPrimary= sigma1d) problem.curModel = sig problem.pair(survey) problem.verbose = False