[cig-commits] r11282 - in short/3D/PyLith/trunk/unittests/libtests/meshio: . data

brad at geodynamics.org brad at geodynamics.org
Wed Feb 27 17:47:41 PST 2008


Author: brad
Date: 2008-02-27 17:47:41 -0800 (Wed, 27 Feb 2008)
New Revision: 11282

Added:
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.hh
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.hh
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_cell_t10.vtk
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_t10.vtk
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_vertex_t10.vtk
Modified:
   short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.hh
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh
Log:
Adjusted output unit tests to allow subset of cells and mesh with faults. Started implementing unit tests for output of subset of mesh (material).

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am	2008-02-28 01:47:41 UTC (rev 11282)
@@ -28,6 +28,7 @@
 	TestDataWriterVTKMeshQuad4.cc \
 	TestDataWriterVTKMeshTet4.cc \
 	TestDataWriterVTKMeshHex8.cc \
+	TestDataWriterVTKSubMeshLine2.cc \
 	TestMeshIO.cc \
 	TestMeshIOAscii.cc \
 	TestMeshIOLagrit.cc \
@@ -41,6 +42,7 @@
 	TestDataWriterVTKMeshQuad4.hh \
 	TestDataWriterVTKMeshTet4.hh \
 	TestDataWriterVTKMeshHex8.hh \
+	TestDataWriterVTKSubMeshLine2.hh \
 	TestMeshIO.hh \
 	TestMeshIOAscii.hh \
 	TestMeshIOLagrit.hh
@@ -54,6 +56,7 @@
 	data/DataWriterVTKDataMeshQuad4.cc \
 	data/DataWriterVTKDataMeshTet4.cc \
 	data/DataWriterVTKDataMeshHex8.cc \
+	data/DataWriterVTKDataSubMeshLine2.cc \
 	data/MeshData.cc \
 	data/MeshData1D.cc \
 	data/MeshData1Din3D.cc \
@@ -76,6 +79,7 @@
 	data/DataWriterVTKDataMeshQuad4.hh \
 	data/DataWriterVTKDataMeshTet4.hh \
 	data/DataWriterVTKDataMeshHex8.hh \
+	data/DataWriterVTKDataSubMeshLine2.hh \
 	data/MeshData.hh \
 	data/MeshData1D.hh \
 	data/MeshData1Din2D.hh \

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc	2008-02-28 01:47:41 UTC (rev 11282)
@@ -97,8 +97,15 @@
 
   const double t = _data->time;
   const int numTimeSteps = 1;
-  writer.open(_mesh, &cs, numTimeSteps);
-  writer.openTimeStep(t, _mesh, &cs);
+  if (0 == _data->cellsLabel) {
+    writer.open(_mesh, &cs, numTimeSteps);
+    writer.openTimeStep(t, _mesh, &cs);
+  } else {
+    const char* label = _data->cellsLabel;
+    const int id = _data->labelId;
+    writer.open(_mesh, &cs, numTimeSteps, label, id);
+    writer.openTimeStep(t, _mesh, &cs, label, id);
+  } // else
 
   CPPUNIT_ASSERT(false == writer._wroteVertexHeader);
   CPPUNIT_ASSERT(false == writer._wroteCellHeader);
@@ -135,8 +142,15 @@
 
   const double t = _data->time;
   const int numTimeSteps = 1;
