From a9efb2fc8acdb22a763c07d8f3828002fd251539 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Mon, 14 Mar 2016 13:05:09 -0700 Subject: [PATCH] add dbdt to testing --- SimPEG/EM/TDEM/TDEM.py | 10 +++------- tests/em/tdem/test_TDEM_b_DerivAdjoint.py | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/SimPEG/EM/TDEM/TDEM.py b/SimPEG/EM/TDEM/TDEM.py index c3fc824d..b087231e 100644 --- a/SimPEG/EM/TDEM/TDEM.py +++ b/SimPEG/EM/TDEM/TDEM.py @@ -413,11 +413,7 @@ class Problem_b(BaseTDEMProblem): S_m, S_e = self.getSourceTerm(tInd) - # B_n = np.c_[[F[src,'bSolution',tInd] for src in self.survey.srcList]] - # if B_n.shape[0] is not 1: - # raise NotImplementedError('getRHS not implemented for this shape of B_n') - - rhs = (C * (MeSigmaI * S_e) + S_m) # + 1./dt * B_n[:,:,0].T + rhs = (C * (MeSigmaI * S_e) + S_m) if self._makeASymmetric is True: return MfMui.T * rhs return rhs @@ -439,7 +435,7 @@ class Problem_b(BaseTDEMProblem): MeSigmaIDerivT_v = Utils.Zero() else: MeSigmaIDerivT_v = MeSigmaIDeriv(S_e).T * v - RHSDeriv = MeSigmaIDerivT_v + S_eDeriv( MeSigmaI.T * ( C.T * v ) ) + S_mDeriv(v) #+ dbn_dm_v / dt #this will be given the transposed version + RHSDeriv = MeSigmaIDerivT_v + S_eDeriv( MeSigmaI.T * ( C.T * v ) ) + S_mDeriv(v) return RHSDeriv if isinstance(S_e, Utils.Zero): @@ -447,7 +443,7 @@ class Problem_b(BaseTDEMProblem): else: MeSigmaIDeriv_v = MeSigmaIDeriv(S_e) * v - RHSDeriv = (C * (MeSigmaIDeriv_v + MeSigmaI * S_eDeriv(v) + S_mDeriv(v))) #+ dbn_dm_v / dt + RHSDeriv = (C * (MeSigmaIDeriv_v + MeSigmaI * S_eDeriv(v) + S_mDeriv(v))) if self._makeASymmetric is True: return self.MfMui.T * RHSDeriv diff --git a/tests/em/tdem/test_TDEM_b_DerivAdjoint.py b/tests/em/tdem/test_TDEM_b_DerivAdjoint.py index 5796228a..c5d9ec5d 100644 --- a/tests/em/tdem/test_TDEM_b_DerivAdjoint.py +++ b/tests/em/tdem/test_TDEM_b_DerivAdjoint.py @@ -143,11 +143,15 @@ class TDEM_DerivTests(unittest.TestCase): def test_Jvec_b_bz(self): self.JvecTest('bz') + def test_Jvec_b_dbxdt(self): + self.JvecTest('dbxdt') + + def test_Jvec_b_dbzdt(self): + self.JvecTest('dbzdt') + def test_Jvec_b_ey(self): self.JvecTest('ey') - else: - pass # ====== TEST Jtvec ========== # @@ -175,6 +179,12 @@ class TDEM_DerivTests(unittest.TestCase): def test_Jvec_adjoint_b_bz(self): self.JvecVsJtvecTest('bz') + def test_Jvec_adjoint_b_dbxdt(self): + self.JvecVsJtvecTest('bx') + + def test_Jvec_adjoint_b_dbzdt(self): + self.JvecVsJtvecTest('bz') + def test_Jvec_adjoint_b_ey(self): self.JvecVsJtvecTest('ey')