[cig-commits] r20258 - in short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio: . data

[brad at geodynamics.org]

Author: brad
Date: 2012-05-31 18:04:30 -0700 (Thu, 31 May 2012)
New Revision: 20258

Modified:
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/TestDataWriterPoints.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/TestDataWriterVTKPoints.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/data/DataWriterHDF5DataMeshLine2.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/data/OutputSolnPointsDataHex8.cc
Log:
Turn off some debugging output. Small cleanup.

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/TestDataWriterPoints.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/TestDataWriterPoints.cc	2012-06-01 01:01:14 UTC (rev 20257)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/TestDataWriterPoints.cc	2012-06-01 01:04:30 UTC (rev 20258)
@@ -112,7 +112,7 @@
       const int fiberDim = _data->vertexFieldsInfo[i].fiber_dim;
       fields->add(name, name);
       MeshField& field = fields->get(name);
-      field.newSection(topology::FieldBase::VERTICES_FIELD, fiberDim);
+      field.newSection(vertices, fiberDim);
       field.allocate();
       field.vectorFieldType(_data->vertexFieldsInfo[i].field_type);
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/TestDataWriterVTKPoints.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/TestDataWriterVTKPoints.cc	2012-06-01 01:01:14 UTC (rev 20257)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/TestDataWriterVTKPoints.cc	2012-06-01 01:04:30 UTC (rev 20258)
@@ -136,7 +136,7 @@
   } // else
   for (int i=0; i < nfields; ++i) {
     MeshField& field = vertexFields.get(_data->vertexFieldsInfo[i].name);
-    field.view("FIELD");
+    // field.view("FIELD"); // DEBUGGING
     output.appendVertexField(t, field, *_mesh);
     CPPUNIT_ASSERT(writer._wroteVertexHeader);
     CPPUNIT_ASSERT(false == writer._wroteCellHeader);
@@ -145,7 +145,7 @@
   output.close();
   CPPUNIT_ASSERT(false == writer._wroteVertexHeader);
   CPPUNIT_ASSERT(false == writer._wroteCellHeader);
-  
+
   checkFile(_data->vertexFilename, t, _data->timeFormat);
 } // testWriteVertexField
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/data/DataWriterHDF5DataMeshLine2.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/data/DataWriterHDF5DataMeshLine2.cc	2012-06-01 01:01:14 UTC (rev 20257)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/data/DataWriterHDF5DataMeshLine2.cc	2012-06-01 01:04:30 UTC (rev 20258)
@@ -50,18 +50,18 @@
   { "pressure", topology::FieldBase::SCALAR, 1 },
   { "other", topology::FieldBase::OTHER, 2 },
 };
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_vertexField0[] = {
-  1.1, 2.2, 3.3, 4.4, 5.5
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_vertexField0[5] = {
+  1.1, 2.2, 3.3, 4.4, 5.5,
 };
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_vertexField1[] = {
-  2.1, 3.2, 4.3, 5.4, 6.5
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_vertexField1[5] = {
+  2.1, 3.2, 4.3, 5.4, 6.5,
 };
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_vertexField2[] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_vertexField2[10] = {
   1.2, 2.3,
   3.4, 4.5,
   5.6, 6.7,
   7.8, 8.9,
-  9.0, 10.1
+  9.0, 10.1,
 };
 
 const int pylith::meshio::DataWriterHDF5DataMeshLine2::_numCellFields = 3;
@@ -73,14 +73,14 @@
   { "pressure", topology::FieldBase::SCALAR, 1 },
   { "other", topology::FieldBase::TENSOR, 1 },
 };
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_cellField0[] = {
-  1.1, 2.2, 3.3
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_cellField0[3] = {
+  1.1, 2.2, 3.3,
 };
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_cellField1[] = {
-  2.1, 2.2, 2.3
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_cellField1[3] = {
+  2.1, 2.2, 2.3,
 };
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_cellField2[] = {
-  1.2, 2.3, 3.4
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshLine2::_cellField2[3] = {
+  1.2, 2.3, 3.4,
 };
 
 pylith::meshio::DataWriterHDF5DataMeshLine2::DataWriterHDF5DataMeshLine2(void)

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/data/OutputSolnPointsDataHex8.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/data/OutputSolnPointsDataHex8.cc	2012-06-01 01:01:14 UTC (rev 20257)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/meshio/data/OutputSolnPointsDataHex8.cc	2012-06-01 01:04:30 UTC (rev 20258)
@@ -21,9 +21,9 @@
 const char* pylith::meshio::OutputSolnPointsDataHex8::_meshFilename =
   "data/hex8.mesh";
 
-const int pylith::meshio::OutputSolnPointsDataHex8::_spaceDim = 2;
+const int pylith::meshio::OutputSolnPointsDataHex8::_spaceDim = 3;
 const int pylith::meshio::OutputSolnPointsDataHex8::_numPoints = 4;
-const PylithScalar pylith::meshio::OutputSolnPointsDataHex8::_points[] = {
+const PylithScalar pylith::meshio::OutputSolnPointsDataHex8::_points[12] = {
   0.1, 0.4, 0.2,// interior points
   0.3, 0.1, 0.8,
   0.001, 0.75, -0.0,// edge