[cig-commits] r17953 - in short/3D/PyLith/trunk: libsrc/faults libsrc/topology libsrc/utils unittests/libtests/faults unittests/libtests/feassemble unittests/libtests/meshio unittests/libtests/topology
brad at geodynamics.org
brad at geodynamics.org
Tue Feb 22 21:13:41 PST 2011
Author: brad
Date: 2011-02-22 21:13:41 -0800 (Tue, 22 Feb 2011)
New Revision: 17953
Modified:
short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
short/3D/PyLith/trunk/libsrc/topology/Mesh.hh
short/3D/PyLith/trunk/libsrc/topology/topologyfwd.hh
short/3D/PyLith/trunk/libsrc/utils/sievefwd.hh
short/3D/PyLith/trunk/libsrc/utils/sievetypes.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestBruneSlipFn.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestConstRateSlipFn.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestEqKinSrc.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestLiuCosSlipFn.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestStepSlipFn.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestTimeHistorySlipFn.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldMesh.cc
short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldSubMesh.cc
short/3D/PyLith/trunk/unittests/libtests/topology/TestSubMesh.cc
Log:
Merge from stable.
Modified: short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -260,7 +260,7 @@
assert(!faces.isNull());
const SieveSubMesh::label_sequence::const_iterator facesBegin = faces->begin();
const SieveSubMesh::label_sequence::const_iterator facesEnd = faces->end();
- const ALE::Obj<Mesh::label_type>& material =
+ const ALE::Obj<SieveFlexMesh::label_type>& material =
sieveMesh->getLabel("material-id");
assert(!material.isNull());
const int firstCohesiveCell = firstFaultCell;
@@ -269,7 +269,7 @@
TopologyOps::PointSet replaceVertices;
ALE::ISieveVisitor::PointRetriever<SieveMesh::sieve_type> sV2(std::max(1, ifaultSieve->getMaxSupportSize()));
ALE::ISieveVisitor::NConeRetriever<SieveMesh::sieve_type> cV2(*ifaultSieve, (size_t) pow(std::max(1, ifaultSieve->getMaxConeSize()), faultSieveMesh->depth()));
- std::set<Mesh::point_type> faceSet;
+ std::set<SieveFlexMesh::point_type> faceSet;
for(SieveSubMesh::label_sequence::iterator f_iter = facesBegin;
f_iter != facesEnd;
@@ -303,7 +303,7 @@
std::cout << " firstCohesiveCell " << firstCohesiveCell << " firstFaultCell "
<< firstFaultCell << " numFaces " << faces->size() << std::endl;
std::cout << " faceSet:" << std::endl;
- for(std::set<Mesh::point_type>::const_iterator p_iter = faceSet.begin();
+ for(std::set<SieveFlexMesh::point_type>::const_iterator p_iter = faceSet.begin();
p_iter != faceSet.end();
++p_iter) {
std::cout << " " << *p_iter << std::endl;
@@ -571,7 +571,7 @@
} // if/else
} // if/else
} // for
- ReplaceVisitor<SieveMesh::sieve_type,std::map<Mesh::point_type,Mesh::point_type> > rVc(vertexRenumber, std::max(1, sieve->getMaxConeSize()), debug);
+ ReplaceVisitor<SieveMesh::sieve_type,std::map<SieveMesh::point_type,SieveMesh::point_type> > rVc(vertexRenumber, std::max(1, sieve->getMaxConeSize()), debug);
rCellsEnd = replaceCells.end();
for (TopologyOps::PointSet::const_iterator c_iter = replaceCells.begin();
@@ -585,7 +585,7 @@
} // if
rVc.clear();
} // for
- ReplaceVisitor<SieveMesh::sieve_type,std::map<Mesh::point_type,Mesh::point_type> > rVs(cellRenumber, std::max(1, sieve->getMaxSupportSize()), debug);
+ ReplaceVisitor<SieveMesh::sieve_type,std::map<SieveMesh::point_type,SieveMesh::point_type> > rVs(cellRenumber, std::max(1, sieve->getMaxSupportSize()), debug);
rVerticesEnd = replaceVertices.end();
for (TopologyOps::PointSet::const_iterator v_iter = replaceVertices.begin();
@@ -614,13 +614,13 @@
const std::string labelName("censored depth");
if (!sieveMesh->hasLabel(labelName)) {
- const ALE::Obj<Mesh::label_type>& label = sieveMesh->createLabel(labelName);
+ const ALE::Obj<SieveMesh::label_type>& label = sieveMesh->createLabel(labelName);
assert(!label.isNull());
TopologyOps::computeCensoredDepth(label, sieveMesh->getSieve(), firstFaultVertex);
} else {
// Insert new shadow vertices into existing label
- const ALE::Obj<Mesh::label_type>& label = sieveMesh->getLabel(labelName);
+ const ALE::Obj<SieveMesh::label_type>& label = sieveMesh->getLabel(labelName);
assert(!label.isNull());
const std::map<int,int>::const_iterator vRenumberEnd = vertexRenumber.end();
@@ -704,8 +704,8 @@
ALE::Obj<FlexMesh> fault =
new FlexMesh(mesh.comm(), mesh.dimension()-1, mesh.debug());
assert(!fault.isNull());
- ALE::Obj<FlexMesh::sieve_type> faultSieve =
- new FlexMesh::sieve_type(sieve->comm(), sieve->debug());
+ ALE::Obj<SieveFlexMesh::sieve_type> faultSieve =
+ new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
assert(!faultSieve.isNull());
const ALE::Obj<SieveMesh::label_sequence>& cohesiveCells =
@@ -732,7 +732,7 @@
++c_iter) {
sieve->cone(*c_iter, cV);
const int coneSize = cV.getSize();
- const Mesh::point_type *cone = cV.getPoints();
+ const SieveMesh::point_type *cone = cV.getPoints();
int color = 0;
if (!constraintCell) {
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -1651,7 +1651,7 @@
*c_iter, ncV);
const int coneSize = ncV.getSize();
assert(coneSize == 3*numBasis);
- const Mesh::point_type *cohesiveCone = ncV.getPoints();
+ const SieveMesh::point_type *cohesiveCone = ncV.getPoints();
assert(0 != cohesiveCone);
const SieveMesh::point_type c_fault = _cohesiveToFault[*c_iter];
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -1446,7 +1446,7 @@
assert(!faultCells.isNull());
SieveSubMesh::label_sequence::iterator f_iter = faultCells->begin();
- SubMesh::renumbering_type& renumbering = faultSieveMesh->getRenumbering();
+ SieveSubMesh::renumbering_type& renumbering = faultSieveMesh->getRenumbering();
const SieveSubMesh::renumbering_type::const_iterator renumberingEnd =
renumbering.end();
const ALE::Obj<SieveSubMesh::label_sequence>& vertices =
@@ -1474,7 +1474,7 @@
ALE::ISieveTraversal<SieveMesh::sieve_type>::orientedClosure(*sieve, *c_iter, ncV);
const int coneSize = ncV.getSize();
assert(coneSize == numCorners);
- const Mesh::point_type *cone = ncV.getPoints();
+ const SieveMesh::point_type *cone = ncV.getPoints();
assert(0 != cone);
for (int iConstraint = 0; iConstraint < numConstraintVert; ++iConstraint) {
@@ -1635,7 +1635,7 @@
ALE::ISieveTraversal<SieveSubMesh::sieve_type>::orientedClosure(*sieve,
*c_iter, ncV);
const int coneSize = ncV.getSize();
- const Mesh::point_type *cone = ncV.getPoints();
+ const SieveSubMesh::point_type *cone = ncV.getPoints();
for (int v = 0; v < coneSize; ++v) {
// Compute Jacobian and determinant of Jacobian at vertex
Modified: short/3D/PyLith/trunk/libsrc/topology/Mesh.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/Mesh.hh 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/libsrc/topology/Mesh.hh 2011-02-23 05:13:41 UTC (rev 17953)
@@ -32,7 +32,7 @@
#include "ISectionSpaces.hh" // USES ISectionSpaces
-#include <petscmesh.hh> // HASA ALE::IMesh
+#include "pylith/utils/sievetypes.hh" // HASA pylith::SieveMesh
// Mesh -----------------------------------------------------------------
/** @brief PyLith finite-element mesh.
@@ -58,12 +58,16 @@
* (1) SieveSubMesh - SubMesh object
*/
//@{
- typedef ALE::IMesh<PetscInt,PetscScalar> SieveMesh;
- typedef ALE::IMesh<PetscInt,PetscScalar,ALE::LabelSifter<int, SieveMesh::point_type> > SieveSubMesh;
+ typedef pylith::SieveMesh SieveMesh;
+ typedef pylith::SieveSubMesh SieveSubMesh;
- typedef SieveMesh::int_section_type IntSection;
typedef SieveMesh::real_section_type RealSection;
typedef ISectionSpaces<SieveMesh::point_type, double> RealUniformSection;
+ typedef SieveMesh::int_section_type IntSection;
+ typedef ALE::ISieveVisitor::RestrictVisitor<RealSection> RestrictVisitor;
+ typedef ALE::ISieveVisitor::UpdateAddVisitor<RealSection> UpdateAddVisitor;
+ typedef ALE::ISieveVisitor::UpdateAllVisitor<RealSection> UpdateAllVisitor;
+ typedef ALE::ISieveVisitor::IndicesVisitor<RealSection,SieveMesh::order_type,PetscInt> IndicesVisitor;
//@}
Modified: short/3D/PyLith/trunk/libsrc/topology/topologyfwd.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/topologyfwd.hh 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/libsrc/topology/topologyfwd.hh 2011-02-23 05:13:41 UTC (rev 17953)
@@ -57,7 +57,7 @@
class FieldBase;
template<typename mesh_type,
- typename section_type =ALE::IGeneralSection<pylith::Mesh::point_type, double> > class Field;
+ typename section_type =ALE::IGeneralSection<pylith::SieveMesh::point_type, double> > class Field;
template<typename field_type> class Fields;
template<typename mesh_type> class FieldsNew;
Modified: short/3D/PyLith/trunk/libsrc/utils/sievefwd.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/utils/sievefwd.hh 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/libsrc/utils/sievefwd.hh 2011-02-23 05:13:41 UTC (rev 17953)
@@ -30,7 +30,7 @@
namespace ALE {
/// PETSc mesh
- class Mesh;
+ template class Mesh<PetscInt,PetscScalar>;
} // ALE
#endif // pylith_utils_sievefwd_hh
Modified: short/3D/PyLith/trunk/libsrc/utils/sievetypes.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/utils/sievetypes.hh 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/libsrc/utils/sievetypes.hh 2011-02-23 05:13:41 UTC (rev 17953)
@@ -29,11 +29,14 @@
namespace pylith {
- /// Sieve mesh.
- typedef ALE::IMesh<PetscInt,PetscScalar> Mesh;
+ /// Sieve mesh (default, fast access with set sizes).
+ typedef ALE::IMesh<PetscInt,PetscScalar> SieveMesh;
+ /// Sieve mesh (flexible, slower access without set sizes).
+ typedef ALE::Mesh<PetscInt,PetscScalar> SieveFlexMesh;
+
/// Sieve submesh.
- typedef ALE::IMesh<PetscInt,PetscScalar,ALE::LabelSifter<int, Mesh::point_type> > SubMesh;
+ typedef ALE::IMesh<PetscInt,PetscScalar,ALE::LabelSifter<int, SieveMesh::point_type> > SieveSubMesh;
} // pylith
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestBruneSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestBruneSlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestBruneSlipFn.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/faults/TestConstRateSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestConstRateSlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestConstRateSlipFn.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/faults/TestEqKinSrc.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestEqKinSrc.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestEqKinSrc.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/faults/TestLiuCosSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestLiuCosSlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestLiuCosSlipFn.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/faults/TestStepSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestStepSlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestStepSlipFn.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/faults/TestTimeHistorySlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestTimeHistorySlipFn.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestTimeHistorySlipFn.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -423,15 +423,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/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/feassemble/TestQuadrature.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -205,14 +205,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();
@@ -328,14 +328,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/trunk/unittests/libtests/meshio/TestMeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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/trunk/unittests/libtests/topology/TestFieldMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldMesh.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldMesh.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -1321,8 +1321,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;
@@ -1332,7 +1332,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/trunk/unittests/libtests/topology/TestFieldSubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldSubMesh.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldSubMesh.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -972,8 +972,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;
@@ -984,7 +984,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/trunk/unittests/libtests/topology/TestSubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestSubMesh.cc 2011-02-23 04:15:14 UTC (rev 17952)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestSubMesh.cc 2011-02-23 05:13:41 UTC (rev 17953)
@@ -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