merged in em/dev

SimPEG/EM/FDEM/FDEM.py

@@ -92,8 +92,7 @@ class BaseFDEMProblem(BaseEMProblem):
                     df_dmFun = getattr(u, '_%sDeriv'%rx.projField, None)
                     df_dm_v = df_dmFun(src, du_dm_v, v, adjoint=False)
                     df_dm_v = np.array(df_dm_v,dtype=complex)
-                    Jv[src, rx] = rx.projectFieldsDeriv(src, self.mesh, u, df_dm_v)
-
+                    Jv[src, rx] = rx.evalDeriv(src, self.mesh, u, df_dm_v)
             Ainv.clean()
         return Utils.mkvc(Jv)
 
@@ -128,7 +127,7 @@ class BaseFDEMProblem(BaseEMProblem):
                 u_src = u[src, ftype]
 
                 for rx in src.rxList:
-                    PTv = rx.projectFieldsDeriv(src, self.mesh, u, v[src, rx], adjoint=True) # wrt u, need possibility wrt m
+                    PTv = rx.evalDeriv(src, self.mesh, u, v[src, rx], adjoint=True) # wrt u, need possibility wrt m
 
                     df_duTFun = getattr(u, '_%sDeriv'%rx.projField, None)
                     df_duT, df_dmT = df_duTFun(src, None, PTv, adjoint=True)

SimPEG/EM/FDEM/SurveyFDEM.py

@@ -66,7 +66,7 @@ class Rx(SimPEG.Survey.BaseRx):
         """Component projection (real/imag)"""
         return self.knownRxTypes[self.rxType][2]
 
-    def projectFields(self, src, mesh, f):
+    def eval(self, src, mesh, f):
         """
         Project fields to recievers to get data.
 
@@ -82,7 +82,7 @@ class Rx(SimPEG.Survey.BaseRx):
         u_part = getattr(u_part_complex, real_or_imag)
         return P*u_part
 
-    def projectFieldsDeriv(self, src, mesh, f, v, adjoint=False):
+    def evalDeriv(self, src, mesh, f, v, adjoint=False):
         """
         Derivative of projected fields with respect to the inversion model times a vector.
 
@@ -170,7 +170,7 @@ class Survey(SimPEG.Survey.BaseSurvey):
         assert freq in self._freqDict, "The requested frequency is not in this survey."
         return self._freqDict[freq]
 
-    def projectFields(self, u):
+    def eval(self, u):
         """
         Project fields to receiver locations
         :param Fields u: fields object
@@ -180,8 +180,8 @@ class Survey(SimPEG.Survey.BaseSurvey):
         data = SimPEG.Survey.Data(self)
         for src in self.srcList:
             for rx in src.rxList:
-                data[src, rx] = rx.projectFields(src, self.mesh, u)
+                data[src, rx] = rx.eval(src, self.mesh, u)
         return data
 
-    def projectFieldsDeriv(self, u):
+    def evalDeriv(self, u):
         raise Exception('Use Receivers to project fields deriv.')

SimPEG/EM/TDEM/SurveyTDEM.py

@@ -48,15 +48,18 @@ class Rx(Survey.BaseTimeRx):
         else:
             return timeMesh.getInterpolationMat(self.times, self.projTLoc)
 
-    def projectFields(self, src, mesh, timeMesh, u):
+    def eval(self, src, mesh, timeMesh, u):
         P = self.getP(mesh, timeMesh)
         u_part = Utils.mkvc(u[src, self.projField, :])
         return P*u_part
 
-    def projectFieldsDeriv(self, src, mesh, timeMesh, u, v, adjoint=False):
+    def evalDeriv(self, src, mesh, timeMesh, u, v, adjoint=False):
         P = self.getP(mesh, timeMesh)
 
         if not adjoint:
             return P * Utils.mkvc(v[src, self.projField, :])
         elif adjoint:
-            return P.T * v[src, self]
+            return P.T * v[src, self]
+
+
+

SimPEG/EM/TDEM_old/BaseTDEM.py

@@ -128,7 +128,7 @@ class BaseTDEMProblem(BaseTimeProblem, BaseEMProblem):
             u = self.fields(m)
         p = self.Gvec(m, v, u)
         y = self.solveAh(m, p)
-        Jv = self.survey.projectFieldsDeriv(u, v=y)
+        Jv = self.survey.evalDeriv(u, v=y)
         if self.verbose: print '%s\nDone calculating J(v)\n%s'%('*'*50,'*'*50)
         return - mkvc(Jv)
 
@@ -155,7 +155,7 @@ class BaseTDEMProblem(BaseTimeProblem, BaseEMProblem):
         if not isinstance(v, self.dataPair):
             v = self.dataPair(self.survey, v)
 
-        p = self.survey.projectFieldsDeriv(u, v=v, adjoint=True)
+        p = self.survey.evalDeriv(u, v=v, adjoint=True)
         y = self.solveAht(m, p)
         w = self.Gtvec(m, y, u)
         if self.verbose: print '%s\nDone calculating J^T(v)\n%s'%('*'*50,'*'*50)