tensorType in problem.

This commit is contained in:
rowanc1
2014-06-18 11:09:23 -07:00
parent e5650dfc92
commit 2e3f98800c
2 changed files with 6 additions and 8 deletions
+3 -3
View File
@@ -144,7 +144,7 @@ class ProblemFDEM_e(BaseFDEMProblem):
def getADeriv(self, freq, u, v, adjoint=False):
sig = self.curModel.transform
dsig_dm = self.curModel.transformDeriv
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(Utils.TensorType(self.mesh,sig))(u)
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(self.tensorType)(u)
if adjoint:
return 1j * omega(freq) * ( dsig_dm.T * ( dMe_dsig.T * v ) )
@@ -228,7 +228,7 @@ class ProblemFDEM_b(BaseFDEMProblem):
dMeSigmaI_dI = - self.MeSigmaI**2
vec = (C.T*(mui*u))
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(Utils.TensorType(self.mesh,sig))(vec)
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(self.tensorType)(vec)
if adjoint:
return dsig_dm.T * ( dMe_dsig.T * ( dMeSigmaI_dI.T * ( C.T * ( mui.T * v ) ) ) )
@@ -285,7 +285,7 @@ class ProblemFDEM_b(BaseFDEMProblem):
dMeSigmaI_dI = - self.MeSigmaI**2
vec = C.T * ( mui * b )
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(Utils.TensorType(self.mesh,sig))(vec)
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(self.tensorType)(vec)
if not adjoint:
return dMeSigmaI_dI * ( dMe_dsig * ( dsig_dm * v ) )
else:
+3 -5
View File
@@ -1,5 +1,5 @@
from BaseTDEM import BaseTDEMProblem, FieldsTDEM
from SimPEG.Utils import mkvc, sdiag, TensorType
from SimPEG.Utils import mkvc, sdiag
import numpy as np
from SurveyTDEM import SurveyTDEM
@@ -106,8 +106,7 @@ class ProblemTDEM_b(BaseTDEMProblem):
# fake initial 'e' fields
p[:, 'e', 0] = 0.0
tt = TensorType(self.mesh, self.curModel.transform)
dMdsig = self.mesh.getEdgeInnerProductDeriv(tt)
dMdsig = self.mesh.getEdgeInnerProductDeriv(self.tensorType)
dsigdm_x_v = self.curModel.transformDeriv*vec
for i in range(1,self.nT+1):
# TODO: G[1] may be dependent on the model
@@ -131,8 +130,7 @@ class ProblemTDEM_b(BaseTDEMProblem):
if u is None:
u = self.fields(m)
self.curModel = m
tt = TensorType(self.mesh, self.curModel.transform)
dMdsig = self.mesh.getEdgeInnerProductDeriv(tt)
dMdsig = self.mesh.getEdgeInnerProductDeriv(self.tensorType)
dsigdm = self.curModel.transformDeriv
nTx = self.survey.nTx