From 72510420a6dff1de407b157e3046619718c603df Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Sun, 23 Feb 2014 13:52:23 -0800 Subject: [PATCH] testCylEdgeCurl start --- SimPEG/Mesh/CylMesh.py | 2 ++ SimPEG/Tests/test_cylMesh.py | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/SimPEG/Mesh/CylMesh.py b/SimPEG/Mesh/CylMesh.py index 21a178c5..267533a6 100644 --- a/SimPEG/Mesh/CylMesh.py +++ b/SimPEG/Mesh/CylMesh.py @@ -217,6 +217,8 @@ class CylMesh(BaseTensorMesh): @property def edgeCurl(self): """The edgeCurl property.""" + if self.nCy > 1: + raise NotImplementedError('Edge curl not yet implemented for nCy > 1') if getattr(self, '_edgeCurl', None) is None: #1D Difference matricies dr = sp.spdiags((np.ones((self.nCx+1, 1))*[-1, 1]).T, [-1,0], self.nCx, self.nCx, format="csr") diff --git a/SimPEG/Tests/test_cylMesh.py b/SimPEG/Tests/test_cylMesh.py index bbe44bb7..cd6ba6da 100644 --- a/SimPEG/Tests/test_cylMesh.py +++ b/SimPEG/Tests/test_cylMesh.py @@ -136,7 +136,6 @@ class TestCyl2DMesh(unittest.TestCase): MESHTYPES = ['uniformCylMesh'] -MESHDIMENSION = 2 call2 = lambda fun, xyz: fun(xyz[:, 0], xyz[:, 2]) call3 = lambda fun, xyz: fun(xyz[:, 0], xyz[:, 1], xyz[:, 2]) cyl_row2 = lambda g, xfun, yfun: np.c_[call2(xfun, g), call2(yfun, g)] @@ -147,10 +146,10 @@ cylF2 = lambda M, fx, fy: np.vstack((cyl_row2(M.gridFx, fx, fy), cyl_row2(M.grid # cylE3 = lambda M, ex, ey, ez: np.vstack((cyl_row3(M.gridEx, ex, ey, ez), cyl_row3(M.gridEy, ex, ey, ez), cyl_row3(M.gridEz, ex, ey, ez))) -class TestFaceDiv(OrderTest): +class TestFaceDiv2D(OrderTest): name = "FaceDiv" meshTypes = MESHTYPES - meshDimension = MESHDIMENSION + meshDimension = 2 def getError(self): @@ -173,6 +172,18 @@ class TestFaceDiv(OrderTest): def test_order(self): self.orderTest() +class TestEdgeCurl2D(OrderTest): + name = "EdgeCurl" + meshTypes = MESHTYPES + meshDimension = 2 + + def getError(self): + + #TODO! + + # def test_order(self): + # self.orderTest() + class TestCyl3DMesh(unittest.TestCase): def setUp(self):