renamed folder 'code' to 'SimPEG'

new folder for ipython notebooks
improved 2D plots

SimPEG/tests/runTests.py

@@ -0,0 +1,11 @@
+import glob
+import unittest
+
+# This code will run all tests in directory named test_*.py
+
+test_file_strings = glob.glob('test_*.py')
+module_strings = [str[0:len(str)-3] for str in test_file_strings]
+suites = [unittest.defaultTestLoader.loadTestsFromName(str) for str
+          in module_strings]
+testSuite = unittest.TestSuite(suites)
+text_runner = unittest.TextTestRunner().run(testSuite)

SimPEG/tests/runTests.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+python -m unittest discover

SimPEG/tests/test_basemesh.py

@@ -0,0 +1,88 @@
+import unittest
+import sys
+sys.path.append('../')
+from BaseMesh import BaseMesh
+import numpy as np
+
+
+class TestBaseMesh(unittest.TestCase):
+
+    def setUp(self):
+        self.mesh = BaseMesh([6, 2, 3])
+
+    def test_meshDimensions(self):
+        self.assertTrue(self.mesh.dim, 3)
+
+    def test_mesh_nc(self):
+        self.assertTrue(np.all(self.mesh.n == [6, 2, 3]))
+
+    def test_mesh_nc_xyz(self):
+        x = np.all(self.mesh.nCx == 6)
+        y = np.all(self.mesh.nCy == 2)
+        z = np.all(self.mesh.nCz == 3)
+
+        self.assertTrue(np.all([x, y, z]))
+
+    def test_mesh_nf(self):
+        x = np.all(self.mesh.nFx == [7, 2, 3])
+        y = np.all(self.mesh.nFy == [6, 3, 3])
+        z = np.all(self.mesh.nFz == [6, 2, 4])
+
+        self.assertTrue(np.all([x, y, z]))
+
+    def test_mesh_ne(self):
+        x = np.all(self.mesh.nEx == [6, 3, 4])
+        y = np.all(self.mesh.nEy == [7, 2, 4])
+        z = np.all(self.mesh.nEz == [7, 3, 3])
+
+        self.assertTrue(np.all([x, y, z]))
+
+    def test_mesh_numbers(self):
+        c = self.mesh.nC == 36
+        f = np.all(self.mesh.nF == [42, 54, 48])
+        e = np.all(self.mesh.nE == [72, 56, 63])
+
+        self.assertTrue(np.all([c, f, e]))
+
+
+class TestMeshNumbers2D(unittest.TestCase):
+
+    def setUp(self):
+        self.mesh = BaseMesh([6, 2])
+
+    def test_meshDimensions(self):
+        self.assertTrue(self.mesh.dim, 2)
+
+    def test_mesh_nc(self):
+        self.assertTrue(np.all(self.mesh.n == [6, 2]))
+
+    def test_mesh_nc_xyz(self):
+        x = np.all(self.mesh.nCx == 6)
+        y = np.all(self.mesh.nCy == 2)
+        z = self.mesh.nCz is None
+
+        self.assertTrue(np.all([x, y, z]))
+
+    def test_mesh_nf(self):
+        x = np.all(self.mesh.nFx == [7, 2])
+        y = np.all(self.mesh.nFy == [6, 3])
+        z = self.mesh.nFz is None
+
+        self.assertTrue(np.all([x, y, z]))
+
+    def test_mesh_ne(self):
+        x = np.all(self.mesh.nEx == [6, 3])
+        y = np.all(self.mesh.nEy == [7, 2])
+        z = self.mesh.nEz is None
+
+        self.assertTrue(np.all([x, y, z]))
+
+    def test_mesh_numbers(self):
+        c = self.mesh.nC == 12
+        f = np.all(self.mesh.nF == [14, 18])
+        e = np.all(self.mesh.nE == [18, 14])
+
+        self.assertTrue(np.all([c, f, e]))
+
+if __name__ == '__main__':
+    unittest.main()

SimPEG/tests/test_div.py

