Fixed tests and Jvec

This commit is contained in:
GudniRos
2016-05-31 22:33:57 -07:00
parent 7087632701
commit f34314bba2
3 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -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:
@@ -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
+4 -2
View File
@@ -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