E from J and J from E, and a test (need to choose better parameters)

This commit is contained in:
Lindsey Heagy
2015-12-08 19:14:28 -08:00
parent 884d27b541
commit adda7a43dc
3 changed files with 46 additions and 35 deletions
+11 -1
View File
@@ -365,7 +365,7 @@ class Fields_j(Fields):
j = self._j(jSolution, srcList)
return Rho * (aveF2CCV * j)
return 1./self.survey.prob.mesh.dim * Rho * (aveF2CCV * j)
def _eDeriv_u(self, src, v, adjoint=False):
raise NotImplementedError
@@ -394,6 +394,16 @@ class Fields_h(Fields):
self._MeMuI = self.survey.prob.MeMuI
self._MfRho = self.survey.prob.MfRho
def _GLoc(self,fieldType):
if fieldType == 'h':
return 'E'
elif fieldType == 'j':
return 'F'
elif (fieldType == 'e') or (fieldType == 'b'):
return 'CC'
else:
raise Exception('Field type must be e, b, h, j')
def _hPrimary(self, hSolution, srcList):
hPrimary = np.zeros_like(hSolution,dtype = complex)
for i, src in enumerate(srcList):
+7 -7
View File
@@ -6,17 +6,17 @@ from scipy.constants import mu_0
def getFDEMProblem(fdemType, comp, SrcList, freq, verbose=False):
cs = 10.
ncx, ncy, ncz = 6, 6, 6
npad = 5
hx = [(cs,npad,-1.3), (cs,ncx), (cs,npad,1.3)]
hy = [(cs,npad,-1.3), (cs,ncy), (cs,npad,1.3)]
hz = [(cs,npad,-1.3), (cs,ncz), (cs,npad,1.3)]
ncx, ncy, ncz = 2, 2, 2
npad = 8
hx = [(cs,npad,-1.5), (cs,ncx), (cs,npad,1.5)]
hy = [(cs,npad,-1.5), (cs,ncy), (cs,npad,1.5)]
hz = [(cs,npad,-1.5), (cs,ncz), (cs,npad,1.5)]
mesh = Mesh.TensorMesh([hx,hy,hz],['C','C','C'])
mapping = Maps.ExpMap(mesh)
x = np.array([np.linspace(-30,-15,3),np.linspace(15,30,3)]) #don't sample right by the source
XYZ = Utils.ndgrid(x,x,np.r_[0.])
x = np.array([np.linspace(-5.5*cs,-2.5*cs,4),np.linspace(3.5*cs,2.5*cs,4)]) #don't sample right by the source
XYZ = Utils.ndgrid(x,x,np.linspace(-2.25*cs,2.25*cs,5))
Rx0 = EM.FDEM.Rx(XYZ, comp)
Src = []
+28 -27
View File
@@ -7,16 +7,17 @@ from SimPEG.EM.Utils.testingUtils import getFDEMProblem
testEB = True
testHJ = True
testEJ = False
testEJ = True
verbose = False
TOLEBHJ = 1e-5
TOLEJHB = 1e-1
TOLEJHB = 1 # averaging and more sensitive to boundary condition violations (ie. the impact of violating the boundary conditions in each case is different.)
#TODO: choose better testing parameters to lower this
FLR = 1e-20 # "zero", so if residual below this --> pass regardless of order
CONDUCTIVITY = 1e1
MU = mu_0
freq = 1e-1
freq = 5e-1
addrandoms = False
SrcList = ['RawVec', 'MagDipole_Bfield', 'MagDipole', 'CircularLoop']
@@ -28,7 +29,7 @@ def crossCheckTest(fdemType1, fdemType2, comp, TOL=TOLEBHJ):
prb1 = getFDEMProblem(fdemType1, comp, SrcList, freq, verbose)
mesh = prb1.mesh
print 'Cross Checking Forward: %s formulation - %s' % (fdemType1, comp)
print 'Cross Checking Forward: %s, %s formulations - %s' % (fdemType1, fdemType2, comp)
m = np.log(np.ones(mesh.nC)*CONDUCTIVITY)
mu = np.log(np.ones(mesh.nC)*MU)
@@ -118,31 +119,31 @@ class FDEM_CrossCheck(unittest.TestCase):
self.assertTrue(crossCheckTest('j', 'h', 'hzi'))
if testEJ:
# def test_EJ_CrossCheck_jxr_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'jxr'))
# def test_EJ_CrossCheck_jyr_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'jyr'))
# def test_EJ_CrossCheck_jzr_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'jzr'))
# def test_EJ_CrossCheck_jxi_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'jxi'))
# def test_EJ_CrossCheck_jyi_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'jyi'))
# def test_EJ_CrossCheck_jzi_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'jzi'))
def test_EJ_CrossCheck_jxr_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'jxr', TOL=TOLEJHB))
def test_EJ_CrossCheck_jyr_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'jyr', TOL=TOLEJHB))
def test_EJ_CrossCheck_jzr_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'jzr', TOL=TOLEJHB))
def test_EJ_CrossCheck_jxi_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'jxi', TOL=TOLEJHB))
def test_EJ_CrossCheck_jyi_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'jyi', TOL=TOLEJHB))
def test_EJ_CrossCheck_jzi_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'jzi', TOL=TOLEJHB))
def test_EJ_CrossCheck_exr_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'exr', TOL=TOLEJHB))
# def test_EJ_CrossCheck_jyr_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'eyr'))
# def test_EJ_CrossCheck_jzr_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'ezr'))
# def test_EJ_CrossCheck_jxi_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'exi'))
# def test_EJ_CrossCheck_jyi_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'eyi'))
# def test_EJ_CrossCheck_jzi_Jform(self):
# self.assertTrue(crossCheckTest('e', 'j', 'ezi'))
def test_EJ_CrossCheck_eyr_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'eyr', TOL=TOLEJHB))
def test_EJ_CrossCheck_ezr_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'ezr', TOL=TOLEJHB))
def test_EJ_CrossCheck_exi_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'exi', TOL=TOLEJHB))
def test_EJ_CrossCheck_eyi_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'eyi', TOL=TOLEJHB))
def test_EJ_CrossCheck_ezi_Jform(self):
self.assertTrue(crossCheckTest('e', 'j', 'ezi', TOL=TOLEJHB))
if __name__ == '__main__':
unittest.main()