From 994bb2159e3bd38d142a4c26fff0d39edadab940 Mon Sep 17 00:00:00 2001
From: rowanc1 <rowan@visiblegeology.com>
Date: Wed, 5 Mar 2014 16:33:30 -0800
Subject: [PATCH] Tested Jvec for FDEM

---
 simpegEM/FDEM/FDEM.py       |  4 +--
 simpegEM/Tests/test_FDEM.py | 57 +++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 simpegEM/Tests/test_FDEM.py

diff --git a/simpegEM/FDEM/FDEM.py b/simpegEM/FDEM/FDEM.py
index 7436266d..69cfda14 100644
--- a/simpegEM/FDEM/FDEM.py
+++ b/simpegEM/FDEM/FDEM.py
@@ -109,7 +109,7 @@ class ProblemFDEM_e(Problem.BaseProblem):
         for i, freqInd in enumerate(range(self.data.nFreq)):
             e = u.get_e(freqInd)
             omega = self.data.omega[freqInd]
-            for txInd in self.data.nTx
+            # for txInd in self.data.nTx
             b = 1j*omega*self.mesh.getEdgeInnerProductDeriv(m,v=e)*self.model.transformDeriv(m)*v
             A = self.getA(freqInd)
             Ab = Solver(A, options=self.solveOpts).solve(b)
@@ -168,7 +168,7 @@ if __name__ == '__main__':
     prb.j_s = j_s
     f = prb.fields(sigma)
 
-    colorbar(mesh.plotSlice((f.get_e(3)), 'E', ind=11, normal='Z', view='real')[0])
+    plt.colorbar(mesh.plotSlice((f.get_e(3)), 'E', ind=11, normal='Z', view='real')[0])
     plt.show()
 
 
diff --git a/simpegEM/Tests/test_FDEM.py b/simpegEM/Tests/test_FDEM.py
new file mode 100644
index 00000000..a04a52b2
--- /dev/null
+++ b/simpegEM/Tests/test_FDEM.py
@@ -0,0 +1,57 @@
+import unittest
+from SimPEG import *
+import simpegEM as EM
+
+class TDEM_bDerivTests(unittest.TestCase):
+
+    def setUp(self):
+
+        cs = 5.
+        ncx = 2
+        ncy = 2
+        ncz = 2
+        npad = 3
+        hx = Utils.meshTensors(((npad,cs), (ncx,cs), (npad,cs)))
+        hy = Utils.meshTensors(((npad,cs), (ncy,cs), (npad,cs)))
+        hz = Utils.meshTensors(((npad,cs), (ncz,cs), (npad,cs)))
+        mesh = Mesh.TensorMesh([hx,hy,hz])
+
+        XY = Utils.ndgrid(np.linspace(20,50,3), np.linspace(20,50,3))
+        rxLoc = np.c_[XY, np.ones(XY.shape[0])*40]
+
+        model = Model.LogModel(mesh)
+
+        opts = {'txLoc':0.,
+            'txType':'VMD_MVP',
+            'rxLoc': rxLoc,
+            'rxType':'bz',
+            'freq': np.logspace(0,3,4),
+            }
+        dat = EM.FDEM.DataFDEM(**opts)
+
+        prb = EM.FDEM.ProblemFDEM_e(mesh, model)
+        prb.pair(dat)
+
+        sigma = np.log(np.ones(mesh.nC)*1e-3)
+
+        j_sx = np.zeros(mesh.vnEx)
+        j_sx[4,4,4] = 1
+        j_s = np.r_[Utils.mkvc(j_sx),np.zeros(mesh.nEy+mesh.nEz)]
+
+        prb.j_s = j_s
+        f = prb.fields(sigma)
+
+        self.sigma = sigma
+        self.prb = prb
+        self.dat = dat
+
+    def test_JVec(self):
+        x0 = self.sigma
+        def fun(x):
+            return self.dat.dpred(x), lambda x: self.prb.Jvec(x0, x)
+        passed = Tests.checkDerivative(fun, x0, num=3, plotIt=False)
+        self.assertTrue(passed)
+
+
+if __name__ == '__main__':
+    unittest.main()