_p --> Primary

simpegEM/FDEM/FieldsFDEM.py

@@ -24,9 +24,9 @@ class FieldsFDEM_e(FieldsFDEM):
     def _e(self, e_sol, srcList):
         e = e_sol
         for i, src in enumerate(srcList):
-            e_p = src.e_p(self.survey.prob)
-            if e_p is not None:
-                e[:,i] += e_p     
+            ePrimary = src.ePrimary(self.survey.prob)
+            if ePrimary is not None:
+                e[:,i] += ePrimary     
         return e
 
     def _b(self, e_sol, srcList):
@@ -38,9 +38,9 @@ class FieldsFDEM_e(FieldsFDEM):
             if S_m is not None:
                 b[:,i] += 1./(1j*omega(src.freq)) * S_m
 
-            b_p = src.b_p(self.survey.prob)
-            if b_p is not None:
-                b[:,i] += b_p 
+            bPrimary = src.bPrimary(self.survey.prob)
+            if bPrimary is not None:
+                b[:,i] += bPrimary 
 
         return b
 
@@ -72,9 +72,9 @@ class FieldsFDEM_b(FieldsFDEM):
         b = b_sol
 
         for i, src in enumerate(srcList):
-            b_p = src.b_p(self.survey.prob)
-            if b_p is not None:
-                b[:,i] += b_p
+            bPrimary = src.bPrimary(self.survey.prob)
+            if bPrimary is not None:
+                b[:,i] += bPrimary
         return b  
 
     def _e(self, b_sol, srcList):
@@ -85,9 +85,9 @@ class FieldsFDEM_b(FieldsFDEM):
             if S_e is not None:
                 e += -self._MeSigmaI*S_e
 
-            e_p = src.e_p(self.survey.prob)
-            if e_p is not None:
-                e[:,i] += e_p
+            ePrimary = src.ePrimary(self.survey.prob)
+            if ePrimary is not None:
+                e[:,i] += ePrimary
 
         return e
 
@@ -120,9 +120,9 @@ class FieldsFDEM_j(FieldsFDEM):
     def _j(self, j_sol, srcList):
         j = j_sol
         for i, src in enumerate(srcList):
-            j_p = src.j_p(self.survey.prob) 
-            if j_p is not None:
-                j[:,i] += j_p
+            jPrimary = src.jPrimary(self.survey.prob) 
+            if jPrimary is not None:
+                j[:,i] += jPrimary
         return j
 
     def _h(self, j_sol, srcList): 
@@ -138,9 +138,9 @@ class FieldsFDEM_j(FieldsFDEM):
             if S_m is not None:
                 h[:,i] += 1./(1j*omega(src.freq)) * MeMuI * S_m
 
-            h_p = src.h_p(self.survey.prob)
-            if h_p is not None:
-                h[:,i] += h_p 
+            hPrimary = src.hPrimary(self.survey.prob)
+            if hPrimary is not None:
+                h[:,i] += hPrimary 
 
         return h
 
@@ -182,9 +182,9 @@ class FieldsFDEM_h(FieldsFDEM):
     def _h(self, h_sol, srcList):
         h = h_sol
         for i, src in enumerate(srcList):
-            h_p = src.h_p(self.survey.prob)
-            if h_p is not None:
-                h[:,i] += h_p
+            hPrimary = src.hPrimary(self.survey.prob)
+            if hPrimary is not None:
+                h[:,i] += hPrimary
             return h
 
     def _j(self, h_sol, srcList):
@@ -194,9 +194,9 @@ class FieldsFDEM_h(FieldsFDEM):
             if S_e is not None:
                 j[:,i] += -S_e
 
-            j_p = src.j_p(self.survey.prob)
-            if j_p is not None:
-                j[:,i] += j_p 
+            jPrimary = src.jPrimary(self.survey.prob)
+            if jPrimary is not None:
+                j[:,i] += jPrimary 
         return j
 
     def _jDeriv(self, h_sol, srcList, v, adjoint=False):

simpegEM/FDEM/SurveyFDEM.py

@@ -103,32 +103,16 @@ class SrcFDEM(Survey.BaseSrc):
     def evalDeriv(self, prob, v, adjoint=None):
         return self._getS_mDeriv(prob,v,adjoint), self._getS_eDeriv(prob,v,adjoint)
 
-    def b_p(self,prob):
-        b_p = self._getb_p(prob)
-        return b_p 
+    def bPrimary(self,prob):
+        return None 
 
-    def h_p(self,prob):
-        h_p = self._geth_p(prob)
-        return h_p
-
-    def e_p(self,prob):
-        e_p = self._gete_p(prob)
-        return e_p
-
-    def j_p(self,prob):
-        j_p = self._getj_p(prob)
-        return j_p
-
-    def _getb_p(self,prob):
+    def hPrimary(self,prob):
         return None
 
-    def _geth_p(self,prob):
+    def ePrimary(self,prob):
         return None
 
-    def _gete_p(self,prob):
-        return None
-
-    def _getj_p(self,prob):
+    def jPrimary(self,prob):
         return None
 
     def _getS_m(self,prob):
@@ -212,7 +196,7 @@ class SrcFDEM_MagDipole(SrcFDEM):
         self.moment = moment
         SrcFDEM.__init__(self, rxList)
 
-    def _getb_p(self,prob):
+    def bPrimary(self,prob):
         eqLocs = prob._eqLocs
 
         if eqLocs is 'FE':
@@ -243,12 +227,12 @@ class SrcFDEM_MagDipole(SrcFDEM):
 
         return C*a
 
-    def _geth_p(self,prob):
-        b = self._getb_p(prob)
+    def hPrimary(self,prob):
+        b = self.bPrimary(prob)
         return h_from_b(prob,b)
 
     def _getS_m(self,prob):
-        b_p = self._getb_p(prob)
+        b_p = self.bPrimary(prob)
         return -1j*omega(self.freq)*b_p 
 
 
@@ -264,7 +248,7 @@ class SrcFDEM_MagDipole_Bfield(SrcFDEM):
         self.moment = moment
         SrcFDEM.__init__(self, rxList)
 
-    def _getb_p(self,prob):
+    def bPrimary(self,prob):
         eqLocs = prob._eqLocs
 
         if eqLocs is 'FE':
@@ -295,12 +279,12 @@ class SrcFDEM_MagDipole_Bfield(SrcFDEM):
 
         return b
 
-    def _geth_p(self,prob):
-        b = self._getb_p(prob)
+    def hPrimary(self,prob):
+        b = self.bPrimary(prob)
         return h_from_b(prob, b)
 
     def _getS_m(self,prob):
-        b = self._getb_p(prob)
+        b = self.bPrimary(prob)
         return -1j*omega(self.freq)*b
 
 
@@ -313,7 +297,7 @@ class SrcFDEM_CircularLoop(SrcFDEM):
         self.radius = radius
         SrcFDEM.__init__(self, rxList)
 
-    def _getb_p(self,prob):
+    def bPrimary(self,prob):
         eqLocs = prob._eqLocs
 
         if eqLocs is 'FE':
@@ -343,12 +327,12 @@ class SrcFDEM_CircularLoop(SrcFDEM):
 
         return C*a
 
-    def _geth_p(self,prob):
-        b = self._getb_p(prob)
+    def hPrimary(self,prob):
+        b = self.bPrimary(prob)
         return h_from_b
 
     def _getS_m(self, prob):
-        b = self._getb_p(prob)
+        b = self.bPrimary(prob)
         return -1j*omega(self.freq)*b