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

Simplified fields method. Changed solveAh, AhVec & tests to be consistent with notes with regards to MfMui

Browse Source
This commit is contained in:
Dave Marchant
2014-02-15 14:16:13 -08:00
parent 2070bca0a6
commit d27e7d3aba
3 changed files with 84 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simpegEM/TDEM/BaseTDEM.py
+2 -7
View File
@@ -135,15 +135,10 @@ class ProblemBaseTDEM(MixinTimeStuff, MixinInitialFieldCalc, BaseProblem):
solveOpts = {'factorize':True,'backend':'scipy'}
def fields(self, m, useThisRhs=None, useThisCalcFields=None):
RHS = useThisRhs or self.getRHS
CalcFields = useThisCalcFields or self.calcFields
def fields(self, m):
self.makeMassMatrices(m)
F = self.getInitialFields()
return self.forward(m, RHS, CalcFields, F=F)
return self.forward(m, self.getRHS, self.calcFields, F=F)
def forward(self, m, RHS, CalcFields, F=None):
simpegEM/TDEM/TDEM_b.py
+5 -4
View File
@@ -64,7 +64,7 @@ class ProblemTDEM_b(ProblemBaseTDEM):
def solveAh(self, m, p):
def AhRHS(tInd, u):
rhs = self.MfMui*self.mesh.edgeCurl*self.MeSigmaI*p.get_e(tInd) + self.MfMui*p.get_b(tInd)
rhs = self.MfMui*self.mesh.edgeCurl*self.MeSigmaI*p.get_e(tInd) + p.get_b(tInd)
if tInd == 0:
return rhs
dt = self.getDt(tInd)
@@ -75,7 +75,8 @@ class ProblemTDEM_b(ProblemBaseTDEM):
e = self.MeSigmaI*self.mesh.edgeCurl.T*self.MfMui*b - self.MeSigmaI*p.get_e(tInd)
return {'b':b, 'e':e}
Y = self.fields(m, useThisRhs=AhRHS, useThisCalcFields=AhCalcFields)
self.makeMassMatrices(m)
Y = self.forward(m, AhRHS, AhCalcFields)
return Y
####################################################
@@ -87,14 +88,14 @@ class ProblemTDEM_b(ProblemBaseTDEM):
u = self.fields(m)
self.makeMassMatrices(m)
dt = self.getDt(0)
b = 1/dt*u.get_b(0) + self.mesh.edgeCurl*u.get_e(0)
b = 1/dt*self.MfMui*u.get_b(0) + self.MfMui*self.mesh.edgeCurl*u.get_e(0)
e = self.mesh.edgeCurl.T*self.MfMui*u.get_b(0) - self.MeSigma*u.get_e(0)
f = FieldsTDEM(self.mesh, 1, self.times.size, 'b')
f.set_b(b, 0)
f.set_e(e, 0)
for i in range(1,self.times.size):
dt = self.getDt(i)
b = 1/dt*u.get_b(i) + self.mesh.edgeCurl*u.get_e(i) - 1/dt*u.get_b(i-1)
b = 1/dt*self.MfMui*u.get_b(i) + self.MfMui*self.mesh.edgeCurl*u.get_e(i) - 1/dt*self.MfMui*u.get_b(i-1)
e = self.mesh.edgeCurl.T*self.MfMui*u.get_b(i) - self.MeSigma*u.get_e(i)
f.set_b(b, i)
f.set_e(e, i)