From 8664a98e090d678f0772a6bb71839d1b2200d887 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Fri, 11 Dec 2015 10:43:19 -0800 Subject: [PATCH] cleaned up how I am calling srcDerivs --- SimPEG/EM/FDEM/FDEM.py | 3 +-- SimPEG/EM/FDEM/SrcFDEM.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SimPEG/EM/FDEM/FDEM.py b/SimPEG/EM/FDEM/FDEM.py index f2167fd8..1ae7d2e4 100644 --- a/SimPEG/EM/FDEM/FDEM.py +++ b/SimPEG/EM/FDEM/FDEM.py @@ -243,10 +243,9 @@ class Problem_e(BaseFDEMProblem): MfMui = self.MfMui S_mDeriv, S_eDeriv = src.evalDeriv(self, adjoint) - if adjoint: + if adjoint: dRHS = MfMui * (C * v) return S_mDeriv(dRHS) - 1j * omega(freq) * S_eDeriv(v) - else: return C.T * (MfMui * S_mDeriv(v)) -1j * omega(freq) * S_eDeriv(v) diff --git a/SimPEG/EM/FDEM/SrcFDEM.py b/SimPEG/EM/FDEM/SrcFDEM.py index 8209008c..076fadb6 100644 --- a/SimPEG/EM/FDEM/SrcFDEM.py +++ b/SimPEG/EM/FDEM/SrcFDEM.py @@ -15,7 +15,7 @@ class BaseSrc(Survey.BaseSrc): S_e = self.S_e(prob) return S_m, S_e - def evalDeriv(self, prob, v, adjoint=False): + def evalDeriv(self, prob, adjoint=False): return lambda v: self.S_mDeriv(prob,v,adjoint), lambda v: self.S_eDeriv(prob,v,adjoint) def bPrimary(self, prob): @@ -333,7 +333,7 @@ class PrimSecSigma(BaseSrc): def S_eDeriv(self, prob, v, adjoint = False): MeSigmaDeriv = prob.MeSigmaDeriv - if adjoint is not True: + if not adjoint: return MeSigmaDeriv(Utils.mkvc(self._ePrimary)) * v # TODO: This is really sloppy and will not work if more than one freq return MeSigmaDeriv(Utils.mkvc(self._ePrimary)).T * v