@@ -0,0 +1,45 @@
+import numpy as np
+
+import sys
+sys.path.append('../')
+from TensorMesh import TensorMesh
+from getDIV import getDivMatrix, getarea, getvol
+
+# Define the mesh
+err=0.
+for i in range(4):
+    icount=i+1;
+    nc = 2*icount;
+    h1 = np.pi/nc*np.ones((1,nc))
+    h2 = np.pi/nc*np.ones((1,nc))
+    h3 = np.pi/nc*np.ones((1,nc))
+    h = [h1, h2, h3]
+    x0 = -np.pi/2*np.ones((3, 1))
+    M = TensorMesh(h, x0)
+    #n = M.plotGrid()
+
+    # Generate DIV matrix
+    DIV = getDivMatrix(h)
+    
+    #Test function
+    fun = lambda x: np.sin(x)
+    Fx = fun(M.gridFx[:,0])
+    Fy = fun(M.gridFy[:,1])
+    Fz = fun(M.gridFz[:,2])
+    
+    F = np.concatenate((Fx,Fy,Fz))
+    divF = DIV*F
+    sol = lambda x, y, z: (np.cos(x)+np.cos(y)+np.cos(z))
+    divF_anal = sol(M.gridCC[:,0], M.gridCC[:,1], M.gridCC[:,2])
+     
+    area = getarea(h)
+    vol = getvol(h)
+    err = np.linalg.norm((divF-divF_anal)*np.sqrt(vol), 2)
+    if icount == 1:
+        err1 = err
+        print 'h       |   2 norm   | error ratio'        
+        print '---------------------------------------'                
+        print '%6.4f  |  %8.2e  |'% (h1[0,0], err)
+    else:
+        print '%6.4f  |  %8.2e  |  %6.4f' % (h1[0,0], err, err1/err)
+        

SimPEG/tests/test_tensorMesh.py

@@ -0,0 +1,34 @@
+import numpy as np
+import unittest
+import sys
+sys.path.append('../')
+from TensorMesh import TensorMesh
+
+
+class TestSequenceFunctions(unittest.TestCase):
+
+    def setUp(self):
+        a = np.array([1, 1, 1])
+        b = np.array([1, 2])
+        x0 = np.array([3, 5])
+        self.mesh2 = TensorMesh([a, b], x0)
+
+    def test_vectorN_2D(self):
+        testNx = np.array([3, 4, 5, 6])
+        testNy = np.array([5, 6, 8])
+
+        xtest = np.all(self.mesh2.vectorNx == testNx)
+        ytest = np.all(self.mesh2.vectorNy == testNy)
+        self.assertTrue(xtest and ytest)
+
+    def test_vectorCC_2D(self):
+        testNx = np.array([3.5, 4.5, 5.5])
+        testNy = np.array([5.5, 7])
+
+        xtest = np.all(self.mesh2.vectorCCx == testNx)
+        ytest = np.all(self.mesh2.vectorCCy == testNy)
+        self.assertTrue(xtest and ytest)
+
+
+if __name__ == '__main__':
+    unittest.main()

SimPEG/tests/test_utils.py

@@ -0,0 +1,53 @@
+import numpy as np
+import unittest
+import sys
+sys.path.append('../')
+from utils import mkvc, ndgrid
+
+
+class TestSequenceFunctions(unittest.TestCase):
+
+    def setUp(self):
+        self.a = np.array([1, 2, 3])
+        self.b = np.array([1, 2])
+        self.c = np.array([1, 2, 3, 4])
+
+    def test_mkvc1(self):
+        x = mkvc(self.a)
+        self.assertTrue(x.shape, (3,))
+
+    def test_mkvc2(self):
+        x = mkvc(self.a, 2)
+        self.assertTrue(x.shape, (3, 1))
+
+    def test_mkvc3(self):
+        x = mkvc(self.a, 3)
+        self.assertTrue(x.shape, (3, 1, 1))
+
+    def test_ndgrid_2D(self):
+        XY = ndgrid([self.a, self.b])
+
+        X1_test = np.array([1, 2, 3, 1, 2, 3])
+        X2_test = np.array([1, 1, 1, 2, 2, 2])
+
+        xtest = np.all(XY[:, 0] == X1_test)
+        ytest = np.all(XY[:, 1] == X2_test)
+
+        self.assertTrue(xtest and ytest)
+
+    def test_ndgrid_3D(self):
+        XYZ = ndgrid([self.a, self.b, self.c])
+
+        X1_test = np.array([1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3])
+        X2_test = np.array([1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2, 1, 1, 1, 2, 2, 2])
+        X3_test = np.array([1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4])
+
+        xtest = np.all(XYZ[:, 0] == X1_test)
+        ytest = np.all(XYZ[:, 1] == X2_test)
+        ztest = np.all(XYZ[:, 2] == X3_test)
+
+        self.assertTrue(xtest and ytest and ztest)
+
+if __name__ == '__main__':
+    unittest.main()
+