[cig-commits] r11359 - in short/3D/PyLith/trunk: libsrc/meshio unittests/libtests/bc unittests/libtests/faults unittests/libtests/meshio
brad at geodynamics.org
brad at geodynamics.org
Thu Mar 6 16:52:32 PST 2008
Author: brad
Date: 2008-03-06 16:52:32 -0800 (Thu, 06 Mar 2008)
New Revision: 11359
Modified:
short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPoints.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestCellFilterAvg.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputManager.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnSubset.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestVertexFilterVecNorm.cc
Log:
Added clearing of mesh factory when reading mesh to clean up numberings. Removed other calls to clearing factory.
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -57,6 +57,7 @@
_mesh = mesh;
_read();
_mesh = 0;
+ (*mesh)->getFactory()->clear();
} // read
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -252,7 +252,6 @@
//iohandler.debug(true);
iohandler.read(mesh);
CPPUNIT_ASSERT(!mesh->isNull());
- (*mesh)->getFactory()->clear();
spatialdata::geocoords::CSCart cs;
cs.setSpaceDim((*mesh)->getDimension());
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -291,7 +291,6 @@
iohandler.filename(_data->meshFilename);
iohandler.read(mesh);
CPPUNIT_ASSERT(!mesh->isNull());
- (*mesh)->getFactory()->clear();
spatialdata::geocoords::CSCart cs;
cs.setSpaceDim((*mesh)->getDimension());
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPoints.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPoints.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPoints.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -276,7 +276,6 @@
iohandler.filename(_data->meshFilename);
iohandler.read(mesh);
CPPUNIT_ASSERT(!mesh->isNull());
- (*mesh)->getFactory()->clear();
spatialdata::geocoords::CSCart cs;
cs.setSpaceDim((*mesh)->getDimension());
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -216,7 +216,6 @@
iohandler.filename(_data->meshFilename);
iohandler.read(mesh);
CPPUNIT_ASSERT(!mesh->isNull());
- (*mesh)->getFactory()->clear();
// Set up coordinates
spatialdata::geocoords::CSCart cs;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -406,7 +406,6 @@
iohandler.filename(_data->meshFilename);
iohandler.read(mesh);
CPPUNIT_ASSERT(!mesh->isNull());
- (*mesh)->getFactory()->clear();
//(*mesh)->setDebug(true); // DEBUGGING
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestCellFilterAvg.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestCellFilterAvg.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestCellFilterAvg.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -80,7 +80,6 @@
iohandler.filename(filename);
iohandler.read(&mesh);
CPPUNIT_ASSERT(!mesh.isNull());
- mesh->getFactory()->clear();
// Set cell field
const ALE::Obj<Mesh::label_sequence>& cells = mesh->heightStratum(0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -35,7 +35,6 @@
iohandler.filename(_data->meshFilename);
iohandler.read(&_meshDomain);
CPPUNIT_ASSERT(!_meshDomain.isNull());
- _meshDomain->getFactory()->clear();
if (0 != _data->faultLabel) {
faults::FaultCohesiveKin fault;
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMesh.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -33,7 +33,6 @@
iohandler.filename(_data->meshFilename);
iohandler.read(&_meshDomain);
CPPUNIT_ASSERT(!_meshDomain.isNull());
- _meshDomain->getFactory()->clear();
faults::FaultCohesiveKin fault;
fault.label(_data->faultLabel);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKMesh.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -30,7 +30,6 @@
iohandler.filename(_data->meshFilename);
iohandler.read(&_mesh);
CPPUNIT_ASSERT(!_mesh.isNull());
- _mesh->getFactory()->clear();
if (0 != _data->faultLabel) {
faults::FaultCohesiveKin fault;
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -91,7 +91,6 @@
throw std::logic_error("Could not parse group type.");
(*mesh)->allocate(groupField);
} // for
- (*mesh)->getFactory()->clear();
return mesh;
} // _createMesh
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputManager.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputManager.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputManager.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -112,7 +112,6 @@
iohandler.filename("data/tri3.mesh");
iohandler.read(&mesh);
CPPUNIT_ASSERT(!mesh.isNull());
- mesh->getFactory()->clear();
spatialdata::geocoords::CSCart cs;
const int numTimeSteps = 1;
@@ -138,7 +137,6 @@
iohandler.filename("data/tri3.mesh");
iohandler.read(&mesh);
CPPUNIT_ASSERT(!mesh.isNull());
- mesh->getFactory()->clear();
spatialdata::geocoords::CSCart cs;
const int numTimeSteps = 1;
@@ -183,7 +181,6 @@
iohandler.filename(meshFilename);
iohandler.read(&mesh);
CPPUNIT_ASSERT(!mesh.isNull());
- mesh->getFactory()->clear();
// Set vertex field
const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
@@ -260,7 +257,6 @@
iohandler.filename(meshFilename);
iohandler.read(&mesh);
CPPUNIT_ASSERT(!mesh.isNull());
- mesh->getFactory()->clear();
// Set cell field
const ALE::Obj<Mesh::label_sequence>& cells = mesh->heightStratum(0);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnSubset.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnSubset.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestOutputSolnSubset.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -60,7 +60,6 @@
iohandler.filename("data/quad4.mesh");
iohandler.read(&mesh);
CPPUNIT_ASSERT(!mesh.isNull());
- mesh->getFactory()->clear();
OutputSolnSubset output;
output.label(label);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestVertexFilterVecNorm.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestVertexFilterVecNorm.cc 2008-03-07 00:51:12 UTC (rev 11358)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestVertexFilterVecNorm.cc 2008-03-07 00:52:32 UTC (rev 11359)
@@ -59,7 +59,6 @@
iohandler.filename(filename);
iohandler.read(&mesh);
CPPUNIT_ASSERT(!mesh.isNull());
- mesh->getFactory()->clear();
// Set vertex field
const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
More information about the cig-commits
mailing list