Changed Mesh to BaseMesh.

Added conventions of n{C-F-E}{x-y-z} so mesh.nCx will return the number of cells in the x direction.

Added a unitTest to ensure the mesh dimensions.
This commit is contained in:
Rowan Cockett
2013-07-05 16:00:19 -07:00
parent 13325e63fc
commit e9d41ab95f
4 changed files with 267 additions and 204 deletions
+88
View File
@@ -0,0 +1,88 @@
import unittest
import sys
sys.path.append('../')
from BaseMesh import BaseMesh
import numpy as np
class TestMeshNumbers3D(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()
-74
View File
@@ -1,74 +0,0 @@
import unittest
import sys
sys.path.append('../')
from Mesh import Mesh
import numpy as np
class TestMeshNumbers3D(unittest.TestCase):
def setUp(self):
self.mesh = Mesh([6, 2, 3])
def test_meshDimensions(self):
self.assertTrue(self.mesh.dim, 3)
def test_mesh_nc(self):
self.assertTrue(np.all(self.mesh.nc == [6, 2, 3]))
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.ncells == 36
f = np.all(self.mesh.nfaces == [42, 54, 48])
e = np.all(self.mesh.nedges == [72, 56, 63])
self.assertTrue(np.all([c, f, e]))
class TestMeshNumbers2D(unittest.TestCase):
def setUp(self):
self.mesh = Mesh([6, 2])
def test_meshDimensions(self):
self.assertTrue(self.mesh.dim, 2)
def test_mesh_nc(self):
self.assertTrue(np.all(self.mesh.nc == [6, 2]))
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.ncells == 12
f = np.all(self.mesh.nfaces == [14, 18])
e = np.all(self.mesh.nedges == [18, 14])
self.assertTrue(np.all([c, f, e]))
if __name__ == '__main__':
unittest.main()