[cig-commits] r19250 - in short/3D/PyLith/trunk: libsrc/pylith/meshio unittests/libtests/meshio

[brad at geodynamics.org]

Author: brad
Date: 2011-11-29 16:06:51 -0800 (Tue, 29 Nov 2011)
New Revision: 19250

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnPoints.cc
Log:
Changed location of points in test.

Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc	2011-11-29 17:26:15 UTC (rev 19249)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc	2011-11-30 00:06:51 UTC (rev 19250)
@@ -120,7 +120,7 @@
   err = DMMeshInterpolationCreate(dm, &_interpolator);CHECK_PETSC_ERROR(err);
   
   const spatialdata::geocoords::CoordSys* cs = _pointsMesh->coordsys();
-  assert(0 != cs);
+  assert(cs);
   assert(cs->spaceDim() == spaceDim);
 
   err = DMMeshInterpolationSetDim(dm, spaceDim, _interpolator);CHECK_PETSC_ERROR(err);
@@ -128,6 +128,7 @@
   err = DMMeshInterpolationSetUp(dm, _interpolator);CHECK_PETSC_ERROR(err);
   err = DMDestroy(&dm);CHECK_PETSC_ERROR(err);
   CHECK_PETSC_ERROR(err);
+
 } // createPointsMesh
 
 

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnPoints.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnPoints.cc	2011-11-29 17:26:15 UTC (rev 19249)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnPoints.cc	2011-11-30 00:06:51 UTC (rev 19250)
@@ -54,11 +54,11 @@
   const char* filename = "data/quad4.mesh";
   const int numPoints = 5;
   const PylithScalar points[10] = { 
-    0.0, 0.1,
-    0.3, 0.4,
-    0.6, 0.7,
-    1.0, 1.1,
-    1.3, 1.4,
+    0.0,  0.1,
+    0.3,  0.4,
+   -0.6, -0.7,
+   -1.0,  0.9,
+   -0.3,  0.8,
   };
   const int nvertices = numPoints;
   const int verticesE[5] = { 5, 6, 7, 8, 9 };
@@ -127,11 +127,11 @@
   const char* filename = "data/quad4.mesh";
   const int numPoints = 5;
   const PylithScalar points[15] = { 
-    0.0, 0.1, 0.2,
-    0.3, 0.4, 0.5,
-    0.6, 0.7, 0.8,
-    1.0, 1.1, 1.2,
-    1.3, 1.4, 1.5,
+    0.0,  0.1,  0.2,
+    0.3, -0.4,  0.5,
+    0.6,  0.7, -0.8,
+   -1.0,  0.1, -0.3,
+    0.3,  0.8,  0.5,
   };
   const int nvertices = numPoints;
   const int verticesE[5] = { 5, 6, 7, 8, 9 };