cleaned up sources

SimPEG/EM/FDEM/FieldsFDEM.py

@@ -53,8 +53,7 @@ class Fields_e(Fields):
         bPrimary = np.zeros([self._edgeCurl.shape[0],eSolution.shape[1]],dtype = complex)
         for i, src in enumerate(srcList):
             bp = src.bPrimary(self.prob)
-            if bp is not None:
-                bPrimary[:,i] += bp
+            bPrimary[:,i] += bp
         return bPrimary
 
     def _bSecondary(self, eSolution, srcList):
@@ -147,7 +146,6 @@ class Fields_b(Fields):
         e = self._MeSigmaI * ( self._edgeCurl.T * ( self._MfMui * bSolution))
         for i,src in enumerate(srcList):
             _,S_e = src.eval(self.prob)
-            # if S_e is not None:
             e[:,i] += -self._MeSigmaI * S_e
         return e
 
@@ -316,7 +314,7 @@ class Fields_h(Fields):
         for i, src in enumerate(srcList):
             hp = src.hPrimary(self.prob)
             hPrimary[:,i] += hp
-            return hPrimary
+        return hPrimary
 
     def _hSecondary(self, hSolution, srcList):
         return hSolution

SimPEG/EM/FDEM/SrcFDEM.py

@@ -52,30 +52,14 @@ class RawVec_e(BaseSrc):
         :param rxList: receiver list
     """
 
-    def __init__(self, rxList, freq, S_e, ePrimary=None, bPrimary=None, hPrimary=None, jPrimary=None):
+    def __init__(self, rxList, freq, S_e): #, ePrimary=None, bPrimary=None, hPrimary=None, jPrimary=None):
         self._S_e = np.array(S_e,dtype=complex)
-        self._ePrimary = ePrimary
-        self._bPrimary = bPrimary
-        self._hPrimary = hPrimary
-        self._jPrimary = jPrimary
         self.freq = float(freq)
         BaseSrc.__init__(self, rxList)
 
     def S_e(self, prob):
         return self._S_e
 
-    def ePrimary(self, prob):
-        return self._ePrimary
-
-    def bPrimary(self, prob):
-        return self._bPrimary
-
-    def hPrimary(self, prob):
-        return self._hPrimary
-
-    def jPrimary(self, prob):
-        return self._jPrimary
-
 
 class RawVec_m(BaseSrc):
     """
@@ -86,32 +70,16 @@ class RawVec_m(BaseSrc):
         :param rxList: receiver list
     """
 
-    def __init__(self, rxList, freq, S_m, integrate = True, ePrimary=None, bPrimary=None, hPrimary=None, jPrimary=None):
+    def __init__(self, rxList, freq, S_m, integrate = True):  #ePrimary=Zero(), bPrimary=Zero(), hPrimary=Zero(), jPrimary=Zero()):
         self._S_m = np.array(S_m,dtype=complex)
         self.freq = float(freq)
         self.integrate = integrate
-        self._ePrimary = np.array(ePrimary,dtype=complex)
-        self._bPrimary = np.array(bPrimary,dtype=complex)
-        self._hPrimary = np.array(hPrimary,dtype=complex)
-        self._jPrimary = np.array(jPrimary,dtype=complex)
 
         BaseSrc.__init__(self, rxList)
 
     def S_m(self, prob):
         return self._S_m
 
-    def ePrimary(self, prob):
-        return self._ePrimary
-
-    def bPrimary(self, prob):
-        return self._bPrimary
-
-    def hPrimary(self, prob):
-        return self._hPrimary
-
-    def jPrimary(self, prob):
-        return self._jPrimary
-
 
 class RawVec(BaseSrc):
     """

tests/em/fdem/forward/test_FDEM_forward.py

@@ -6,7 +6,7 @@ from scipy.constants import mu_0
 from SimPEG.EM.Utils.testingUtils import getFDEMProblem
 
 testEB = True
-testHJ = False
+testHJ = True
 
 verbose = False