[cig-commits] [commit] baagaard/remove-1d: More updates to Python unit tests to remove 1-D stuff. (d3fe697)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : baagaard/remove-1d
Link       : https://github.com/geodynamics/pylith/compare/fee2d21087aa203cf566bb3844f5706379cfbc36...d3fe6972a3be6d0d40c76fd347f820a00d067380

>---------------------------------------------------------------

commit d3fe6972a3be6d0d40c76fd347f820a00d067380
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Thu Nov 7 14:25:00 2013 -0800

    More updates to Python unit tests to remove 1-D stuff.


>---------------------------------------------------------------

d3fe6972a3be6d0d40c76fd347f820a00d067380
 unittests/pytests/materials/data/twoelems.mesh | 19 ++++++++++---------
 unittests/pytests/meshio/TestCellFilterAvg.py  |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/unittests/pytests/materials/data/twoelems.mesh b/unittests/pytests/materials/data/twoelems.mesh
index 2f4377d..c849756 100644
--- a/unittests/pytests/materials/data/twoelems.mesh
+++ b/unittests/pytests/materials/data/twoelems.mesh
@@ -1,20 +1,21 @@
 mesh = {
-  dimension = 1
+  dimension = 2
   vertices = {
-    dimension = 1
-    count = 3
+    dimension = 2
+    count = 4
     coordinates = {
-      0  -1.0
-      1   0.0
-      2   1.0
+      0  -1.0   0.0
+      1   0.0  -1.0
+      2   0.0  +1.0
+      3   1.0   0.0
     }
   }
   cells = {
-    num-corners = 2
+    num-corners = 3
     count = 2
     simplices = {
-      0   0  1
-      1   1  2
+      0   0  1  2
+      1   1  3  2
     }
     material-ids = {
       0  54
diff --git a/unittests/pytests/meshio/TestCellFilterAvg.py b/unittests/pytests/meshio/TestCellFilterAvg.py
index 7dad646..ec9f5ae 100644
--- a/unittests/pytests/meshio/TestCellFilterAvg.py
+++ b/unittests/pytests/meshio/TestCellFilterAvg.py
@@ -44,11 +44,11 @@ class TestCellFilterAvg(unittest.TestCase):
     """
     Test constructor.
     """
-    spaceDim = 1
+    spaceDim = 2
     
     from pylith.feassemble.FIATSimplex import FIATSimplex
     cell = FIATSimplex()
-    cell.inventory.dimension = 1
+    cell.inventory.dimension = 2
     cell.inventory.degree = 2
     cell.inventory.order = 2
     cell._configure()