From 896bb68bacd9551b76e11d8a76f76bcf46290d38 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Thu, 3 Jul 2014 11:13:53 -0700 Subject: [PATCH] Updates to innerproductsDervis --- simpegEM/FDEM/FDEM.py | 6 +++--- simpegEM/TDEM/TDEM_b.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/simpegEM/FDEM/FDEM.py b/simpegEM/FDEM/FDEM.py index 7213f81f..3381a6ab 100644 --- a/simpegEM/FDEM/FDEM.py +++ b/simpegEM/FDEM/FDEM.py @@ -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(self.tensorType)(u) + dMe_dsig = self.mesh.getEdgeInnerProductDeriv(sig)(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(self.tensorType)(vec) + dMe_dsig = self.mesh.getEdgeInnerProductDeriv(sig)(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(self.tensorType)(vec) + dMe_dsig = self.mesh.getEdgeInnerProductDeriv(sig)(vec) if not adjoint: return dMeSigmaI_dI * ( dMe_dsig * ( dsig_dm * v ) ) else: diff --git a/simpegEM/TDEM/TDEM_b.py b/simpegEM/TDEM/TDEM_b.py index ed4d3f3f..ccaff98c 100644 --- a/simpegEM/TDEM/TDEM_b.py +++ b/simpegEM/TDEM/TDEM_b.py @@ -106,7 +106,7 @@ class ProblemTDEM_b(BaseTDEMProblem): # fake initial 'e' fields p[:, 'e', 0] = 0.0 - dMdsig = self.mesh.getEdgeInnerProductDeriv(self.tensorType) + dMdsig = self.mesh.getEdgeInnerProductDeriv(self.curModel.transform) dsigdm_x_v = self.curModel.transformDeriv*vec for i in range(1,self.nT+1): # TODO: G[1] may be dependent on the model @@ -130,7 +130,7 @@ class ProblemTDEM_b(BaseTDEMProblem): if u is None: u = self.fields(m) self.curModel = m - dMdsig = self.mesh.getEdgeInnerProductDeriv(self.tensorType) + dMdsig = self.mesh.getEdgeInnerProductDeriv(self.curModel.transform) dsigdm = self.curModel.transformDeriv nTx = self.survey.nTx