Minor bug fixes.

This commit is contained in:
rowanc1
2014-04-25 17:27:32 -07:00
parent 200a1680ca
commit 7254933695
2 changed files with 5 additions and 7 deletions
+4 -6
View File
@@ -80,8 +80,8 @@ class ProblemBaseTDEM(MixinInitialFieldCalc, BaseTimeProblem):
def makeMassMatrices(self, m):
sig = self.mapping.transform(m)
self._MeSigma = self.mesh.getEdgeInnerProduct(sig)
self._MeSigmaI = sdiag(1/self.MeSigma.diagonal())
self._MfMui = self.mesh.getFaceInnerProduct(1/mu_0)
self._MeSigmaI = Utils.sdInv(self.MeSigma)
self._MfMui = self.mesh.getFaceInnerProduct(1.0/mu_0)
def calcFields(self, sol, solType, tInd):
@@ -110,8 +110,7 @@ class ProblemBaseTDEM(MixinInitialFieldCalc, BaseTimeProblem):
F = FieldsTDEM(self.mesh, self.survey.nTx, self.nT, store=self.storeTheseFields)
dtFact = None
for tInd, t in enumerate(self.times[1:]):
dt = self.timeSteps[tInd]
for tInd, dt in enumerate(self.timeSteps):
if dt!=dtFact:
dtFact = dt
A = self.getA(tInd)
@@ -131,8 +130,7 @@ class ProblemBaseTDEM(MixinInitialFieldCalc, BaseTimeProblem):
F = FieldsTDEM(self.mesh, self.survey.nTx, self.nT, store=self.storeTheseFields)
dtFact = None
for tInd, t in reversed(list(enumerate(self.times[1:]))):
dt = self.timeSteps[tInd]
for tInd, dt in reversed(list(enumerate(self.timeSteps))):
if dt!=dtFact:
dtFact = dt
A = self.getA(tInd)
+1 -1
View File
@@ -256,7 +256,7 @@ if __name__ == '__main__':
prb = EM.TDEM.ProblemTDEM_b(mesh, mapping=mapping)
# prb.setTimes([1e-5, 5e-5, 2.5e-4], [150, 150, 150])
# prb.setTimes([1e-5, 5e-5, 2.5e-4], [10, 10, 10])
prb.setTimes([1e-5], [10])
prb.timeSteps = [(1e-5, 10)]
prb.pair(survey)
sigma = np.random.rand(mesh.nCz)