[cig-commits] r17952 - in short/3D/PyLith/branches/v1.5-stable/unittests/libtests: faults feassemble meshio topology
brad at geodynamics.org
brad at geodynamics.org
Tue Feb 22 20:15:15 PST 2011
Author: brad
Date: 2011-02-22 20:15:14 -0800 (Tue, 22 Feb 2011)
New Revision: 17952
Modified:
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestBruneSlipFn.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestConstRateSlipFn.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestEqKinSrc.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestLiuCosSlipFn.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestStepSlipFn.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestTimeHistorySlipFn.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestQuadrature.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/meshio/TestMeshIO.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestFieldMesh.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestFieldSubMesh.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestSubMesh.cc
Log:
Propagated sieve type changes to libtests.
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestBruneSlipFn.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestBruneSlipFn.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestBruneSlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -411,7 +411,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh->sieveMesh()->getIntSection(faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(faultMesh, faultBoundary,
@@ -459,8 +459,6 @@
void
pylith::faults::TestBruneSlipFn::_testInitialize(const _TestBruneSlipFn::DataStruct& data)
{ // _testInitialize
- typedef std::set<Mesh::point_type>::const_iterator vert_iterator;
-
// Setup mesh
topology::Mesh mesh;
meshio::MeshIOAscii meshIO;
@@ -485,7 +483,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh.sieveMesh()->getIntSection(data.faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(&faultMesh, faultBoundary,
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestConstRateSlipFn.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestConstRateSlipFn.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestConstRateSlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -330,7 +330,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh->sieveMesh()->getIntSection(faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(faultMesh, faultBoundary,
@@ -372,8 +372,6 @@
void
pylith::faults::TestConstRateSlipFn::_testInitialize(const _TestConstRateSlipFn::DataStruct& data)
{ // _testInitialize
- typedef std::set<Mesh::point_type>::const_iterator vert_iterator;
-
// Setup mesh
topology::Mesh mesh;
meshio::MeshIOAscii meshIO;
@@ -398,7 +396,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh.sieveMesh()->getIntSection(data.faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(&faultMesh, faultBoundary,
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestEqKinSrc.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestEqKinSrc.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestEqKinSrc.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -250,7 +250,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh->sieveMesh()->getIntSection(faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(faultMesh, faultBoundary,
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestLiuCosSlipFn.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestLiuCosSlipFn.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestLiuCosSlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -406,7 +406,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh->sieveMesh()->getIntSection(faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(faultMesh, faultBoundary,
@@ -453,8 +453,6 @@
void
pylith::faults::TestLiuCosSlipFn::_testInitialize(const _TestLiuCosSlipFn::DataStruct& data)
{ // _testInitialize
- typedef std::set<Mesh::point_type>::const_iterator vert_iterator;
-
// Setup mesh
topology::Mesh mesh;
meshio::MeshIOAscii meshIO;
@@ -479,7 +477,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh.sieveMesh()->getIntSection(data.faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(&faultMesh, faultBoundary,
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestStepSlipFn.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestStepSlipFn.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestStepSlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -322,7 +322,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh->sieveMesh()->getIntSection(faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(faultMesh, faultBoundary,
@@ -364,8 +364,6 @@
void
pylith::faults::TestStepSlipFn::_testInitialize(const _TestStepSlipFn::DataStruct& data)
{ // _testInitialize
- typedef std::set<SieveMesh::point_type>::const_iterator vert_iterator;
-
// Setup mesh
topology::Mesh mesh;
meshio::MeshIOAscii meshIO;
@@ -390,7 +388,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh.sieveMesh()->getIntSection(data.faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(&faultMesh, faultBoundary,
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestTimeHistorySlipFn.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestTimeHistorySlipFn.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestTimeHistorySlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -355,7 +355,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh->sieveMesh()->getIntSection(faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(faultMesh, faultBoundary,
@@ -400,8 +400,6 @@
void
pylith::faults::TestTimeHistorySlipFn::_testInitialize(const _TestTimeHistorySlipFn::DataStruct& data)
{ // _testInitialize
- typedef std::set<Mesh::point_type>::const_iterator vert_iterator;
-
// Setup mesh
topology::Mesh mesh;
meshio::MeshIOAscii meshIO;
@@ -426,7 +424,7 @@
if (useLagrangeConstraints) {
firstFaultCell += mesh.sieveMesh()->getIntSection(data.faultLabel)->size();
}
- ALE::Obj<ALE::Mesh> faultBoundary = 0;
+ ALE::Obj<SieveFlexMesh> faultBoundary = 0;
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
CohesiveTopology::createFault(&faultMesh, faultBoundary,
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -411,15 +411,15 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s,
_data->cellDim, _data->numCells,
const_cast<int*>(_data->cells),
_data->numVertices,
interpolate, _data->numBasis);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -328,15 +328,15 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s,
_data->cellDim, _data->numCells,
const_cast<int*>(_data->cells),
_data->numVertices,
interpolate, _data->numBasis);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -427,15 +427,15 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s,
_data->cellDim, _data->numCells,
const_cast<int*>(_data->cells),
_data->numVertices,
interpolate, _data->numBasis);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -427,15 +427,15 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s,
_data->cellDim, _data->numCells,
const_cast<int*>(_data->cells),
_data->numVertices,
interpolate, _data->numBasis);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -306,15 +306,15 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s,
_data->cellDim, _data->numCells,
const_cast<int*>(_data->cells),
_data->numVertices,
interpolate, _data->numBasis);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -232,15 +232,15 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s,
_data->cellDim, _data->numCells,
const_cast<int*>(_data->cells),
_data->numVertices,
interpolate, _data->numBasis);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestQuadrature.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestQuadrature.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestQuadrature.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -203,14 +203,14 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s, cellDim, numCells,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s, cellDim, numCells,
const_cast<int*>(data.cells),
data.numVertices,
interpolate, numBasis);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
@@ -327,14 +327,14 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s, cellDim, numCells,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s, cellDim, numCells,
const_cast<int*>(data.cells),
data.numVertices,
interpolate, numBasis);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/meshio/TestMeshIO.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/meshio/TestMeshIO.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/meshio/TestMeshIO.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -65,14 +65,14 @@
// Cells and vertices
const bool interpolate = false;
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s, data.cellDim, data.numCells,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s, data.cellDim, data.numCells,
const_cast<int*>(data.cells),
data.numVertices,
interpolate, data.numCorners);
- std::map<ALE::Mesh::point_type,ALE::Mesh::point_type> renumbering;
+ std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
sieveMesh->setSieve(sieve);
sieveMesh->stratify();
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestFieldMesh.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestFieldMesh.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestFieldMesh.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -1214,8 +1214,8 @@
new Mesh::SieveMesh::sieve_type(sieveMesh->comm());
CPPUNIT_ASSERT(!sieve.isNull());
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
const int cellDim = _TestFieldMesh::cellDim;
const int ncells = _TestFieldMesh::ncells;
@@ -1225,7 +1225,7 @@
const int spaceDim = _TestFieldMesh::cellDim;
const double* coordinates = _TestFieldMesh::coordinates;
const bool interpolate = false;
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s, cellDim, ncells, (int*) cells,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s, cellDim, ncells, (int*) cells,
nvertices, interpolate,
ncorners);
std::map<Mesh::SieveMesh::point_type,Mesh::SieveMesh::point_type> renumbering;
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestFieldSubMesh.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestFieldSubMesh.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestFieldSubMesh.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -907,8 +907,8 @@
new Mesh::SieveMesh::sieve_type(sieveMesh->comm());
CPPUNIT_ASSERT(!sieve.isNull());
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
CPPUNIT_ASSERT(!s.isNull());
const int cellDim = _TestFieldSubMesh::cellDim;
@@ -919,7 +919,7 @@
const int spaceDim = _TestFieldSubMesh::cellDim;
const double* coordinates = _TestFieldSubMesh::coordinates;
const bool interpolate = false;
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s, cellDim, ncells, (int*) cells,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s, cellDim, ncells, (int*) cells,
nvertices, interpolate,
ncorners);
std::map<Mesh::SieveMesh::point_type,Mesh::SieveMesh::point_type> renumbering;
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestSubMesh.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestSubMesh.cc 2011-02-23 03:36:45 UTC (rev 17951)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/topology/TestSubMesh.cc 2011-02-23 04:15:14 UTC (rev 17952)
@@ -215,8 +215,8 @@
new Mesh::SieveMesh::sieve_type(sieveMesh->comm());
CPPUNIT_ASSERT(!sieve.isNull());
- ALE::Obj<ALE::Mesh::sieve_type> s =
- new ALE::Mesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> s =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
const int cellDim = _TestSubMesh::cellDim;
const int ncells = _TestSubMesh::ncells;
@@ -226,7 +226,7 @@
const int spaceDim = _TestSubMesh::cellDim;
const double* coordinates = _TestSubMesh::coordinates;
const bool interpolate = false;
- ALE::SieveBuilder<ALE::Mesh>::buildTopology(s, cellDim, ncells, (int*) cells,
+ ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s, cellDim, ncells, (int*) cells,
nvertices, interpolate,
ncorners);
std::map<Mesh::SieveMesh::point_type,Mesh::SieveMesh::point_type> renumbering;
More information about the CIG-COMMITS
mailing list