wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-11 18:01:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

minimal updates to get it working (with depreciation warnings)

Browse Source
This commit is contained in:
rowanc1
2014-06-17 10:03:28 -06:00
parent b34b36bfb9
commit 932f1dbd05
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simpegEM/FDEM/FDEM.py
+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(sig, v=u)
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(Utils.TensorType(self.mesh,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(sig, v=vec)
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(Utils.TensorType(self.mesh,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(sig, v=vec)
dMe_dsig = self.mesh.getEdgeInnerProductDeriv(Utils.TensorType(self.mesh,sig))(vec)
if not adjoint:
return dMeSigmaI_dI * ( dMe_dsig * ( dsig_dm * v ) )
else:
simpegEM/TDEM/TDEM_b.py
+5 -3
View File
@@ -1,5 +1,5 @@
from BaseTDEM import BaseTDEMProblem, FieldsTDEM
from SimPEG.Utils import mkvc, sdiag
from SimPEG.Utils import mkvc, sdiag, TensorType
import numpy as np
from SurveyTDEM import SurveyTDEM
@@ -106,7 +106,8 @@ class ProblemTDEM_b(BaseTDEMProblem):
# fake initial 'e' fields
p[:, 'e', 0] = 0.0
c = self.mesh.getEdgeInnerProductDeriv(self.curModel.transform)*(self.curModel.transformDeriv*vec)
tt = TensorType(self.mesh, self.curModel.transform)
c = self.mesh.getEdgeInnerProductDeriv(tt)()*(self.curModel.transformDeriv*vec)
for i in range(1,self.nT+1):
# TODO: G[1] may be dependent on the model
# for a galvanic source (deriv of the dc problem)
@@ -137,7 +138,8 @@ class ProblemTDEM_b(BaseTDEMProblem):
if nTx > 1:
vu = vu.sum(axis=1)
tmp += vu
p = -mkvc(self.curModel.transformDeriv.T*(self.mesh.getEdgeInnerProductDeriv(self.curModel.transform).T*tmp))
tt = TensorType(self.mesh, self.curModel.transform)
p = -mkvc(self.curModel.transformDeriv.T*(self.mesh.getEdgeInnerProductDeriv(tt)().T*tmp))
return p
def solveAh(self, m, p):