From 3b5dfecb46f58b08959d7c54840ef4d2d57bf5c8 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Mon, 30 May 2016 10:05:15 -0700 Subject: [PATCH] cleanup imports and class instantiation of prim-sec src in sigma --- SimPEG/EM/FDEM/ProblemFDEM.py | 1 - SimPEG/EM/FDEM/SrcFDEM.py | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/SimPEG/EM/FDEM/ProblemFDEM.py b/SimPEG/EM/FDEM/ProblemFDEM.py index 9eb2e915..2aed1d91 100644 --- a/SimPEG/EM/FDEM/ProblemFDEM.py +++ b/SimPEG/EM/FDEM/ProblemFDEM.py @@ -166,7 +166,6 @@ class BaseFDEMProblem(BaseEMProblem): for i, src in enumerate(Srcs): smi, sei = src.eval(self) - #Why are you adding? s_m[:,i] = s_m[:,i] + smi s_e[:,i] = s_e[:,i] + sei diff --git a/SimPEG/EM/FDEM/SrcFDEM.py b/SimPEG/EM/FDEM/SrcFDEM.py index 39e732cc..8c78b116 100644 --- a/SimPEG/EM/FDEM/SrcFDEM.py +++ b/SimPEG/EM/FDEM/SrcFDEM.py @@ -616,15 +616,13 @@ class CircularLoop(BaseSrc): class PrimSecSigma(BaseSrc): - def __init__(self, rxList, freq, sigBack, ePrimary): - self.freq = float(freq) + def __init__(self, rxList, freq, sigBack, ePrimary, **kwargs): self.sigBack = sigBack - self.fields = None - BaseSrc.__init__(self, rxList) + BaseSrc.__init__(self, rxList, freq=freq, _ePrimary=ePrimary, **kwargs) def s_e(self, prob): - return (prob.MeSigma - prob.mesh.getEdgeInnerProduct(self.sigBack)) * self.ePrimary + return (prob.MeSigma - prob.mesh.getEdgeInnerProduct(self.sigBack)) * self.ePrimary(prob) def s_eDeriv(self, prob, v, adjoint=False): if adjoint: