[cig-commits] r11299 - in short/3D/PyLith/trunk/unittests/libtests/meshio: . data
brad at geodynamics.org
brad at geodynamics.org
Sat Mar 1 21:24:23 PST 2008
Author: brad
Date: 2008-03-01 21:24:22 -0800 (Sat, 01 Mar 2008)
New Revision: 11299
Removed:
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.hh
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/TestDataWriterVTKBCMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMeshTri3.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshHex8.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshTet4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshTri3.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshHex8.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshLine2.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshTet4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshTri3.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshHex8.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshTet4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshTri3.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/DataWriterVTKDataBCMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.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/DataWriterVTKDataSubMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8.mesh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3.mesh
Log:
Merged DataWriterVTKDataMesh into DataWriterVTKData.
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am 2008-03-02 05:24:22 UTC (rev 11299)
@@ -78,7 +78,6 @@
# Source files associated with testing data
testmeshio_SOURCES += \
data/DataWriterVTKData.cc \
- data/DataWriterVTKDataMesh.cc \
data/DataWriterVTKDataMeshLine2.cc \
data/DataWriterVTKDataMeshTri3.cc \
data/DataWriterVTKDataMeshQuad4.cc \
@@ -111,7 +110,6 @@
noinst_HEADERS += \
data/DataWriterVTKData.hh \
- data/DataWriterVTKDataMesh.hh \
data/DataWriterVTKDataMeshLine2.hh \
data/DataWriterVTKDataMeshTri3.hh \
data/DataWriterVTKDataMeshQuad4.hh \
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -247,6 +247,7 @@
const double* values = &_data->vertexFields[i][ipt*fiberDim];
(*fields)[i]->updatePoint(*v_iter, values);
} // for
+ CPPUNIT_ASSERT_EQUAL(_data->numVertices, ipt);
} // for
} catch (const ALE::Exception& err) {
throw std::runtime_error(err.msg());
@@ -287,6 +288,7 @@
const double* values = &_data->cellFields[i][icell*fiberDim];
(*fields)[i]->updatePoint(*c_iter, values);
} // for
+ CPPUNIT_ASSERT_EQUAL(_data->numCells, icell);
} // for
} catch (const ALE::Exception& err) {
throw std::runtime_error(err.msg());
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -15,7 +15,6 @@
#include "TestDataWriterVTKBCMesh.hh" // Implementation of class methods
#include "data/DataWriterVTKData.hh" // USES DataWriterVTKData
-#include "data/DataWriterVTKDataMesh.hh" // USES DataWriterVTKDataMesh
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
#include "pylith/faults/FaultCohesiveKin.hh" // USES FaultCohesiveKin
@@ -26,44 +25,26 @@
#include <map> // USES std::map
// ----------------------------------------------------------------------
-// Setup testing data.
-void
-pylith::meshio::TestDataWriterVTKBCMesh::setUp(void)
-{ // setUp
- TestDataWriterVTK::setUp();
- _dataMesh = 0;
-} // setUp
-
-// ----------------------------------------------------------------------
-// Tear down testing data.
-void
-pylith::meshio::TestDataWriterVTKBCMesh::tearDown(void)
-{ // tearDown
- TestDataWriterVTK::tearDown();
- delete _dataMesh; _dataMesh = 0;
-} // tearDown
-
-// ----------------------------------------------------------------------
// Initialize mesh.
void
pylith::meshio::TestDataWriterVTKBCMesh::_initialize(void)
{ // _initialize
- CPPUNIT_ASSERT(0 != _dataMesh);
+ CPPUNIT_ASSERT(0 != _data);
MeshIOAscii iohandler;
- iohandler.filename(_dataMesh->meshFilename);
+ iohandler.filename(_data->meshFilename);
iohandler.read(&_meshDomain);
CPPUNIT_ASSERT(!_meshDomain.isNull());
_meshDomain->getFactory()->clear();
- if (0 != _dataMesh->faultLabel) {
+ if (0 != _data->faultLabel) {
faults::FaultCohesiveKin fault;
- fault.label(_dataMesh->faultLabel);
- fault.id(_dataMesh->faultId);
+ fault.label(_data->faultLabel);
+ fault.id(_data->faultId);
fault.adjustTopology(_meshDomain);
} // if
- const char* label = _dataMesh->bcLabel;
+ const char* label = _data->bcLabel;
_mesh =
ALE::Selection<ALE::Mesh>::submesh(_meshDomain,
_meshDomain->getIntSection(label));
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -27,8 +27,6 @@
namespace pylith {
namespace meshio {
class TestDataWriterVTKBCMesh;
-
- class DataWriterVTKDataMesh;
} // meshio
} // pylith
@@ -36,15 +34,6 @@
class pylith::meshio::TestDataWriterVTKBCMesh : public TestDataWriterVTK
{ // class TestDataWriterVTKBCMesh
- // PUBLIC METHODS /////////////////////////////////////////////////////
-public :
-
- /// Setup testing data.
- void setUp(void);
-
- /// Tear down testing data.
- void tearDown(void);
-
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
@@ -54,7 +43,6 @@
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
- DataWriterVTKDataMesh* _dataMesh; ///< Data for testing.
ALE::Obj<Mesh> _meshDomain; ///< Mesh for domain.
}; // class TestDataWriterVTKBCMesh
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMeshQuad4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMeshQuad4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKBCMesh::setUp();
_data = new DataWriterVTKDataBCMeshQuad4;
- _dataMesh = new DataWriterVTKDataBCMeshQuad4;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMeshTri3.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMeshTri3.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKBCMesh::setUp();
_data = new DataWriterVTKDataBCMeshTri3;
- _dataMesh = new DataWriterVTKDataBCMeshTri3;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -15,7 +15,6 @@
#include "TestDataWriterVTKFaultMesh.hh" // Implementation of class methods
#include "data/DataWriterVTKData.hh" // USES DataWriterVTKData
-#include "data/DataWriterVTKDataMesh.hh" // USES DataWriterVTKDataMesh
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
#include "pylith/faults/FaultCohesiveKin.hh" // USES FaultCohesiveKin
@@ -24,44 +23,26 @@
#include <map> // USES std::map
// ----------------------------------------------------------------------
-// Setup testing data.
-void
-pylith::meshio::TestDataWriterVTKFaultMesh::setUp(void)
-{ // setUp
- TestDataWriterVTK::setUp();
- _dataMesh = 0;
-} // setUp
-
-// ----------------------------------------------------------------------
-// Tear down testing data.
-void
-pylith::meshio::TestDataWriterVTKFaultMesh::tearDown(void)
-{ // tearDown
- TestDataWriterVTK::tearDown();
- delete _dataMesh; _dataMesh = 0;
-} // tearDown
-
-// ----------------------------------------------------------------------
// Initialize mesh.
void
pylith::meshio::TestDataWriterVTKFaultMesh::_initialize(void)
{ // _initialize
- CPPUNIT_ASSERT(0 != _dataMesh);
+ CPPUNIT_ASSERT(0 != _data);
MeshIOAscii iohandler;
- iohandler.filename(_dataMesh->meshFilename);
+ iohandler.filename(_data->meshFilename);
iohandler.read(&_meshDomain);
CPPUNIT_ASSERT(!_meshDomain.isNull());
_meshDomain->getFactory()->clear();
faults::FaultCohesiveKin fault;
- fault.label(_dataMesh->faultLabel);
- fault.id(_dataMesh->faultId);
+ fault.label(_data->faultLabel);
+ fault.id(_data->faultId);
fault.adjustTopology(_meshDomain);
const bool constraintCell = true;
std::map<Mesh::point_type, Mesh::point_type> cohesiveToFault;
faults::CohesiveTopology::createParallel(&_mesh, &cohesiveToFault,
- _meshDomain, _dataMesh->faultId,
+ _meshDomain, _data->faultId,
constraintCell);
} // _initialize
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -27,8 +27,6 @@
namespace pylith {
namespace meshio {
class TestDataWriterVTKFaultMesh;
-
- class DataWriterVTKDataMesh;
} // meshio
} // pylith
@@ -36,15 +34,6 @@
class pylith::meshio::TestDataWriterVTKFaultMesh : public TestDataWriterVTK
{ // class TestDataWriterVTKFaultMesh
- // PUBLIC METHODS /////////////////////////////////////////////////////
-public :
-
- /// Setup testing data.
- void setUp(void);
-
- /// Tear down testing data.
- void tearDown(void);
-
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
@@ -54,7 +43,6 @@
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
- DataWriterVTKDataMesh* _dataMesh; ///< Data for testing.
ALE::Obj<Mesh> _meshDomain; ///< Mesh for domain.
}; // class TestDataWriterVTKFaultMesh
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshHex8.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshHex8.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKFaultMesh::setUp();
_data = new DataWriterVTKDataFaultMeshHex8;
- _dataMesh = new DataWriterVTKDataFaultMeshHex8;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshQuad4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshQuad4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKFaultMesh::setUp();
_data = new DataWriterVTKDataFaultMeshQuad4;
- _dataMesh = new DataWriterVTKDataFaultMeshQuad4;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshTet4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshTet4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKFaultMesh::setUp();
_data = new DataWriterVTKDataFaultMeshTet4;
- _dataMesh = new DataWriterVTKDataFaultMeshTet4;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshTri3.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshTri3.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKFaultMesh::setUp();
_data = new DataWriterVTKDataFaultMeshTri3;
- _dataMesh = new DataWriterVTKDataFaultMeshTri3;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -15,46 +15,27 @@
#include "TestDataWriterVTKMesh.hh" // Implementation of class methods
#include "data/DataWriterVTKData.hh" // USES DataWriterVTKData
-#include "data/DataWriterVTKDataMesh.hh" // USES DataWriterVTKDataMesh
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
#include "pylith/faults/FaultCohesiveKin.hh" // USES FaultCohesiveKin
// ----------------------------------------------------------------------
-// Setup testing data.
-void
-pylith::meshio::TestDataWriterVTKMesh::setUp(void)
-{ // setUp
- TestDataWriterVTK::setUp();
- _dataMesh = 0;
-} // setUp
-
-// ----------------------------------------------------------------------
-// Tear down testing data.
-void
-pylith::meshio::TestDataWriterVTKMesh::tearDown(void)
-{ // tearDown
- TestDataWriterVTK::tearDown();
- delete _dataMesh; _dataMesh = 0;
-} // tearDown
-
-// ----------------------------------------------------------------------
// Initialize mesh.
void
pylith::meshio::TestDataWriterVTKMesh::_initialize(void)
{ // _initialize
- CPPUNIT_ASSERT(0 != _dataMesh);
+ CPPUNIT_ASSERT(0 != _data);
MeshIOAscii iohandler;
- iohandler.filename(_dataMesh->meshFilename);
+ iohandler.filename(_data->meshFilename);
iohandler.read(&_mesh);
CPPUNIT_ASSERT(!_mesh.isNull());
_mesh->getFactory()->clear();
- if (0 != _dataMesh->faultLabel) {
+ if (0 != _data->faultLabel) {
faults::FaultCohesiveKin fault;
- fault.label(_dataMesh->faultLabel);
- fault.id(_dataMesh->faultId);
+ fault.label(_data->faultLabel);
+ fault.id(_data->faultId);
fault.adjustTopology(_mesh);
} // if
} // _initialize
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -27,8 +27,6 @@
namespace pylith {
namespace meshio {
class TestDataWriterVTKMesh;
-
- class DataWriterVTKDataMesh;
} // meshio
} // pylith
@@ -36,26 +34,12 @@
class pylith::meshio::TestDataWriterVTKMesh : public TestDataWriterVTK
{ // class TestDataWriterVTKMesh
- // PUBLIC METHODS /////////////////////////////////////////////////////
-public :
-
- /// Setup testing data.
- void setUp(void);
-
- /// Tear down testing data.
- void tearDown(void);
-
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
/// Initialize mesh.
void _initialize(void);
- // PROTECTED MEMBERS //////////////////////////////////////////////////
-protected :
-
- DataWriterVTKDataMesh* _dataMesh; ///< Data for testing
-
}; // class TestDataWriterVTKMesh
#endif // pylith_meshio_testdatawritervtkmesh_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshHex8.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshHex8.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataMeshHex8;
- _dataMesh = new DataWriterVTKDataMeshHex8;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshLine2.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshLine2.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataMeshLine2;
- _dataMesh = new DataWriterVTKDataMeshLine2;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshQuad4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshQuad4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataMeshQuad4;
- _dataMesh = new DataWriterVTKDataMeshQuad4;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshTet4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshTet4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataMeshTet4;
- _dataMesh = new DataWriterVTKDataMeshTet4;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshTri3.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMeshTri3.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataMeshTri3;
- _dataMesh = new DataWriterVTKDataMeshTri3;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshHex8.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshHex8.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataSubMeshHex8;
- _dataMesh = new DataWriterVTKDataSubMeshHex8;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshLine2.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataSubMeshLine2;
- _dataMesh = new DataWriterVTKDataSubMeshLine2;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshQuad4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshQuad4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataSubMeshQuad4;
- _dataMesh = new DataWriterVTKDataSubMeshQuad4;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshTet4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshTet4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataSubMeshTet4;
- _dataMesh = new DataWriterVTKDataSubMeshTet4;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshTri3.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMeshTri3.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -26,7 +26,6 @@
{ // setUp
TestDataWriterVTKMesh::setUp();
_data = new DataWriterVTKDataSubMeshTri3;
- _dataMesh = new DataWriterVTKDataSubMeshTri3;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -15,6 +15,10 @@
// ----------------------------------------------------------------------
// Constructor
pylith::meshio::DataWriterVTKData::DataWriterVTKData(void) :
+ meshFilename(0),
+ faultLabel(0),
+ faultId(0),
+ bcLabel(0),
timestepFilename(0),
vertexFilename(0),
cellFilename(0),
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -46,6 +46,11 @@
// PUBLIC MEMBERS ///////////////////////////////////////////////////////
public:
+ char* meshFilename; ///< Name of mesh file.
+ char* faultLabel; ///< Name of group of vertices for fault.
+ int faultId; ///< Material identifier for fault.
+ char* bcLabel; ///< Name of group of vertices for bc.
+
char* timestepFilename; ///< Name of VTK file without fields.
char* vertexFilename; ///< Name of VTK file for vertex fields.
char* cellFilename; ///< Name of VTK file for cell fields.
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -35,7 +35,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataBCMeshQuad4::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataBCMeshQuad4::_numVertices = 4;
+const int pylith::meshio::DataWriterVTKDataBCMeshQuad4::_numVertices = 3;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshQuad4::_vertexFields[] = {
@@ -47,16 +47,14 @@
1.1, 2.2,
3.3, 4.4,
5.5, 6.6,
- 7.7, 8.8,
};
const double pylith::meshio::DataWriterVTKDataBCMeshQuad4::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4,
+ 2.1, 3.2, 4.3,
};
const double pylith::meshio::DataWriterVTKDataBCMeshQuad4::_vertexField2[] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
- 7.8, 8.9,
};
const int pylith::meshio::DataWriterVTKDataBCMeshQuad4::_numCellFields = 3;
@@ -102,7 +100,7 @@
numCellFields = _numCellFields;
assert(3 == numCellFields);
- numVertices = _numVertices;
+ numCells = _numCells;
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
cellFields[1] = const_cast<double*>(_cellField1);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatabcmeshquad4_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataBCMeshQuad4 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataBCMeshQuad4 : public DataWriterVTKData
{ // DataWriterVTKDataBCMeshQuad4
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -101,7 +101,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatabcmeshtri3_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataBCMeshTri3 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataBCMeshTri3 : public DataWriterVTKData
{ // DataWriterVTKDataBCMeshTri3
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -101,7 +101,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatafaultmeshhex8_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataFaultMeshHex8 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataFaultMeshHex8 : public DataWriterVTKData
{ // DataWriterVTKDataFaultMeshHex8
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -98,7 +98,7 @@
numCellFields = _numCellFields;
assert(3 == numCellFields);
- numVertices = _numVertices;
+ numCells = _numCells;
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
cellFields[1] = const_cast<double*>(_cellField1);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatafaultmeshquad4_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataFaultMeshQuad4 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataFaultMeshQuad4 : public DataWriterVTKData
{ // DataWriterVTKDataFaultMeshQuad4
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -100,7 +100,7 @@
numCellFields = _numCellFields;
assert(3 == numCellFields);
- numVertices = _numVertices;
+ numCells = _numCells;
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
cellFields[1] = const_cast<double*>(_cellField1);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatafaultmeshtet4_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataFaultMeshTet4 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataFaultMeshTet4 : public DataWriterVTKData
{ // DataWriterVTKDataFaultMeshTet4
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -97,7 +97,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatafaultmeshtri3_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataFaultMeshTri3 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataFaultMeshTri3 : public DataWriterVTKData
{ // DataWriterVTKDataFaultMeshTri3
public:
Deleted: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard
-// U.S. Geological Survey
-//
-// {LicenseText}
-//
-// ======================================================================
-//
-
-#include "DataWriterVTKDataMesh.hh"
-
-// ----------------------------------------------------------------------
-// Constructor
-pylith::meshio::DataWriterVTKDataMesh::DataWriterVTKDataMesh(void) :
- meshFilename(0),
- faultLabel(0),
- faultId(0),
- bcLabel(0)
-{ // constructor
-} // constructor
-
-// ----------------------------------------------------------------------
-// Destructor
-pylith::meshio::DataWriterVTKDataMesh::~DataWriterVTKDataMesh(void)
-{ // destructor
-} // destructor
-
-
-// End of file
Deleted: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMesh.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard
-// U.S. Geological Survey
-//
-// {LicenseText}
-//
-// ======================================================================
-//
-
-#if !defined(pylith_meshio_datawritervtkdatamesh_hh)
-#define pylith_meshio_datawritervtkdatamesh_hh
-
-namespace pylith {
- namespace meshio {
- class DataWriterVTKDataMesh;
- } // meshio
-} // pylith
-
-class pylith::meshio::DataWriterVTKDataMesh
-{ // DataWriterVTKDataMesh
-
-// PUBLIC METHODS ///////////////////////////////////////////////////////
-public :
-
- /// Constructor
- DataWriterVTKDataMesh(void);
-
- /// Destructor
- virtual
- ~DataWriterVTKDataMesh(void);
-
-// PUBLIC MEMBERS ///////////////////////////////////////////////////////
-public:
-
- char* meshFilename; ///< Name of mesh file.
- char* faultLabel; ///< Name of group of vertices for fault.
- int faultId; ///< Material identifier for fault.
- char* bcLabel; ///< Name of group of vertices for bc.
-
-}; // DataWriterVTKDataMesh
-
-#endif // pylith_meshio_datawritervtkdatamesh_hh
-
-
-// End of file
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -36,7 +36,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataMeshHex8::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshHex8::_numVertices = 16;
+const int pylith::meshio::DataWriterVTKDataMeshHex8::_numVertices = 20;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFields[] = {
@@ -61,10 +61,15 @@
16.8, 17.9, 18.1,
19.2, 20.3, 21.4,
22.5, 23.6, 24.7,
+ 25.8, 26.9, 27.1,
+ 28.8, 29.9, 30.1,
+ 31.8, 32.9, 33.1,
+ 34.8, 35.9, 36.1,
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_vertexField1[] = {
2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
- 10.0, 12.1, 11.1, 13.1, 14.1, 15.1, 16.1, 17.1
+ 10.0, 12.1, 11.1, 13.1, 14.1, 15.1, 16.1, 17.1,
+ 18.1, 19.1, 20.1, 21.2
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_vertexField2[] = {
1.2, 2.3,
@@ -83,10 +88,14 @@
4.8, 1.5,
2.6, 3.7,
4.8, 5.9,
+ 6.1, 7.2,
+ 7.1, 8.2,
+ 8.1, 9.2,
+ 9.1, 10.1
};
const int pylith::meshio::DataWriterVTKDataMeshHex8::_numCellFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshHex8::_numCells = 2;
+const int pylith::meshio::DataWriterVTKDataMeshHex8::_numCells = 3;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshHex8::_cellFields[] = {
@@ -96,14 +105,16 @@
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_cellField0[] = {
1.1, 2.2, 3.3,
- 4.4, 5.5, 6.6
+ 4.4, 5.5, 6.6,
+ 7.7, 8.8, 9.9
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_cellField1[] = {
- 2.1, 3.2,
+ 2.1, 3.2, 4.3
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_cellField2[] = {
1.2, 2.3, 3.4, 4.5, 5.6, 6.7,
1.1, 2.2, 3.3, 4.4, 5.5, 6.6,
+ 1.3, 2.4, 3.5, 4.6, 5.7, 6.8
};
pylith::meshio::DataWriterVTKDataMeshHex8::DataWriterVTKDataMeshHex8(void)
@@ -128,7 +139,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatameshhex8_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataMeshHex8 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataMeshHex8 : public DataWriterVTKData
{ // DataWriterVTKDataMeshHex8
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -36,7 +36,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataMeshLine2::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshLine2::_numVertices = 4;
+const int pylith::meshio::DataWriterVTKDataMeshLine2::_numVertices = 5;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshLine2::_vertexFields[] = {
@@ -45,20 +45,21 @@
{ "other", OTHER_FIELD, 2 },
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_vertexField0[] = {
- 1.1, 2.2, 3.3, 4.4
+ 1.1, 2.2, 3.3, 4.4, 5.5
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4
+ 2.1, 3.2, 4.3, 5.4, 6.5
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_vertexField2[] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
7.8, 8.9,
+ 9.0, 10.1
};
const int pylith::meshio::DataWriterVTKDataMeshLine2::_numCellFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshLine2::_numCells = 2;
+const int pylith::meshio::DataWriterVTKDataMeshLine2::_numCells = 3;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshLine2::_cellFields[] = {
@@ -67,13 +68,13 @@
{ "other", TENSOR_FIELD, 1 },
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_cellField0[] = {
- 1.1, 2.2,
+ 1.1, 2.2, 3.3
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_cellField1[] = {
- 2.1, 2.2,
+ 2.1, 2.2, 2.3
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_cellField2[] = {
- 1.2, 2.3,
+ 1.2, 2.3, 3.4
};
pylith::meshio::DataWriterVTKDataMeshLine2::DataWriterVTKDataMeshLine2(void)
@@ -98,7 +99,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatameshline2_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataMeshLine2 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataMeshLine2 : public DataWriterVTKData
{ // DataWriterVTKDataMeshLine2
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -102,7 +102,7 @@
numCellFields = _numCellFields;
assert(3 == numCellFields);
- numVertices = _numVertices;
+ numCells = _numCells;
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
cellFields[1] = const_cast<double*>(_cellField1);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatameshquad4_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataMeshQuad4 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataMeshQuad4 : public DataWriterVTKData
{ // DataWriterVTKDataMeshQuad4
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -36,7 +36,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataMeshTet4::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshTet4::_numVertices = 8;
+const int pylith::meshio::DataWriterVTKDataMeshTet4::_numVertices = 11;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFields[] = {
@@ -53,9 +53,12 @@
16.6, 17.7, 18.8,
19.9, 20.0, 21.1,
22.2, 23.3, 24.4,
+ 25.5, 26.6, 27.7,
+ 28.8, 29.9, 30.0,
+ 31.1, 32.2, 33.3,
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8, 10.9, 11.0, 12.1,
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_vertexField2[] = {
1.2, 2.3,
@@ -66,10 +69,13 @@
11.2, 12.3,
13.4, 14.5,
15.6, 16.7,
+ 17.8, 18.9,
+ 19.0, 20.1,
+ 21.2, 22.3,
};
const int pylith::meshio::DataWriterVTKDataMeshTet4::_numCellFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshTet4::_numCells = 2;
+const int pylith::meshio::DataWriterVTKDataMeshTet4::_numCells = 3;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTet4::_cellFields[] = {
@@ -80,13 +86,15 @@
const double pylith::meshio::DataWriterVTKDataMeshTet4::_cellField0[] = {
1.1, 2.2, 3.3,
4.4, 5.5, 6.6,
+ 7.7, 8.8, 9.9
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_cellField1[] = {
- 2.1, 3.2
+ 2.1, 3.2, 4.3
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_cellField2[] = {
1.2, 2.3, 3.4, 4.5, 5.6, 6.7,
7.8, 8.9, 9.0, 10.1, 11.2, 12.3,
+ 13.4, 14.5, 15.6, 16.7, 17.8, 18.9
};
pylith::meshio::DataWriterVTKDataMeshTet4::DataWriterVTKDataMeshTet4(void)
@@ -112,7 +120,7 @@
numCellFields = _numCellFields;
assert(3 == numCellFields);
- numVertices = _numVertices;
+ numCells = _numCells;
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
cellFields[1] = const_cast<double*>(_cellField1);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatameshtet4_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataMeshTet4 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataMeshTet4 : public DataWriterVTKData
{ // DataWriterVTKDataMeshTet4
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -36,7 +36,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataMeshTri3::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshTri3::_numVertices = 6;
+const int pylith::meshio::DataWriterVTKDataMeshTri3::_numVertices = 8;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFields[] = {
@@ -50,10 +50,11 @@
5.5, 6.6,
7.7, 8.8,
9.9, 10.0,
- 11.1, 12.2
+ 11.1, 12.2,
+ 13.3, 14.4
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_vertexField2[] = {
1.2, 2.3,
@@ -61,11 +62,12 @@
5.6, 6.7,
7.8, 8.9,
9.0, 10.1,
- 11.2, 12.3
+ 11.2, 12.3,
+ 13.4, 14.5
};
const int pylith::meshio::DataWriterVTKDataMeshTri3::_numCellFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshTri3::_numCells = 2;
+const int pylith::meshio::DataWriterVTKDataMeshTri3::_numCells = 3;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTri3::_cellFields[] = {
@@ -75,14 +77,16 @@
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_cellField0[] = {
1.1, 2.2,
- 3.3, 4.4
+ 3.3, 4.4,
+ 5.5, 6.6,
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_cellField1[] = {
- 2.1, 2.2,
+ 2.1, 2.2, 2.3
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_cellField2[] = {
1.2, 2.3, 3.4,
4.5, 5.6, 6.7,
+ 7.8, 8.9, 9.0
};
pylith::meshio::DataWriterVTKDataMeshTri3::DataWriterVTKDataMeshTri3(void)
@@ -107,7 +111,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatameshtri3_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataMeshTri3 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataMeshTri3 : public DataWriterVTKData
{ // DataWriterVTKDataMeshTri3
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -40,7 +40,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshHex8::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshHex8::_numVertices = 16;
+const int pylith::meshio::DataWriterVTKDataSubMeshHex8::_numVertices = 20;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexFields[] = {
@@ -65,10 +65,15 @@
16.8, 17.9, 18.1,
19.2, 20.3, 21.4,
22.5, 23.6, 24.7,
+ 25.5, 26.6, 27.7,
+ 28.8, 29.9, 30.0,
+ 31.1, 32.2, 33.3,
+ 34.4, 35.5, 36.6
};
const double pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexField1[] = {
2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
- 10.0, 12.1, 11.1, 13.1, 14.1, 15.1, 16.1, 17.1
+ 10.0, 12.1, 11.1, 13.1, 14.1, 15.1, 16.1, 17.1,
+ 18.1, 19.1, 20.1, 21.1
};
const double pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexField2[] = {
1.2, 2.3,
@@ -87,6 +92,10 @@
4.8, 1.5,
2.6, 3.7,
4.8, 5.9,
+ 1.1, 1.2,
+ 2.1, 2.2,
+ 3.1, 3.2,
+ 4.1, 4.2,
};
const int pylith::meshio::DataWriterVTKDataSubMeshHex8::_numCellFields = 3;
@@ -132,7 +141,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatasubmeshhex8_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataSubMeshHex8 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataSubMeshHex8 : public DataWriterVTKData
{ // DataWriterVTKDataSubMeshHex8
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -40,7 +40,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numVertices = 4;
+const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numVertices = 5;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexFields[] = {
@@ -49,16 +49,17 @@
{ "other", OTHER_FIELD, 2 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField0[] = {
- 1.1, 2.2, 3.3, 4.4
+ 1.1, 2.2, 3.3, 4.4, 5.5
};
const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4
+ 2.1, 3.2, 4.3, 5.4, 6.5
};
const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField2[] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
7.8, 8.9,
+ 9.1, 10.2
};
const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numCellFields = 3;
@@ -104,7 +105,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatasubmeshline2_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataSubMeshLine2 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataSubMeshLine2 : public DataWriterVTKData
{ // DataWriterVTKDataSubMeshLine2
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -106,7 +106,7 @@
numCellFields = _numCellFields;
assert(3 == numCellFields);
- numVertices = _numVertices;
+ numCells = _numCells;
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
cellFields[1] = const_cast<double*>(_cellField1);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatasubmeshquad4_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataSubMeshQuad4 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataSubMeshQuad4 : public DataWriterVTKData
{ // DataWriterVTKDataSubMeshQuad4
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -40,7 +40,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshTet4::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshTet4::_numVertices = 8;
+const int pylith::meshio::DataWriterVTKDataSubMeshTet4::_numVertices = 11;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexFields[] = {
@@ -57,9 +57,12 @@
16.6, 17.7, 18.8,
19.9, 20.0, 21.1,
22.2, 23.3, 24.4,
+ 25.5, 26.6, 27.7,
+ 28.8, 29.9, 30.0,
+ 31.1, 32.2, 33.3,
};
const double pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8, 10.9, 11.0, 12.1
};
const double pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexField2[] = {
1.2, 2.3,
@@ -70,6 +73,9 @@
11.2, 12.3,
13.4, 14.5,
15.6, 16.7,
+ 17.8, 18.9,
+ 19.0, 20.1,
+ 21.2, 22.3
};
const int pylith::meshio::DataWriterVTKDataSubMeshTet4::_numCellFields = 3;
@@ -118,7 +124,7 @@
numCellFields = _numCellFields;
assert(3 == numCellFields);
- numVertices = _numVertices;
+ numCells = _numCells;
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
cellFields[1] = const_cast<double*>(_cellField1);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatasubmeshtet4_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataSubMeshTet4 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataSubMeshTet4 : public DataWriterVTKData
{ // DataWriterVTKDataSubMeshTet4
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc 2008-03-02 05:24:22 UTC (rev 11299)
@@ -40,7 +40,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numVertices = 6;
+const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numVertices = 8;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFields[] = {
@@ -54,10 +54,12 @@
5.5, 6.6,
7.7, 8.8,
9.9, 10.0,
- 11.1, 12.2
+ 11.1, 12.2,
+ 13.3, 14.4,
+ 15.5, 16.6,
};
const double pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
};
const double pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexField2[] = {
1.2, 2.3,
@@ -65,7 +67,9 @@
5.6, 6.7,
7.8, 8.9,
9.0, 10.1,
- 11.2, 12.3
+ 11.2, 12.3,
+ 13.4, 14.5,
+ 15.6, 16.7
};
const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numCellFields = 3;
@@ -111,7 +115,7 @@
vertexFields[2] = const_cast<double*>(_vertexField2);
numCellFields = _numCellFields;
- numVertices = _numVertices;
+ numCells = _numCells;
assert(3 == numCellFields);
cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
cellFields[0] = const_cast<double*>(_cellField0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.hh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.hh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -14,7 +14,6 @@
#define pylith_meshio_datawritervtkdatasubmeshtri3_hh
#include "DataWriterVTKData.hh" // ISA DataWriterVTKData
-#include "DataWriterVTKDataMesh.hh" // ISA DataWriterVTKDataMesh
namespace pylith {
namespace meshio {
@@ -22,9 +21,7 @@
} // meshio
} // pylith
-class pylith::meshio::DataWriterVTKDataSubMeshTri3 :
- public DataWriterVTKData,
- public DataWriterVTKDataMesh
+class pylith::meshio::DataWriterVTKDataSubMeshTri3 : public DataWriterVTKData
{ // DataWriterVTKDataSubMeshTri3
public:
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8.mesh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8.mesh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -19,11 +19,11 @@
// / | / |
// / | / |
// 9 ----- 8 |
-// | 5 --|-- 4
+// 19 5 -18-- 4
// 15 ---- 14| /
// / | / /||/ 1
// / 3 ---/-|2
-// 7 ----- 6 |
+// 7 --17-- 6 16
// | 13 --|--12
// | / | /
// |/ |/ 0
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -4,7 +4,7 @@
// 0 1
//
// Mesh with fault
-// 0 ----- 3 - 1 ----- 2
+// 0 ----- 3-4-1 ----- 2
// 0 1
//
mesh = {
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3.mesh 2008-03-02 05:11:28 UTC (rev 11298)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3.mesh 2008-03-02 05:24:22 UTC (rev 11299)
@@ -8,13 +8,13 @@
// 1
//
// Mesh with fault
-// 5 - 2
+// 5-7-2
// / | | \
// / | | \
// 0 0 | | 1 3
// \ | | /
// \ | | /
-// 4 - 1
+// 4-6-1
//
mesh = {
dimension = 2
More information about the cig-commits
mailing list