clean up of tests

simpegEM/Tests/test_FDEM_analytics.py

@@ -76,7 +76,6 @@ class FDEM_analyticTests(unittest.TestCase):
         orderMag = 1.6
         passed = np.abs(np.mean(diff - np.log10(np.abs(mu_0*np.imag(an))))) > orderMag
         self.assertTrue(passed)
-        return passed
 
 
 if __name__ == '__main__':

simpegEM/Tests/test_TDEM_b_DerivAdjoint.py

@@ -95,7 +95,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         u1 = A*f.tovec()
         u2 = prb._AhVec(sigma,f).tovec()
 
-        return np.linalg.norm(u1-u2)/np.linalg.norm(u1)<1e-12
+        self.assertTrue(np.linalg.norm(u1-u2)/np.linalg.norm(u1)<1e-12)
 
     def test_solveAhVSMat_OneTS(self):
         prb = self.prb
@@ -121,7 +121,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         u1 = prb.solveAh(sigma,f).tovec().flatten()
         u2 = sp.linalg.spsolve(A.tocsr(),f.tovec())
 
-        return np.linalg.norm(u1-u2),1e-8
+        self.assertTrue(np.linalg.norm(u1-u2)<1e-8)
 
     def test_solveAhVsAhVec(self):
 
@@ -140,7 +140,7 @@ class TDEM_bDerivTests(unittest.TestCase):
 
         u1 = f.tovec()
         u2 = f_test.tovec()