-  writer.open(_mesh, &cs, numTimeSteps);
-  writer.openTimeStep(t, _mesh, &cs);
+  if (0 == _data->cellsLabel) {
+    writer.open(_mesh, &cs, numTimeSteps);
+    writer.openTimeStep(t, _mesh, &cs);
+  } else {
+    const char* label = _data->cellsLabel;
+    const int id = _data->labelId;
+    writer.open(_mesh, &cs, numTimeSteps, label, id);
+    writer.openTimeStep(t, _mesh, &cs, label, id);
+  } // else
   for (int i=0; i < nfields; ++i) {
     writer.writeVertexField(t, _data->vertexFieldsInfo[i].name,
 			    vertexFields[i], 
@@ -176,8 +190,15 @@
 
   const double t = _data->time;
   const int numTimeSteps = 1;
-  writer.open(_mesh, &cs, numTimeSteps);
-  writer.openTimeStep(t, _mesh, &cs);
+  if (0 == _data->cellsLabel) {
+    writer.open(_mesh, &cs, numTimeSteps);
+    writer.openTimeStep(t, _mesh, &cs);
+  } else {
+    const char* label = _data->cellsLabel;
+    const int id = _data->labelId;
+    writer.open(_mesh, &cs, numTimeSteps, label, id);
+    writer.openTimeStep(t, _mesh, &cs, label, id);
+  } // else
   for (int i=0; i < nfields; ++i) {
     writer.writeCellField(t, _data->cellFieldsInfo[i].name,
 			    cellFields[i], 
@@ -246,7 +267,9 @@
     const int nfields = _data->numCellFields;
 
     const ALE::Obj<Mesh::label_sequence>& cells = 
-      _mesh->depthStratum(1);
+      (0 == _data->cellsLabel) ? 
+      _mesh->depthStratum(1) :
+      _mesh->getLabelStratum(_data->cellsLabel, _data->labelId);
     const Mesh::label_sequence::iterator cellsEnd = cells->end();
 
     // Set cell fields

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc	2008-02-28 01:47:41 UTC (rev 11282)
@@ -18,6 +18,7 @@
 #include "data/DataWriterVTKDataMesh.hh" // USES DataWriterVTKDataMesh
 
 #include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
+#include "pylith/faults/FaultCohesiveKin.hh" // USES MeshIOAscii
 
 // ----------------------------------------------------------------------
 // Setup testing data.
@@ -49,6 +50,14 @@
   iohandler.read(&_mesh);
   CPPUNIT_ASSERT(!_mesh.isNull());
   _mesh->getFactory()->clear();
+
+
+  if (0 != _dataMesh->faultLabel) {
+    faults::FaultCohesiveKin fault;
+    fault.label(_dataMesh->faultLabel);
+    fault.id(_dataMesh->faultId);
+    fault.adjustTopology(_mesh);
+  } // if
 } // _initialize
 
 

Added: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.cc	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.cc	2008-02-28 01:47:41 UTC (rev 11282)
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+//                           Brad T. Aagaard
+//                        U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ----------------------------------------------------------------------
+//
+
+#include <portinfo>
+
+#include "TestDataWriterVTKSubMeshLine2.hh" // Implementation of class methods
+
+#include "data/DataWriterVTKDataSubMeshLine2.hh" // USES DataWriterVTKDataMeshLine2
+
+// ----------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION( pylith::meshio::TestDataWriterVTKSubMeshLine2 );
+
+// ----------------------------------------------------------------------
+// Setup testing data.
+void
+pylith::meshio::TestDataWriterVTKSubMeshLine2::setUp(void)
+{ // setUp
+  TestDataWriterVTKMesh::setUp();
+  _data = new DataWriterVTKDataSubMeshLine2;
+  _dataMesh = new DataWriterVTKDataSubMeshLine2;
+  _initialize();
+} // setUp
+
+
+// End of file 

Added: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.hh	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.hh	2008-02-28 01:47:41 UTC (rev 11282)
@@ -0,0 +1,57 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+//                           Brad T. Aagaard
+//                        U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ----------------------------------------------------------------------
+//
+
+/**
+ * @file unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.hh
+ *
+ * @brief C++ TestDataWriterVTKSubMeshLine2 object
+ *
+ * C++ unit testing for DataWriterVTKSubMeshLine2.
+ */
+
+#if !defined(pylith_meshio_testdatawritervtksubmeshline2_hh)
+#define pylith_meshio_testdatawritervtksubmeshline2_hh
+
+#include "TestDataWriterVTKMesh.hh"
+
+/// Namespace for pylith package
+namespace pylith {
+  namespace meshio {
+    class TestDataWriterVTKSubMeshLine2;
+  } // meshio
+} // pylith
+
+/// C++ unit testing for DataWriterVTK
+class pylith::meshio::TestDataWriterVTKSubMeshLine2 : public TestDataWriterVTKMesh
+{ // class TestDataWriterVTKSubMeshLine2
+
+  // CPPUNIT TEST SUITE /////////////////////////////////////////////////
+  CPPUNIT_TEST_SUITE( TestDataWriterVTKSubMeshLine2 );
+
+  CPPUNIT_TEST( testTimeStep );
+  CPPUNIT_TEST( testWriteVertexField );
+  CPPUNIT_TEST( testWriteCellField );
+
+  CPPUNIT_TEST_SUITE_END();
+
+  // PUBLIC METHODS /////////////////////////////////////////////////////
+public :
+
+  /// Setup testing data.
+  void setUp(void);
+
+}; // class TestDataWriterVTKSubMeshLine2
+
+#endif // pylith_meshio_testdatawritervtksubmeshline2_hh
+
+
+// End of file 

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc	2008-02-28 01:47:41 UTC (rev 11282)
@@ -20,6 +20,8 @@
   cellFilename(0),
   time(0),
   timeFormat(0),
+  cellsLabel(0),
+  labelId(0),
   numVertexFields(0),
   numVertices(0),
   vertexFieldsInfo(0),

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh	2008-02-28 01:47:41 UTC (rev 11282)
@@ -53,6 +53,9 @@
   double time; ///< Time for fields.
   char* timeFormat; ///< Format for time stamp.
 
+  char* cellsLabel; ///< Name of label for mesh cells (if using subset).
+  int labelId; ///< Id for label associated with cells (if cellsLabel != 0)
+
   /// @name Vertex field information.
   //@{
   int numVertexFields; ///< Number of vertex fields.

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.cc	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.cc	2008-02-28 01:47:41 UTC (rev 11282)
@@ -15,7 +15,9 @@
 // ----------------------------------------------------------------------
 // Constructor
 pylith::meshio::DataWriterVTKDataMesh::DataWriterVTKDataMesh(void) :
-  meshFilename(0)
+  meshFilename(0),
+  faultLabel(0),
+  faultId(0)
 { // constructor
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.hh	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.hh	2008-02-28 01:47:41 UTC (rev 11282)
@@ -32,13 +32,12 @@
   virtual
   ~DataWriterVTKDataMesh(void);
 
-// PUBLIC STRUCTS ///////////////////////////////////////////////////////
-public:
-
 // PUBLIC MEMBERS ///////////////////////////////////////////////////////
 public:
 
   char* meshFilename; ///< Name of mesh file.
+  char* faultLabel; ///< Name of group of vertices for fault.
+  int faultId; ///< Material identifier for fault.
 
 }; // DataWriterVTKDataMesh
 

Added: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc	2008-02-28 01:47:41 UTC (rev 11282)
@@ -0,0 +1,119 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+//                           Brad T. Aagaard
+//                        U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+#include "DataWriterVTKDataSubMeshLine2.hh"
+
+#include <assert.h> // USES assert()
+
+const char* pylith::meshio::DataWriterVTKDataSubMeshLine2::_meshFilename = 
+  "data/line2.mesh";
+
+const char* pylith::meshio::DataWriterVTKDataSubMeshLine2::_cellsLabel = 
+  "material-id";
+const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_labelId = 0;
+
+const char* pylith::meshio::DataWriterVTKDataSubMeshLine2::_faultLabel = 
+  "fault";
+const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_faultId = 100;
+
+const char* pylith::meshio::DataWriterVTKDataSubMeshLine2::_timestepFilename = 
+  "line2_sub.vtk";
+
+const char* pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexFilename = 
+  "line2_sub_vertex.vtk";
+
+const char* pylith::meshio::DataWriterVTKDataSubMeshLine2::_cellFilename = 
+  "line2_sub_cell.vtk";
+
+const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_time = 1.0;
+
+const char* pylith::meshio::DataWriterVTKDataSubMeshLine2::_timeFormat = 
+  "%3.1f";
+
+const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numVertexFields = 3;
+const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numVertices = 4;
+
+const pylith::meshio::DataWriterVTKData::FieldStruct
+pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexFields[] = {
+  { "displacements", VECTOR_FIELD, 1 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", OTHER_FIELD, 2 },
+};
+const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField0[] = {
+  1.1, 2.2, 3.3, 4.4
+};
+const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField1[] = {
+  2.1, 3.2, 4.3, 5.4
+};
+const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField2[] = {
+  1.2, 2.3, 
+  3.4, 4.5,
+  5.6, 6.7,
+  7.8, 8.9,
+};
+
+const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numCellFields = 3;
+const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numCells = 1;
+
+const pylith::meshio::DataWriterVTKData::FieldStruct
+pylith::meshio::DataWriterVTKDataSubMeshLine2::_cellFields[] = {
+  { "traction", VECTOR_FIELD, 1 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", TENSOR_FIELD, 1 },
+};
+const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_cellField0[] = {
+  1.1,
+};
+const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_cellField1[] = {
+  2.1,
+};
+const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_cellField2[] = {
+  1.2,
+};
+
+pylith::meshio::DataWriterVTKDataSubMeshLine2::DataWriterVTKDataSubMeshLine2(void)
+{ // constructor
+  meshFilename = const_cast<char*>(_meshFilename);
+  cellsLabel = const_cast<char*>(_cellsLabel);
+  labelId = _labelId;
+  faultLabel = const_cast<char*>(_faultLabel);
+  faultId = _faultId;
+
+  timestepFilename = const_cast<char*>(_timestepFilename);
+  vertexFilename = const_cast<char*>(_vertexFilename);
+  cellFilename = const_cast<char*>(_cellFilename);
+
+  time = _time;
+  timeFormat = const_cast<char*>(_timeFormat);
+  
+  numVertexFields = _numVertexFields;
+  numVertices = _numVertices;
+  assert(3 == numVertexFields);
+  vertexFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
+  vertexFields[0] = const_cast<double*>(_vertexField0);
+  vertexFields[1] = const_cast<double*>(_vertexField1);
+  vertexFields[2] = const_cast<double*>(_vertexField2);
+
+  numCellFields = _numCellFields;
+  numVertices = _numVertices;
+  assert(3 == numCellFields);
+  cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
+  cellFields[0] = const_cast<double*>(_cellField0);
+  cellFields[1] = const_cast<double*>(_cellField1);
+  cellFields[2] = const_cast<double*>(_cellField2);
+} // constructor
+
+pylith::meshio::DataWriterVTKDataSubMeshLine2::~DataWriterVTKDataSubMeshLine2(void)
+{}
+
+
+// End of file

Added: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.hh	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.hh	2008-02-28 01:47:41 UTC (rev 11282)
@@ -0,0 +1,79 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+//                           Brad T. Aagaard
+//                        U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+#if !defined(pylith_meshio_datawritervtkdatasubmeshline2_hh)
+#define pylith_meshio_datawritervtkdatasubmeshline2_hh
+
+#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
+#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
+
+namespace pylith {
+  namespace meshio {
+     class DataWriterVTKDataSubMeshLine2;
+  } // meshio
+} // pylith
+
+class pylith::meshio::DataWriterVTKDataSubMeshLine2 :
+  public DataWriterVTKData,
+  public DataWriterVTKDataMesh
+{ // DataWriterVTKDataSubMeshLine2
+
+public: 
+
+  /// Constructor
+  DataWriterVTKDataSubMeshLine2(void);
+
+  /// Destructor
+  ~DataWriterVTKDataSubMeshLine2(void);
+
+private:
+
+  static const char* _meshFilename; ///< Name of mesh file.
+  static const char* _cellsLabel; ///< Label defining subset of cells.
+  static const int _labelId; /// Value for label defining subset of cells.
+  static const char* _faultLabel; ///< Name of group of vertices for fault.
+  static const int _faultId; ///< Material identifier for fault.
+
+  static const char* _timestepFilename; ///< Name of VTK file without fields.
+  static const char* _vertexFilename; ///< Name of VTK file for vertex fields.
+  static const char* _cellFilename; ///< Name of VTK file for cell fields.
+
+  static const double _time; ///< Time for fields.
+  static const char* _timeFormat; ///< Format for time stamp.
+
+  /// @name Vertex field information.
+  //@{
+  static const int _numVertexFields; ///< Number of vertex fields.
+  static const int _numVertices; ///< Number of vertices.
+  static const FieldStruct _vertexFields[]; ///< Array of vertex fields.
+
+  static const double _vertexField0[]; ///< Values for vertex field 0.
+  static const double _vertexField1[]; ///< Values for vertex field 1.
+  static const double _vertexField2[]; ///< Values for vertex field 2.
+  //@}
+
+  /// @name Cell field information.
+  //@{
+  static const int _numCellFields; ///< Number of cell fields.
+  static const int _numCells; ///< Number of cells.
+  static const FieldStruct _cellFields[]; ///< Array of cell fields.
+
+  static const double _cellField0[]; ///< Values for cell field 0.
+  static const double _cellField1[]; ///< Values for cell field 1.
+  static const double _cellField2[]; ///< Values for cell field 2.
+  //@}
+
+}; // DataWriterVTKDataSubMeshLine2
+
+#endif // pylith_meshio_datawritervtkdatasubmeshline2_hh
+
+// End of file

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/Makefile.am	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/Makefile.am	2008-02-28 01:47:41 UTC (rev 11282)
@@ -40,7 +40,10 @@
 	hex8.mesh \
 	hex8_t10.vtk \
 	hex8_vertex_t10.vtk \
-	hex8_cell_t10.vtk
+	hex8_cell_t10.vtk \
+	line2_sub_t10.vtk \
+	line2_sub_vertex_t10.vtk \
+	line2_sub_cell_t10.vtk
 
 noinst_TMP =
 

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh	2008-02-28 01:46:07 UTC (rev 11281)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh	2008-02-28 01:47:41 UTC (rev 11282)
@@ -32,6 +32,14 @@
     }
   }
   group = {
+    name = fault
+    type = vertices
+    count = 1
+    indices = {
+      1
+    }
+  }
+  group = {
     name = bc0
     type = vertices
     count = 2

Added: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_cell_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_cell_t10.vtk	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_cell_t10.vtk	2008-02-28 01:47:41 UTC (rev 11282)
@@ -0,0 +1,22 @@
+# vtk DataFile Version 2.0
+Simplicial Mesh Example
+ASCII
+DATASET UNSTRUCTURED_GRID
+POINTS 4 double
+-1 0.0 0.0
+0 0.0 0.0
+1 0.0 0.0
+0 0.0 0.0
+CELLS 1 3
+2  0 3
+CELL_TYPES 1
+3
+CELL_DATA 2
+VECTORS traction double
+1.1 0.0 0.0
+SCALARS pressure double 1
+LOOKUP_TABLE default
+2.1
+SCALARS other double 1
+LOOKUP_TABLE default
+1.2

Added: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_t10.vtk	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_t10.vtk	2008-02-28 01:47:41 UTC (rev 11282)
@@ -0,0 +1,13 @@
+# vtk DataFile Version 2.0
+Simplicial Mesh Example
+ASCII
+DATASET UNSTRUCTURED_GRID
+POINTS 4 double
+-1 0.0 0.0
+0 0.0 0.0
+1 0.0 0.0
+0 0.0 0.0
+CELLS 1 3
+2  0 3
+CELL_TYPES 1
+3

Added: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_vertex_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_vertex_t10.vtk	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_sub_vertex_t10.vtk	2008-02-28 01:47:41 UTC (rev 11282)
@@ -0,0 +1,31 @@
+# vtk DataFile Version 2.0
+Simplicial Mesh Example
+ASCII
+DATASET UNSTRUCTURED_GRID
+POINTS 4 double
+-1 0.0 0.0
+0 0.0 0.0
+1 0.0 0.0
+0 0.0 0.0
+CELLS 1 3
+2  0 3
+CELL_TYPES 1
+3
+POINT_DATA 4
+VECTORS displacements double
+1.1 0.0 0.0
+2.2 0.0 0.0
+3.3 0.0 0.0
+4.4 0.0 0.0
+SCALARS pressure double 1
+LOOKUP_TABLE default
+2.1
+3.2
+4.3
+5.4
+SCALARS other double 2
+LOOKUP_TABLE default
+1.2 2.3
+3.4 4.5
+5.6 6.7
+7.8 8.9



More information about the cig-commits mailing list