fieldType --> solutionType

SimPEG/EM/FDEM/FDEM.py

@@ -54,8 +54,7 @@ class BaseFDEMProblem(BaseEMProblem):
             Ainv = self.Solver(A, **self.solverOpts)
             sol = Ainv * rhs
             Srcs = self.survey.getSrcByFreq(freq)
-            ftype = self._fieldType + 'Solution'
-            F[Srcs, ftype] = sol
+            F[Srcs, self._solutionType] = sol
             Ainv.clean()
         return F
 
@@ -82,8 +81,7 @@ class BaseFDEMProblem(BaseEMProblem):
             Ainv = self.Solver(A, **self.solverOpts)
 
             for src in self.survey.getSrcByFreq(freq):
-                ftype = self._fieldType + 'Solution'
-                u_src = u[src, ftype]
+                u_src = u[src, self._solutionType]
                 dA_dm_v = self.getADeriv(freq, u_src, v)
                 dRHS_dm_v = self.getRHSDeriv(freq, src, v) 
                 du_dm_v = Ainv * ( - dA_dm_v + dRHS_dm_v )
@@ -123,8 +121,7 @@ class BaseFDEMProblem(BaseEMProblem):
             ATinv = self.Solver(AT, **self.solverOpts)
 
             for src in self.survey.getSrcByFreq(freq):
-                ftype = self._fieldType + 'Solution'
-                u_src = u[src, ftype]
+                u_src = u[src, self._solutionType]
 
                 for rx in src.rxList:
                     PTv = rx.evalDeriv(src, self.mesh, u, v[src, rx], adjoint=True) # wrt u, need possibility wrt m
@@ -201,9 +198,9 @@ class Problem_e(BaseFDEMProblem):
     :param SimPEG.Mesh mesh: mesh
     """
 
-    _fieldType = 'e'
-    _formulation = 'EB'
-    fieldsPair = Fields_e
+    _solutionType = 'eSolution'
+    _formulation  = 'EB'
+    fieldsPair    = Fields_e
 
     def __init__(self, mesh, **kwargs):
         BaseFDEMProblem.__init__(self, mesh, **kwargs)
@@ -312,9 +309,9 @@ class Problem_b(BaseFDEMProblem):
     :param SimPEG.Mesh mesh: mesh
     """
 
-    _fieldType = 'b'
-    _formulation = 'EB'
-    fieldsPair = Fields_b
+    _solutionType = 'bSolution'
+    _formulation  = 'EB'
+    fieldsPair    = Fields_b
 
     def __init__(self, mesh, **kwargs):
         BaseFDEMProblem.__init__(self, mesh, **kwargs)
@@ -460,9 +457,9 @@ class Problem_j(BaseFDEMProblem):
     :param SimPEG.Mesh mesh: mesh
     """
 
-    _fieldType = 'j'
-    _formulation = 'HJ'
-    fieldsPair = Fields_j
+    _solutionType = 'jSolution'
+    _formulation  = 'HJ'
+    fieldsPair    = Fields_j
 
     def __init__(self, mesh, **kwargs):
         BaseFDEMProblem.__init__(self, mesh, **kwargs)
@@ -598,9 +595,9 @@ class Problem_h(BaseFDEMProblem):
     :param SimPEG.Mesh mesh: mesh
     """
 
-    _fieldType = 'h'
-    _formulation = 'HJ'
-    fieldsPair = Fields_h
+    _solutionType = 'hSolution'
+    _formulation  = 'HJ'
+    fieldsPair    = Fields_h
 
     def __init__(self, mesh, **kwargs):
         BaseFDEMProblem.__init__(self, mesh, **kwargs)