From 5c85f13cb6073f72bfea0eaac75f05041efce52c Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Tue, 10 Feb 2015 12:42:35 -0800 Subject: [PATCH] test counting, put dummies in for grid3D calcs --- SimPEG/Mesh/NewTreeMesh.py | 8 +++++++ SimPEG/Tests/test_NewTreeMesh.py | 38 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/SimPEG/Mesh/NewTreeMesh.py b/SimPEG/Mesh/NewTreeMesh.py index 681ff3b9..7c484683 100644 --- a/SimPEG/Mesh/NewTreeMesh.py +++ b/SimPEG/Mesh/NewTreeMesh.py @@ -375,6 +375,10 @@ class TreeMesh(BaseMesh): return np.c_[Ex, Ey][P, :] + @property + def gridEz(self): + pass + @property def gridFx(self): if self.dim == 2: @@ -385,6 +389,10 @@ class TreeMesh(BaseMesh): if self.dim == 2: return self.gridEx + @property + def gridFz(self): + pass + def _push(self, attr, rows): self.isNumbered = False rows = np.atleast_2d(rows) diff --git a/SimPEG/Tests/test_NewTreeMesh.py b/SimPEG/Tests/test_NewTreeMesh.py index 3d9807e5..a2a8235f 100644 --- a/SimPEG/Tests/test_NewTreeMesh.py +++ b/SimPEG/Tests/test_NewTreeMesh.py @@ -102,6 +102,44 @@ class SimpleOctreeOperatorTests(unittest.TestCase): +class TestOcTreeObjects(unittest.TestCase): + + def setUp(self): + self.M = TreeMesh([2,1,1]) + self.M.number() + + # self.Mr = TreeMesh([2,1,1]) + # self.Mr.children[0,0,0].refine() + # self.Mr.number() + + def test_counts(self): + self.assertTrue(self.M.nC == 2) + self.assertTrue(self.M.nFx == 3) + self.assertTrue(self.M.nFy == 4) + self.assertTrue(self.M.nFz == 4) + self.assertTrue(self.M.nF == 11) + self.assertTrue(self.M.nEx == 8) + self.assertTrue(self.M.nEy == 6) + self.assertTrue(self.M.nEz == 6) + self.assertTrue(self.M.nE == 20) + self.assertTrue(self.M.nN == 12) + + # self.assertTrue(self.Mr.nC == 9) + # self.assertTrue(self.Mr.nFx == 13) + # self.assertTrue(self.Mr.nFy == 14) + # self.assertTrue(self.Mr.nFz == 14) + # self.assertTrue(self.Mr.nF == 41) + + + # for cell in self.Mr.sortedCells: + # for e in cell.edgeDict: + # self.assertTrue(cell.edgeDict[e].edgeType==e[1].lower()) + + # self.assertTrue(self.Mr.nN == 31) + # self.assertTrue(self.Mr.nEx == 22) + # self.assertTrue(self.Mr.nEy == 20) + # self.assertTrue(self.Mr.nEz == 20) + if __name__ == '__main__': unittest.main()