-        return np.linalg.norm(u1-u2)<1e-8
+        self.assertTrue(np.linalg.norm(u1-u2)<1e-8)
 
     def test_DerivG(self):
         """
@@ -172,8 +172,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         derChk = lambda m: [self.prb.fields(m).tovec(), lambda mx: -prb.solveAh(sigma, prb.Gvec(sigma, mx, u=f)).tovec()]
         print '\n'
         print 'test_Deriv_dUdM'
-        passed = Tests.checkDerivative(derChk, sigma, plotIt=False, dx=dm, num=4, eps=1e-20)
-        return passed 
+        Tests.checkDerivative(derChk, sigma, plotIt=False, dx=dm, num=4, eps=1e-20)
 
     def test_Deriv_J(self):
 
@@ -189,8 +188,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         derChk = lambda m: [prb.survey.dpred(m), lambda mx: prb.Jvec(sigma, mx)]
         print '\n'
         print 'test_Deriv_J'
-        passed = Tests.checkDerivative(derChk, sigma, plotIt=False, dx=d_sig, num=4, eps=1e-20)
-        return passed 
+        Tests.checkDerivative(derChk, sigma, plotIt=False, dx=d_sig, num=4, eps=1e-20)
 
     def test_projectAdjoint(self):
         prb = self.prb
@@ -209,7 +207,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         V1 = d_vec.dot(survey.projectFieldsDeriv(None, v=f).tovec())
         V2 = f.tovec().dot(survey.projectFieldsDeriv(None, v=d, adjoint=True).tovec())
 
-        return (V1-V2)/np.abs(V1) < tol
+        self.assertTrue((V1-V2)/np.abs(V1) < tol)
 
     def test_adjointAhVsAht(self):
         prb = self.prb
@@ -228,7 +226,7 @@ class TDEM_bDerivTests(unittest.TestCase):
 
         V1 = f2.tovec().dot(prb._AhVec(sigma, f1).tovec())
         V2 = f1.tovec().dot(prb._AhtVec(sigma, f2).tovec())
-        return np.abs(V1-V2)/np.abs(V1) < tol
+        self.assertTrue(np.abs(V1-V2)/np.abs(V1) < tol)
 
     # def test_solveAhtVsAhtVec(self):
     #     prb = self.prb
@@ -293,7 +291,7 @@ class TDEM_bDerivTests(unittest.TestCase):
 
         V1 = m.dot(prb.Gtvec(sigma, v, u))
         V2 = v.tovec().dot(prb.Gvec(sigma, m, u).tovec())
-        return np.abs(V1-V2)/np.abs(V1) < tol
+        self.assertTrue(np.abs(V1-V2)/np.abs(V1) < tol)
 
     def test_adjointJvecVsJtvec(self):
         mesh = self.mesh
@@ -307,7 +305,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         V2 = m.dot(prb.Jtvec(sigma, d))
         passed = np.abs(V1-V2)/np.abs(V1) < tol
         print 'AdjointTest', V1, V2, passed
-        return passed
+        self.assertTrue(passed)
         
 
 

simpegEM/Tests/test_TDEM_b_MultiSrc_DerivAdjoint.py

@@ -60,8 +60,7 @@ class TDEM_bDerivTests(unittest.TestCase):
 
         derChk = lambda m: [self.prb._AhVec(m, f).tovec(), lambda mx: self.prb.Gvec(sigma, mx, u=f).tovec()]
         print '\ntest_DerivG'
-        passed = Tests.checkDerivative(derChk, sigma, plotIt=False, dx=dm, num=4, eps=1e-20)
-        return passed
+        Tests.checkDerivative(derChk, sigma, plotIt=False, dx=dm, num=4, eps=1e-20)
 
     def test_Deriv_dUdM(self):
 
@@ -76,8 +75,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         derChk = lambda m: [self.prb.fields(m).tovec(), lambda mx: -prb.solveAh(sigma, prb.Gvec(sigma, mx, u=f)).tovec()]
         print '\n'
         print 'test_Deriv_dUdM'
-        passed = Tests.checkDerivative(derChk, sigma, plotIt=False, dx=dm, num=4, eps=1e-20)
-        return passed
+        Tests.checkDerivative(derChk, sigma, plotIt=False, dx=dm, num=4, eps=1e-20)
 
     def test_Deriv_J(self):
 
@@ -93,8 +91,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         derChk = lambda m: [prb.survey.dpred(m), lambda mx: prb.Jvec(sigma, mx)]
         print '\n'
         print 'test_Deriv_J'
-        passed = Tests.checkDerivative(derChk, sigma, plotIt=False, dx=d_sig, num=4, eps=1e-20)
-        return passed
+        Tests.checkDerivative(derChk, sigma, plotIt=False, dx=d_sig, num=4, eps=1e-20)
 
     def test_projectAdjoint(self):
         prb = self.prb
@@ -114,7 +111,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         V1 = d_vec.dot(survey.projectFieldsDeriv(None, v=f).tovec())
         V2 = np.sum((f.tovec())*(survey.projectFieldsDeriv(None, v=d, adjoint=True).tovec()))
 
-        return (V1-V2)/np.abs(V1) < 1e-6
+        self.assertTrue((V1-V2)/np.abs(V1) < 1e-6)
 
     def test_adjointGvecVsGtvec(self):
         mesh = self.mesh
@@ -135,7 +132,7 @@ class TDEM_bDerivTests(unittest.TestCase):
 
         V1 = m.dot(prb.Gtvec(sigma, v, u))
         V2 = np.sum(v.tovec()*prb.Gvec(sigma, m, u).tovec())
-        return np.abs(V1-V2)/np.abs(V1) <1e-6
+        self.assertTrue(np.abs(V1-V2)/np.abs(V1) <1e-6)
 
     def test_adjointJvecVsJtvec(self):
         mesh = self.mesh
@@ -148,7 +145,7 @@ class TDEM_bDerivTests(unittest.TestCase):
         V1 = d.dot(prb.Jvec(sigma, m))
         V2 = m.dot(prb.Jtvec(sigma, d))
         print 'AdjointTest', V1, V2
-        return np.abs(V1-V2)/np.abs(V1) < 1e-6
+        self.assertTrue(np.abs(V1-V2)/np.abs(V1) < 1e-6)