From 725493369525c5134b102fe9b7f3dc159fd72c2a Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Fri, 25 Apr 2014 17:27:32 -0700 Subject: [PATCH] Minor bug fixes. --- simpegEM/TDEM/BaseTDEM.py | 10 ++++------ simpegEM/TDEM/TDEM_b.py | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/simpegEM/TDEM/BaseTDEM.py b/simpegEM/TDEM/BaseTDEM.py index c30c1137..e4ce1140 100644 --- a/simpegEM/TDEM/BaseTDEM.py +++ b/simpegEM/TDEM/BaseTDEM.py @@ -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) diff --git a/simpegEM/TDEM/TDEM_b.py b/simpegEM/TDEM/TDEM_b.py index 5a346965..37c3a38c 100644 --- a/simpegEM/TDEM/TDEM_b.py +++ b/simpegEM/TDEM/TDEM_b.py @@ -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)