[cig-commits] r11748 - in short/3D/PyLith/trunk: libsrc/bc libsrc/faults libsrc/feassemble libsrc/materials libsrc/meshio libsrc/topology modulesrc/bc modulesrc/faults modulesrc/feassemble modulesrc/materials modulesrc/meshio modulesrc/solver modulesrc/topology unittests/libtests/bc unittests/libtests/faults unittests/libtests/feassemble unittests/libtests/meshio unittests/libtests/topology
knepley at geodynamics.org
knepley at geodynamics.org
Thu Apr 3 11:48:51 PDT 2008
Author: knepley
Date: 2008-04-03 11:48:51 -0700 (Thu, 03 Apr 2008)
New Revision: 11748
Modified:
short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc
short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.hh
short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.cc
short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.hh
short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.cc
short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.hh
short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
short/3D/PyLith/trunk/libsrc/bc/Neumann.hh
short/3D/PyLith/trunk/libsrc/faults/Fault.cc
short/3D/PyLith/trunk/libsrc/faults/Fault.hh
short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.hh
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.hh
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.hh
short/3D/PyLith/trunk/libsrc/feassemble/Constraint.hh
short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc
short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
short/3D/PyLith/trunk/libsrc/materials/Material.cc
short/3D/PyLith/trunk/libsrc/meshio/CellFilter.hh
short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.cc
short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.hh
short/3D/PyLith/trunk/libsrc/meshio/DataWriter.cc
short/3D/PyLith/trunk/libsrc/meshio/DataWriter.hh
short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.hh
short/3D/PyLith/trunk/libsrc/meshio/MeshIO.hh
short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc
short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh
short/3D/PyLith/trunk/libsrc/meshio/OutputSolnSubset.cc
short/3D/PyLith/trunk/libsrc/meshio/OutputSolnSubset.hh
short/3D/PyLith/trunk/libsrc/meshio/VertexFilter.hh
short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.cc
short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.hh
short/3D/PyLith/trunk/libsrc/topology/Distributor.cc
short/3D/PyLith/trunk/libsrc/topology/Distributor.hh
short/3D/PyLith/trunk/libsrc/topology/MeshOps.cc
short/3D/PyLith/trunk/modulesrc/bc/bc.pyxe.src
short/3D/PyLith/trunk/modulesrc/faults/faults.pyxe.src
short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src
short/3D/PyLith/trunk/modulesrc/materials/materials.pyxe.src
short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src
short/3D/PyLith/trunk/modulesrc/solver/solver.pyxe.src
short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src
short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.hh
short/3D/PyLith/trunk/unittests/libtests/bc/TestBoundaryMesh.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.hh
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundaryMulti.hh
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPoints.hh
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPointsMulti.hh
short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestBoundary.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.hh
short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldsManager.hh
Log:
Removed all direct references to ALE::Mesh
Modified: short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -43,7 +43,7 @@
// Initialize boundary condition. Determine orienation and compute traction
// vector at integration points.
void
-pylith::bc::AbsorbingDampers::initialize(const ALE::Obj<ALE::Mesh>& mesh,
+pylith::bc::AbsorbingDampers::initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir)
{ // initialize
@@ -58,7 +58,7 @@
// Extract submesh associated with boundary
_boundaryMesh =
- ALE::Selection<ALE::Mesh>::submesh(mesh, mesh->getIntSection(_label));
+ ALE::Selection<Mesh>::submesh(mesh, mesh->getIntSection(_label));
if (_boundaryMesh.isNull()) {
std::ostringstream msg;
msg << "Could not construct boundary mesh for absorbing boundary "
@@ -80,7 +80,7 @@
} // if
const int numCorners = _quadrature->numBasis();
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
_boundaryMesh->heightStratum(1);
assert(!cells.isNull());
@@ -224,7 +224,7 @@
PetscErrorCode err = 0;
// Get cell information
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
_boundaryMesh->heightStratum(1);
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsEnd = cells->end();
@@ -318,7 +318,7 @@
PetscErrorCode err = 0;
// Get cell information
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
_boundaryMesh->heightStratum(1);
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsEnd = cells->end();
Modified: short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -87,7 +87,7 @@
* @param upDir Direction perpendicular to horizontal surface tangent
* direction that is not collinear with surface normal.
*/
- void initialize(const ALE::Obj<ALE::Mesh>& mesh,
+ void initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir);
Modified: short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -42,7 +42,7 @@
// Initialize boundary condition.
void
pylith::bc::DirichletBoundary::initialize(
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir)
{ // initialize
@@ -57,7 +57,7 @@
// Extract submesh associated with boundary
_boundaryMesh =
- ALE::Selection<ALE::Mesh>::submesh(mesh, mesh->getIntSection(_label));
+ ALE::Selection<Mesh>::submesh(mesh, mesh->getIntSection(_label));
if (_boundaryMesh.isNull()) {
std::ostringstream msg;
msg << "Could not construct boundary mesh for Dirichlet boundary "
@@ -144,7 +144,7 @@
void
pylith::bc::DirichletBoundary::setConstraintSizes(
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // setConstraintSizes
assert(!field.isNull());
assert(!mesh.isNull());
@@ -186,7 +186,7 @@
void
pylith::bc::DirichletBoundary::setConstraints(
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // setConstraints
assert(!field.isNull());
assert(!mesh.isNull());
@@ -253,7 +253,7 @@
void
pylith::bc::DirichletBoundary::setField(const double t,
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // setField
assert(!field.isNull());
assert(!mesh.isNull());
Modified: short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -81,7 +81,7 @@
* @param mesh PETSc mesh
* @param cs Coordinate system for mesh
*/
- void initialize(const ALE::Obj<ALE::Mesh>& mesh,
+ void initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir);
@@ -91,7 +91,7 @@
* @param mesh PETSc mesh
*/
void setConstraintSizes(const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
/** Set which degrees of freedom are constrained at points in field.
*
@@ -99,7 +99,7 @@
* @param mesh PETSc mesh
*/
void setConstraints(const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
/** Set values in field.
*
@@ -109,7 +109,7 @@
*/
void setField(const double t,
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
/** Get boundary mesh.
*
Modified: short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -40,7 +40,7 @@
// Initialize boundary condition.
void
pylith::bc::DirichletPoints::initialize(
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir)
{ // initialize
@@ -136,7 +136,7 @@
void
pylith::bc::DirichletPoints::setConstraintSizes(
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // setConstraintSizes
assert(!field.isNull());
assert(!mesh.isNull());
@@ -170,7 +170,7 @@
void
pylith::bc::DirichletPoints::setConstraints(
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // setConstraints
assert(!field.isNull());
assert(!mesh.isNull());
@@ -233,7 +233,7 @@
void
pylith::bc::DirichletPoints::setField(const double t,
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // setField
assert(!field.isNull());
assert(!mesh.isNull());
Modified: short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -76,7 +76,7 @@
* @param mesh PETSc mesh
* @param cs Coordinate system for mesh
*/
- void initialize(const ALE::Obj<ALE::Mesh>& mesh,
+ void initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir);
@@ -86,7 +86,7 @@
* @param mesh PETSc mesh
*/
void setConstraintSizes(const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
/** Set which degrees of freedom are constrained at points in field.
*
@@ -94,7 +94,7 @@
* @param mesh PETSc mesh
*/
void setConstraints(const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
/** Set values in field.
*
@@ -104,7 +104,7 @@
*/
void setField(const double t,
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
// NOT IMPLEMENTED ////////////////////////////////////////////////////
private :
Modified: short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/Neumann.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/bc/Neumann.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -43,7 +43,7 @@
// Initialize boundary condition. Determine orienation and compute traction
// vector at integration points.
void
-pylith::bc::Neumann::initialize(const ALE::Obj<ALE::Mesh>& mesh,
+pylith::bc::Neumann::initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir)
{ // initialize
@@ -58,7 +58,7 @@
// Extract submesh associated with surface
_boundaryMesh =
- ALE::Selection<ALE::Mesh>::submesh(mesh, mesh->getIntSection(_label));
+ ALE::Selection<Mesh>::submesh(mesh, mesh->getIntSection(_label));
if (_boundaryMesh.isNull()) {
std::ostringstream msg;
msg << "Could not construct boundary mesh for Neumann traction "
@@ -256,7 +256,7 @@
PetscErrorCode err = 0;
// Get cell information
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
_boundaryMesh->heightStratum(1);
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsBegin = cells->begin();
Modified: short/3D/PyLith/trunk/libsrc/bc/Neumann.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/Neumann.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/bc/Neumann.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -57,7 +57,7 @@
* @param upDir Direction perpendicular to horizontal surface tangent
* direction that is not collinear with surface normal.
*/
- void initialize(const ALE::Obj<ALE::Mesh>& mesh,
+ void initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir);
Modified: short/3D/PyLith/trunk/libsrc/faults/Fault.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/Fault.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/faults/Fault.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -31,7 +31,7 @@
// ----------------------------------------------------------------------
// Get mesh associated with fault fields.
-const ALE::Obj<ALE::Mesh>&
+const ALE::Obj<pylith::Mesh>&
pylith::faults::Fault:: faultMesh(void) const
{ // faultMesh
return _faultMesh;
Modified: short/3D/PyLith/trunk/libsrc/faults/Fault.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/Fault.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/faults/Fault.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -97,7 +97,7 @@
* @param mesh PETSc mesh
*/
virtual
- void adjustTopology(const ALE::Obj<ALE::Mesh>& mesh) = 0;
+ void adjustTopology(const ALE::Obj<Mesh>& mesh) = 0;
/** Initialize fault. Determine orientation and setup boundary
* condition parameters.
@@ -114,7 +114,7 @@
* (used to improve conditioning of Jacobian matrix)
*/
virtual
- void initialize(const ALE::Obj<ALE::Mesh>& mesh,
+ void initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir,
const double_array& normalDir,
@@ -124,7 +124,7 @@
*
* @returns PETSc mesh object
*/
- const ALE::Obj<ALE::Mesh>& faultMesh(void) const;
+ const ALE::Obj<Mesh>& faultMesh(void) const;
/** Get vertex field associated with integrator.
*
@@ -168,7 +168,7 @@
// PROTECTED MEMBERS ////////////////////////////////////////////////////
protected :
- ALE::Obj<ALE::Mesh> _faultMesh; ///< Mesh over fault surface
+ ALE::Obj<Mesh> _faultMesh; ///< Mesh over fault surface
// PRIVATE MEMBERS ////////////////////////////////////////////////////
private :
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -38,7 +38,7 @@
// ----------------------------------------------------------------------
// Adjust mesh topology for fault implementation.
void
-pylith::faults::FaultCohesive::adjustTopology(const ALE::Obj<ALE::Mesh>& mesh)
+pylith::faults::FaultCohesive::adjustTopology(const ALE::Obj<Mesh>& mesh)
{ // adjustTopology
assert(std::string("") != label());
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -52,7 +52,7 @@
*
* @param mesh PETSc mesh
*/
- void adjustTopology(const ALE::Obj<ALE::Mesh>& mesh);
+ void adjustTopology(const ALE::Obj<Mesh>& mesh);
// PROTECTED METHODS //////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -37,7 +37,7 @@
// ----------------------------------------------------------------------
// Initialize fault. Determine orientation and setup boundary
void
-pylith::faults::FaultCohesiveDyn::initialize(const ALE::Obj<ALE::Mesh>& mesh,
+pylith::faults::FaultCohesiveDyn::initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir,
const double_array& normalDir,
@@ -98,7 +98,7 @@
throw std::runtime_error(msg.str());
} // if
const int numCorners = _quadrature->numBasis();
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", id());
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsBegin = cells->begin();
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -65,7 +65,7 @@
* @param matDB Database of bulk elastic properties for fault region
* (used to improve conditioning of Jacobian matrix)
*/
- void initialize(const ALE::Obj<ALE::Mesh>& mesh,
+ void initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir,
const double_array& normalDir,
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -59,7 +59,7 @@
// ----------------------------------------------------------------------
// Initialize fault. Determine orientation and setup boundary
void
-pylith::faults::FaultCohesiveKin::initialize(const ALE::Obj<ALE::Mesh>& mesh,
+pylith::faults::FaultCohesiveKin::initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir,
const double_array& normalDir,
@@ -130,7 +130,7 @@
double_array cellStiffness(numConstraintVert);
// Get cohesive cells
- const ALE::Obj<ALE::Mesh::label_sequence>& cellsCohesive =
+ const ALE::Obj<Mesh::label_sequence>& cellsCohesive =
mesh->getLabelStratum("material-id", id());
assert(!cellsCohesive.isNull());
const Mesh::label_sequence::iterator cellsCohesiveBegin =
@@ -262,7 +262,7 @@
PetscErrorCode err = 0;
// Get cohesive cells
- const ALE::Obj<ALE::Mesh::label_sequence>& cellsCohesive =
+ const ALE::Obj<Mesh::label_sequence>& cellsCohesive =
mesh->getLabelStratum("material-id", id());
assert(!cellsCohesive.isNull());
const Mesh::label_sequence::iterator cellsCohesiveBegin =
@@ -391,7 +391,7 @@
} // if
const int numCorners = _quadrature->refGeometry().numCorners();
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", id());
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsBegin = cells->begin();
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -89,7 +89,7 @@
* @param matDB Database of bulk elastic properties for fault region
* (used to improve conditioning of Jacobian matrix)
*/
- void initialize(const ALE::Obj<ALE::Mesh>& mesh,
+ void initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
const double_array& upDir,
const double_array& normalDir,
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Constraint.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Constraint.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Constraint.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -53,7 +53,7 @@
*/
virtual
void setConstraintSizes(const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh) = 0;
+ const ALE::Obj<Mesh>& mesh) = 0;
/** Set which degrees of freedom are constrained at points in field.
*
@@ -62,7 +62,7 @@
*/
virtual
void setConstraints(const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh) = 0;
+ const ALE::Obj<Mesh>& mesh) = 0;
/** Set flag for setting constraints for total field solution or
* incremental field solution.
@@ -81,7 +81,7 @@
virtual
void setField(const double t,
const ALE::Obj<real_section_type>& field,
- const ALE::Obj<ALE::Mesh>& mesh) = 0;
+ const ALE::Obj<Mesh>& mesh) = 0;
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -119,7 +119,7 @@
// Get cell information
const int materialId = _material->id();
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", materialId);
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsEnd = cells->end();
@@ -255,7 +255,7 @@
assert(!mesh.isNull());
// Get cell information
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", _material->id());
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsEnd = cells->end();
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -136,7 +136,7 @@
// Get cell information
const int materialId = _material->id();
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", materialId);
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsEnd = cells->end();
@@ -314,7 +314,7 @@
// Get cell information
const int materialId = _material->id();
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", materialId);
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsEnd = cells->end();
Modified: short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -187,7 +187,7 @@
throw std::runtime_error(msg.str());
} // if
const int numCorners = _quadrature->refGeometry().numCorners();
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", _material->id());
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsEnd = cells->end();
Modified: short/3D/PyLith/trunk/libsrc/materials/Material.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/Material.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/materials/Material.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -59,7 +59,7 @@
// ----------------------------------------------------------------------
// Get physical property parameters from database.
void
-pylith::materials::Material::initialize(const ALE::Obj<ALE::Mesh>& mesh,
+pylith::materials::Material::initialize(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
pylith::feassemble::Quadrature* quadrature)
{ // initialize
@@ -71,10 +71,10 @@
// Get cells associated with material
const ALE::Obj<real_section_type>& coordinates =
mesh->getRealSection("coordinates");
- const ALE::Obj<ALE::Mesh::label_sequence>& cells =
+ const ALE::Obj<Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", _id);
assert(!cells.isNull());
- const ALE::Mesh::label_sequence::iterator cellsEnd = cells->end();
+ const Mesh::label_sequence::iterator cellsEnd = cells->end();
// Create sections to hold physical properties and state variables.
_properties = new real_section_type(mesh->comm(), mesh->debug());
Modified: short/3D/PyLith/trunk/libsrc/meshio/CellFilter.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/CellFilter.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/CellFilter.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -20,7 +20,7 @@
#if !defined(pylith_meshio_cellfilter_hh)
#define pylith_meshio_cellfilter_hh
-#include "pylith/utils/sievetypes.hh" // USES ALE::Mesh, real_section_type
+#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh, real_section_type
#include "pylith/utils/vectorfields.hh" // USES VectorFieldEnum
namespace pylith {
@@ -72,7 +72,7 @@
const ALE::Obj<real_section_type>&
filter(VectorFieldEnum* fieldType,
const ALE::Obj<real_section_type>& fieldIn,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const char* label =0,
const int labelId =0) = 0;
Modified: short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -49,7 +49,7 @@
pylith::meshio::CellFilterAvg::filter(
VectorFieldEnum* fieldType,
const ALE::Obj<real_section_type>& fieldIn,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const char* label,
const int labelId)
{ // filter
Modified: short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -59,7 +59,7 @@
const ALE::Obj<real_section_type>&
filter(VectorFieldEnum* fieldType,
const ALE::Obj<real_section_type>& fieldIn,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const char* label =0,
const int labelId =0);
Modified: short/3D/PyLith/trunk/libsrc/meshio/DataWriter.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriter.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriter.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -31,7 +31,7 @@
// Prepare for writing files.
void
pylith::meshio::DataWriter::open(
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const int numTimeSteps,
const char* label,
@@ -52,7 +52,7 @@
void
pylith::meshio::DataWriter::openTimeStep(
const double t,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const char* label,
const int labelId)
Modified: short/3D/PyLith/trunk/libsrc/meshio/DataWriter.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriter.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriter.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -19,7 +19,7 @@
#if !defined(pylith_meshio_datawriter_hh)
#define pylith_meshio_datawriter_hh
-#include "pylith/utils/sievetypes.hh" // USES ALE::Obj, ALE::Mesh, real_section_type
+#include "pylith/utils/sievetypes.hh" // USES ALE::Obj, PETSc Mesh, real_section_type
#include "pylith/utils/vectorfields.hh" // USES VectorFieldEnum
namespace pylith {
@@ -64,7 +64,7 @@
* @param labelId Value of label defining which cells to include.
*/
virtual
- void open(const ALE::Obj<ALE::Mesh>& mesh,
+ void open(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const int numTimeSteps,
const char* label =0,
@@ -85,7 +85,7 @@
*/
virtual
void openTimeStep(const double t,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const char* label =0,
const int labelId =0);
@@ -107,7 +107,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh) = 0;
+ const ALE::Obj<Mesh>& mesh) = 0;
/** Write field over cells to file.
*
@@ -125,7 +125,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const char* label =0,
const int labelId =0) = 0;
Modified: short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -57,7 +57,7 @@
void
pylith::meshio::DataWriterVTK::openTimeStep(
const double t,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const char* label,
const int labelId)
@@ -141,7 +141,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // writeVertexField
assert(0 != name);
assert(!mesh.isNull());
@@ -203,7 +203,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const char* label,
const int labelId)
{ // writeCellField
Modified: short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -70,7 +70,7 @@
* @param labelId Value of label defining which cells to include.
*/
void openTimeStep(const double t,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const char* label =0,
const int labelId =0);
@@ -90,7 +90,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
/** Write field over cells to file.
*
@@ -107,7 +107,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const char* label =0,
const int labelId =0);
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIO.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIO.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIO.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -16,7 +16,7 @@
#include "pylith/utils/arrayfwd.hh" // USES double_array, int_array,
// string_vector
-#include "pylith/utils/sievefwd.hh" // USES ALE::Obj, ALE::Mesh
+#include "pylith/utils/sievetypes.hh" // USES Obj, PETSc Mesh
namespace pylith {
namespace meshio {
@@ -71,13 +71,13 @@
*
* @param mesh Pointer to PETSc mesh object
*/
- void read(ALE::Obj<ALE::Mesh>* mesh);
+ void read(ALE::Obj<pylith::Mesh>* mesh);
/** Write mesh to file.
*
* @param mesh Pointer to PETSc mesh object
*/
- void write(ALE::Obj<ALE::Mesh>* mesh);
+ void write(ALE::Obj<pylith::Mesh>* mesh);
// PROTECTED MEMBERS ////////////////////////////////////////////////////
protected :
@@ -202,7 +202,7 @@
bool _debug; ///< True to turn of mesh debugging output
bool _interpolate; ///< True if building intermediate topology elements
- ALE::Obj<ALE::Mesh>* _mesh; ///< Pointer to PETSc mesh object
+ ALE::Obj<pylith::Mesh>* _mesh; ///< Pointer to PETSc mesh object
}; // MeshIO
Modified: short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -76,7 +76,7 @@
// Prepare for output.
void
pylith::meshio::OutputManager::open(
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const int numTimeSteps,
const char* label,
@@ -101,7 +101,7 @@
void
pylith::meshio::OutputManager::openTimeStep(
const double t,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const char* label,
const int labelId)
@@ -127,7 +127,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // appendVertexField
assert(0 != name);
@@ -147,7 +147,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const char* label,
const int labelId)
{ // appendCellField
Modified: short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -19,7 +19,7 @@
#if !defined(pylith_meshio_outputmanager_hh)
#define pylith_meshio_outputmanager_hh
-#include "pylith/utils/sievetypes.hh" // USES ALE::Mesh, real_section_type
+#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh, real_section_type
#include "pylith/utils/vectorfields.hh" // USES VectorFieldEnum
namespace pylith {
@@ -87,7 +87,7 @@
* (=0 means use all cells in mesh).
* @param labelId Value of label defining which cells to include.
*/
- void open(const ALE::Obj<ALE::Mesh>& mesh,
+ void open(const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const int numTimeSteps,
const char* label =0,
@@ -106,7 +106,7 @@
* @param labelId Value of label defining which cells to include.
*/
void openTimeStep(const double t,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh,
const char* label =0,
const int labelId =0);
@@ -126,7 +126,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
/** Append finite-element cell field to file.
*
@@ -143,7 +143,7 @@
const char* name,
const ALE::Obj<real_section_type>& field,
const VectorFieldEnum fieldType,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const char* label =0,
const int labelId =0);
Modified: short/3D/PyLith/trunk/libsrc/meshio/OutputSolnSubset.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/OutputSolnSubset.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/OutputSolnSubset.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -58,7 +58,7 @@
pylith::meshio::OutputSolnSubset::subdomainMesh(const ALE::Obj<Mesh>& mesh)
{ // subdomainMesh
_mesh =
- ALE::Selection<ALE::Mesh>::submesh(mesh, mesh->getIntSection(_label));
+ ALE::Selection<Mesh>::submesh(mesh, mesh->getIntSection(_label));
if (_mesh.isNull()) {
std::ostringstream msg;
msg << "Could not construct mesh of subdomain " << _label << "'.";
Modified: short/3D/PyLith/trunk/libsrc/meshio/OutputSolnSubset.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/OutputSolnSubset.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/OutputSolnSubset.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -22,7 +22,7 @@
#include "OutputManager.hh" // ISA OutputManager
-#include "pylith/utils/sievetypes.hh" // HASA ALE::Mesh
+#include "pylith/utils/sievetypes.hh" // HASA PETSc Mesh
#include <string> // HASA std::string
namespace pylith {
Modified: short/3D/PyLith/trunk/libsrc/meshio/VertexFilter.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/VertexFilter.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/VertexFilter.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -20,7 +20,7 @@
#if !defined(pylith_meshio_vertexfilter_hh)
#define pylith_meshio_vertexfilter_hh
-#include "pylith/utils/sievetypes.hh" // USES ALE::Mesh, real_section_type
+#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh, real_section_type
#include "pylith/utils/vectorfields.hh" // USES VectorFieldEnum
namespace pylith {
@@ -59,7 +59,7 @@
const ALE::Obj<real_section_type>&
filter(VectorFieldEnum* fieldType,
const ALE::Obj<real_section_type>& fieldIn,
- const ALE::Obj<ALE::Mesh>& mesh) = 0;
+ const ALE::Obj<Mesh>& mesh) = 0;
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -47,7 +47,7 @@
pylith::meshio::VertexFilterVecNorm::filter(
VectorFieldEnum* fieldType,
const ALE::Obj<real_section_type>& fieldIn,
- const ALE::Obj<ALE::Mesh>& mesh)
+ const ALE::Obj<Mesh>& mesh)
{ // filter
assert(0 != fieldType);
*fieldType = SCALAR_FIELD;
Modified: short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -55,7 +55,7 @@
const ALE::Obj<real_section_type>&
filter(VectorFieldEnum* fieldType,
const ALE::Obj<real_section_type>& fieldIn,
- const ALE::Obj<ALE::Mesh>& mesh);
+ const ALE::Obj<Mesh>& mesh);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/topology/Distributor.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/Distributor.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/topology/Distributor.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -43,10 +43,10 @@
const char* partitioner)
{ // distribute
if (strlen(partitioner) == 0)
- *newMesh = ALE::Distribution<ALE::Mesh>::distributeMesh(origMesh);
+ *newMesh = ALE::Distribution<Mesh>::distributeMesh(origMesh);
else
*newMesh =
- ALE::Distribution<ALE::Mesh>::distributeMesh(origMesh, 0, partitioner);
+ ALE::Distribution<Mesh>::distributeMesh(origMesh, 0, partitioner);
} // distribute
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/topology/Distributor.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/Distributor.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/topology/Distributor.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -19,7 +19,7 @@
#if !defined(pylith_topology_distributor_hh)
#define pylith_topology_distributor_hh
-#include "pylith/utils/sievefwd.hh" // USES PETSc Mesh
+#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
namespace pylith {
namespace topology {
@@ -58,8 +58,8 @@
* @param partitioner Name of partitioner to use in distributing mesh.
*/
static
- void distribute(ALE::Obj<ALE::Mesh>* const newMesh,
- const ALE::Obj<ALE::Mesh>& mesh,
+ void distribute(ALE::Obj<Mesh>* const newMesh,
+ const ALE::Obj<Mesh>& mesh,
const char* partitioner);
/** Write partitioning info for distributed mesh.
@@ -70,7 +70,7 @@
*/
static
void write(meshio::OutputManager* const output,
- const ALE::Obj<ALE::Mesh>& mesh,
+ const ALE::Obj<Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs);
// NOT IMPLEMENTED //////////////////////////////////////////////////////
Modified: short/3D/PyLith/trunk/libsrc/topology/MeshOps.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/MeshOps.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/libsrc/topology/MeshOps.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -29,7 +29,7 @@
assert( (0 == numMaterials && 0 == materialIds) ||
(0 < numMaterials && 0 != materialIds) );
- const ALE::Obj<ALE::Mesh::label_sequence>& cells = mesh->heightStratum(0);
+ const ALE::Obj<Mesh::label_sequence>& cells = mesh->heightStratum(0);
assert(!cells.isNull());
const Mesh::label_sequence::iterator cellsEnd = cells->end();
const ALE::Obj<Mesh::label_type>& materialsLabel = mesh->getLabel("material-id");
Modified: short/3D/PyLith/trunk/modulesrc/bc/bc.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/bc/bc.pyxe.src 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/modulesrc/bc/bc.pyxe.src 2008-04-03 18:48:51 UTC (rev 11748)
@@ -79,7 +79,7 @@
try {
assert(0 != objVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::BoundaryCondition*) objVptr)->verifyConfiguration(*mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -111,7 +111,7 @@
assert(0 != objVptr);
assert(0 != meshVptr);
assert(0 != csVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
spatialdata::geocoords::CoordSys* cs =
(spatialdata::geocoords::CoordSys*) csVptr;
pylith::double_array upDir(3);
@@ -319,7 +319,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::DirichletPoints*) objVptr)->setConstraintSizes(*field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -353,7 +353,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::DirichletPoints*) objVptr)->setConstraints(*field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -386,7 +386,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::DirichletPoints*) objVptr)->setField(t, *field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -540,7 +540,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::DirichletBoundary*) objVptr)->setConstraintSizes(*field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -574,7 +574,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::DirichletBoundary*) objVptr)->setConstraints(*field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -607,7 +607,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::DirichletBoundary*) objVptr)->setField(t, *field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -639,7 +639,7 @@
try {
assert(0 != objVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
*mesh = ((pylith::bc::DirichletBoundary*) objVptr)->boundaryMesh();
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -674,7 +674,7 @@
assert(0 != name);
assert(0 != meshVptr);
pylith::bc::DirichletBoundary* bc = (pylith::bc::DirichletBoundary*) objVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
pylith::VectorFieldEnum fieldType;
@@ -780,8 +780,8 @@
assert(0 != residualVptr);
assert(0 != fieldsVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
ALE::Obj<pylith::real_section_type>* residual =
(ALE::Obj<pylith::real_section_type>*) residualVptr;
pylith::topology::FieldsManager* fields =
@@ -821,8 +821,8 @@
assert(0 != matVptr);
assert(0 != fieldsVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
PetscMat* mat = (PetscMat*) matVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
@@ -862,8 +862,8 @@
assert(0 != meshVptr);
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::AbsorbingDampers*) objVptr)->updateState(t, fields, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -1074,8 +1074,8 @@
assert(0 != residualVptr);
assert(0 != fieldsVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
ALE::Obj<pylith::real_section_type>* residual =
(ALE::Obj<pylith::real_section_type>*) residualVptr;
pylith::topology::FieldsManager* fields =
@@ -1115,8 +1115,8 @@
assert(0 != matVptr);
assert(0 != fieldsVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
PetscMat* mat = (PetscMat*) matVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
@@ -1156,8 +1156,8 @@
assert(0 != meshVptr);
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::bc::Neumann*) objVptr)->updateState(t, fields, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -1192,7 +1192,7 @@
try {
assert(0 != objVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
*mesh = ((pylith::bc::Neumann*) objVptr)->boundaryMesh();
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -1227,7 +1227,7 @@
assert(0 != name);
assert(0 != meshVptr);
pylith::bc::Neumann* bc = (pylith::bc::Neumann*) objVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
pylith::VectorFieldEnum fieldType;
Modified: short/3D/PyLith/trunk/modulesrc/faults/faults.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/faults/faults.pyxe.src 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/modulesrc/faults/faults.pyxe.src 2008-04-03 18:48:51 UTC (rev 11748)
@@ -76,7 +76,7 @@
#embed{ void Fault_adjustTopology(void* objVptr, void* meshVptr)
try {
assert(0 != objVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::faults::Fault*) objVptr)->adjustTopology(*mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -104,7 +104,7 @@
assert(0 != meshVptr);
assert(0 != csVptr);
assert(0 != dbVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
spatialdata::geocoords::CoordSys* cs =
(spatialdata::geocoords::CoordSys*) csVptr;
spatialdata::spatialdb::SpatialDB* matDB =
@@ -170,7 +170,7 @@
try {
assert(0 != objVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
*mesh = ((pylith::faults::Fault*) objVptr)->faultMesh();
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -205,7 +205,7 @@
assert(0 != name);
assert(0 != meshVptr);
pylith::faults::Fault* fault = (pylith::faults::Fault*) objVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
pylith::VectorFieldEnum fieldType;
@@ -259,7 +259,7 @@
assert(0 != name);
assert(0 != meshVptr);
pylith::faults::Fault* fault = (pylith::faults::Fault*) objVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
pylith::VectorFieldEnum fieldType;
@@ -432,8 +432,8 @@
assert(0 != residualVptr);
assert(0 != fieldsVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
ALE::Obj<pylith::real_section_type>* residual =
(ALE::Obj<pylith::real_section_type>*) residualVptr;
pylith::topology::FieldsManager* fields =
@@ -473,8 +473,8 @@
assert(0 != matVptr);
assert(0 != fieldsVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
PetscMat* mat = (PetscMat*) matVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
@@ -514,8 +514,8 @@
assert(0 != meshVptr);
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::faults::FaultCohesiveKin*) objVptr)->updateState(t, fields, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -550,8 +550,8 @@
try {
assert(0 != objVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::faults::FaultCohesiveKin*) objVptr)->verifyConfiguration(*mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
Modified: short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src 2008-04-03 18:48:51 UTC (rev 11748)
@@ -934,8 +934,8 @@
assert(0 != residualVptr);
assert(0 != fieldsVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
ALE::Obj<pylith::real_section_type>* residual =
(ALE::Obj<pylith::real_section_type>*) residualVptr;
pylith::topology::FieldsManager* fields =
@@ -975,8 +975,8 @@
assert(0 != matVptr);
assert(0 != fieldsVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
PetscMat* mat = (PetscMat*) matVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
@@ -1019,8 +1019,8 @@
assert(0 != meshVptr);
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::feassemble::Integrator*) objVptr)->updateState(t, fields, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -1055,8 +1055,8 @@
try {
assert(0 != objVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::feassemble::Integrator*) objVptr)->verifyConfiguration(*mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -1239,7 +1239,7 @@
assert(0 != name);
assert(0 != meshVptr);
pylith::feassemble::IntegratorElasticity* integrator = (pylith::feassemble::IntegratorElasticity*) objVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
pylith::topology::FieldsManager* fields =
(pylith::topology::FieldsManager*) fieldsVptr;
pylith::VectorFieldEnum fieldType;
@@ -1416,7 +1416,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::feassemble::Constraint*) objVptr)->setConstraintSizes(*field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -1450,7 +1450,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::feassemble::Constraint*) objVptr)->setConstraints(*field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -1483,7 +1483,7 @@
assert(0 != fieldVptr);
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field = (ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::feassemble::Constraint*) objVptr)->setField(t, *field, *mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
Modified: short/3D/PyLith/trunk/modulesrc/materials/materials.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/materials/materials.pyxe.src 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/modulesrc/materials/materials.pyxe.src 2008-04-03 18:48:51 UTC (rev 11748)
@@ -83,7 +83,7 @@
assert(0 != meshVptr);
assert(0 != csVptr);
assert(0 != qVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
spatialdata::geocoords::CoordSys* cs =
(spatialdata::geocoords::CoordSys*) csVptr;
pylith::feassemble::Quadrature* quadrature =
Modified: short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src 2008-04-03 18:48:51 UTC (rev 11748)
@@ -85,7 +85,7 @@
try {
assert(0 != objVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::meshio::MeshIO*) objVptr)->read(mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -113,7 +113,7 @@
#embed{ void MeshIO_write(void* objVptr, void* meshVptr)
try {
assert(0 != objVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::meshio::MeshIO*) objVptr)->write(mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -698,7 +698,7 @@
try {
assert(0 != objVptr);
assert(0 != csVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
spatialdata::geocoords::CoordSys* cs =
(spatialdata::geocoords::CoordSys*) csVptr;
((pylith::meshio::OutputManager*) objVptr)->open(*mesh, cs, numTimeSteps, label, labelId);
@@ -762,7 +762,7 @@
assert(0 != objVptr);
assert(0 != meshVptr);
assert(0 != csVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
spatialdata::geocoords::CoordSys* cs =
(spatialdata::geocoords::CoordSys*) csVptr;
((pylith::meshio::OutputManager*) objVptr)->openTimeStep(t, *mesh, cs,
@@ -832,7 +832,7 @@
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field =
(ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
const pylith::VectorFieldEnum fieldType =
(pylith::VectorFieldEnum) fieldTypeInt;
((pylith::meshio::OutputManager*) objVptr)->appendVertexField(t, name,
@@ -871,7 +871,7 @@
assert(0 != meshVptr);
ALE::Obj<pylith::real_section_type>* field =
(ALE::Obj<pylith::real_section_type>*) fieldVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
const pylith::VectorFieldEnum fieldType =
(pylith::VectorFieldEnum) fieldTypeInt;
((pylith::meshio::OutputManager*) objVptr)->appendCellField(t, name,
@@ -1059,7 +1059,7 @@
try {
assert(0 != objVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
((pylith::meshio::OutputSolnSubset*) objVptr)->verifyConfiguration(*mesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -1091,8 +1091,8 @@
assert(0 != objVptr);
assert(0 != submeshVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* submesh = (ALE::Obj<ALE::Mesh>*) submeshVptr;
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* submesh = (ALE::Obj<pylith::Mesh>*) submeshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
*submesh =
((pylith::meshio::OutputSolnSubset*) objVptr)->subdomainMesh(*mesh);
} catch (const std::exception& err) {
Modified: short/3D/PyLith/trunk/modulesrc/solver/solver.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/solver/solver.pyxe.src 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/modulesrc/solver/solver.pyxe.src 2008-04-03 18:48:51 UTC (rev 11748)
@@ -14,6 +14,8 @@
#include <petscmesh.hh>
#include <petscksp.h>
+#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
+
#include <assert.h>
#include <stdexcept>
#include <Python.h>
@@ -129,10 +131,10 @@
assert(0 != vecOutVptr);
assert(0 != meshVptr);
assert(0 != fieldVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
- ALE::Obj<ALE::Mesh::real_section_type>* field =
- (ALE::Obj<ALE::Mesh::real_section_type>*) fieldVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh::real_section_type>* field =
+ (ALE::Obj<pylith::Mesh::real_section_type>*) fieldVptr;
VecScatter scatter;
PetscErrorCode err = MeshCreateGlobalScatter(*mesh, *field, &scatter);
if (err) {
@@ -148,7 +150,7 @@
} // if
*scatterVptr = (void *) scatter;
Vec in;
- const ALE::Obj<ALE::Mesh::order_type>& order = (*mesh)->getFactory()->getGlobalOrder((*mesh), "default", (*field));
+ const ALE::Obj<pylith::Mesh::order_type>& order = (*mesh)->getFactory()->getGlobalOrder((*mesh), "default", (*field));
err = VecCreate((*mesh)->comm(), &in);
err = VecSetSizes(in, order->getLocalSize(), order->getGlobalSize());
@@ -256,7 +258,7 @@
"""
# create shim for method 'solve'
#embed{ int SolverLinear_solve(void* objVptr, void* fieldOutVptr, void* jacobianVptr, void* fieldInVptr, void* scatterVptr, void* vecInVptr, void* vecOutVptr)
- typedef ALE::Mesh::real_section_type real_section_type;
+ typedef pylith::Mesh::real_section_type real_section_type;
PetscErrorCode err = 0;
try {
assert(0 != objVptr);
@@ -338,7 +340,7 @@
"""
# create shim for method 'solve'
#embed{ int SolverNonlinear_solve(void* objVptr, void* fieldOutVptr, void* jacobianVptr, void* fieldInVptr, void* scatterVptr, void* vecInVptr, void* vecOutVptr)
- typedef ALE::Mesh::real_section_type real_section_type;
+ typedef pylith::Mesh::real_section_type real_section_type;
PetscErrorCode err = 0;
try {
assert(0 != objVptr);
Modified: short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src 2008-04-03 18:48:51 UTC (rev 11748)
@@ -45,7 +45,7 @@
Destroy Petsc Mesh.
"""
#embed{ void MeshPtr_destructor_cpp(void* objVptr)
- ALE::Obj<ALE::Mesh>* pMesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* pMesh = (ALE::Obj<pylith::Mesh>*) objVptr;
delete pMesh;
#}embed
MeshPtr_destructor_cpp(obj)
@@ -99,7 +99,7 @@
#embed{ void* MeshPtr_constructor()
void* result = 0;
try {
- ALE::Obj<ALE::Mesh>* mesh = new ALE::Obj<ALE::Mesh>;
+ ALE::Obj<pylith::Mesh>* mesh = new ALE::Obj<pylith::Mesh>;
assert(0 != mesh);
result = (void*) mesh;
} catch (const std::exception& err) {
@@ -129,7 +129,7 @@
#embed{ void* Mesh_getRealSection(void* objVptr, char* label)
void* result = 0;
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
const ALE::Obj<pylith::real_section_type>& section =
@@ -161,7 +161,7 @@
#embed{ void* Mesh_createRealSection(void* objVptr, char* label, int fiberDim)
void* result = 0;
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
const ALE::Obj<pylith::real_section_type>& section =
@@ -193,7 +193,7 @@
# create shim for allocate
#embed{ void* Mesh_allocateRealSection(void* objVptr, void* sectionVptr)
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
ALE::Obj<pylith::real_section_type>* section =
(ALE::Obj<pylith::real_section_type>*) sectionVptr;
assert(0 != mesh);
@@ -226,7 +226,7 @@
#embed{ void* Mesh_createMatrix(void* objVptr, void* fieldVptr)
void* result = 0;
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
const ALE::Obj<pylith::real_section_type>* field =
@@ -269,7 +269,7 @@
# create shim for view
#embed{ void* Mesh_view(void* objVptr)
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
(*mesh)->view("");
@@ -295,7 +295,7 @@
# create shim for checkMaterialIds
#embed{ void* Mesh_checkMaterialIds(void* objVptr, int* materialIds, int numMaterials)
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
pylith::topology::MeshOps::checkMaterialIds(*mesh, materialIds, numMaterials);
@@ -337,7 +337,7 @@
# create shim for method 'debug'
#embed{ void Mesh_debug_set(void* objVptr, int value)
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
if (mesh->isNull())
throw std::runtime_error("Cannot set debug flag when there is " \
@@ -364,7 +364,7 @@
#embed{ int Mesh_debug_get(void* objVptr)
int result = 0;
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
result = (*mesh)->debug();
@@ -392,7 +392,7 @@
#embed{ int Mesh_dimension_get(void* objVptr)
int result = 0;
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
result = (*mesh)->getDimension();
@@ -419,7 +419,7 @@
# create shim for method 'comm'
#embed{ void Mesh_comm_get(void* objVptr, void *vpycomm)
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
PyMPICommObject *pycomm = (PyMPICommObject *)vpycomm;
@@ -452,7 +452,7 @@
#embed{ void MeshGenerator_createCubeBoundary(int debug, void* meshVptr)
try {
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
const double lower[3] = {0.0, 0.0, 0.0};
const double upper[3] = {1.0, 1.0, 1.0};
const int faces[3] = {1, 1, 1};
@@ -482,8 +482,8 @@
try {
assert(0 != meshVptr);
assert(0 != meshBdryVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
- ALE::Obj<ALE::Mesh>* meshBdry = (ALE::Obj<ALE::Mesh>*) meshBdryVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* meshBdry = (ALE::Obj<pylith::Mesh>*) meshBdryVptr;
*mesh = ALE::Generator::generateMesh(*meshBdry);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -516,8 +516,8 @@
try {
assert(0 != meshVptr);
assert(0 != newMeshVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
- ALE::Obj<ALE::Mesh>* newMesh = (ALE::Obj<ALE::Mesh>*) newMeshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* newMesh = (ALE::Obj<pylith::Mesh>*) newMeshVptr;
pylith::topology::Distributor::distribute(newMesh, *mesh, partitioner);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -549,7 +549,7 @@
assert(0 != outputVptr);
assert(0 != meshVptr);
assert(0 != csVptr);
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
pylith::meshio::OutputManager* output =
(pylith::meshio::OutputManager*) outputVptr;
spatialdata::geocoords::CoordSys* cs =
@@ -595,7 +595,7 @@
#embed{ void* FieldsManager_constructor(void* meshVptr)
void* result = 0;
try {
- ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh = (ALE::Obj<pylith::Mesh>*) meshVptr;
assert(0 != mesh);
assert(!mesh->isNull());
pylith::topology::FieldsManager* manager =
@@ -1004,11 +1004,11 @@
try {
assert(0 != sectionVptr);
assert(0 != meshVptr);
- ALE::Obj<ALE::Mesh>* mesh =
- (ALE::Obj<ALE::Mesh>*) meshVptr;
+ ALE::Obj<pylith::Mesh>* mesh =
+ (ALE::Obj<pylith::Mesh>*) meshVptr;
ALE::Obj<pylith::real_section_type>* section =
(ALE::Obj<pylith::real_section_type>*) sectionVptr;
- ALE::Distribution<ALE::Mesh>::completeSection(*mesh, *section);
+ ALE::Distribution<pylith::Mesh>::completeSection(*mesh, *section);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
const_cast<char*>(err.what()));
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -129,7 +129,7 @@
{ // testIntegrateResidual
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
AbsorbingDampers bc;
topology::FieldsManager fields(mesh);
_initialize(&mesh, &bc, &fields);
@@ -164,7 +164,7 @@
{ // testIntegrateJacobian
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
AbsorbingDampers bc;
topology::FieldsManager fields(mesh);
_initialize(&mesh, &bc, &fields);
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -88,7 +88,7 @@
* @param bc AbsorbingDampers boundary condition to initialize.
* @param fields Solution fields.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
AbsorbingDampers* const bc,
topology::FieldsManager* fields) const;
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestBoundaryMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestBoundaryMesh.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestBoundaryMesh.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -55,7 +55,7 @@
const char* label = _data->bcLabel;
const ALE::Obj<Mesh>& subMesh =
- ALE::Selection<ALE::Mesh>::submesh(mesh, mesh->getIntSection(label));
+ ALE::Selection<Mesh>::submesh(mesh, mesh->getIntSection(label));
CPPUNIT_ASSERT(!subMesh.isNull());
//subMesh->view("SUBMESH WITHOUT FAULT");
@@ -121,7 +121,7 @@
const char* label = _data->bcLabel;
const ALE::Obj<Mesh>& subMesh =
- ALE::Selection<ALE::Mesh>::submesh(mesh, mesh->getIntSection(label));
+ ALE::Selection<Mesh>::submesh(mesh, mesh->getIntSection(label));
CPPUNIT_ASSERT(!subMesh.isNull());
//subMesh->view("SUBMESH WITH FAULT");
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -85,7 +85,7 @@
* @param mesh PETSc mesh to initialize
* @param bc DirichletBoundary boundary condition to initialize.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
DirichletBoundary* const bc) const;
}; // class TestDirichletBoundary
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundaryMulti.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundaryMulti.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundaryMulti.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -72,7 +72,7 @@
* @param bcB DirichletBoundary boundary condition B to initialize.
* @param bcC DirichletBoundary boundary condition C to initialize.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
DirichletBoundary* const bcA,
DirichletBoundary* const bcB,
DirichletBoundary* const bcC) const;
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPoints.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPoints.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPoints.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -85,7 +85,7 @@
* @param mesh PETSc mesh to initialize
* @param bc DirichletPoints boundary condition to initialize.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
DirichletPoints* const bc) const;
}; // class TestDirichletPoints
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPointsMulti.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPointsMulti.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletPointsMulti.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -72,7 +72,7 @@
* @param bcB DirichletPoints boundary condition B to initialize.
* @param bcC DirichletPoints boundary condition C to initialize.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
DirichletPoints* const bcA,
DirichletPoints* const bcB,
DirichletPoints* const bcC) const;
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -85,7 +85,7 @@
* @param bc Neumann boundary condition to initialize.
* @param fields Solution fields.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
Neumann* const bc,
topology::FieldsManager* fields) const;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestBoundary.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestBoundary.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestBoundary.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -69,7 +69,7 @@
void
pylith::faults::TestBoundary::_testCreateBoundary(const BoundaryData& data)
{ // _testAdjustTopology
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
meshio::MeshIOAscii iohandler;
iohandler.filename(data.filename);
iohandler.debug(false);
@@ -77,7 +77,7 @@
iohandler.read(&mesh);
// Extract submesh for "traction"
- const ALE::Obj<ALE::Mesh> submesh = ALE::Selection<ALE::Mesh>::submesh(mesh, mesh->getIntSection("traction"));
+ const ALE::Obj<Mesh> submesh = ALE::Selection<Mesh>::submesh(mesh, mesh->getIntSection("traction"));
CPPUNIT_ASSERT_EQUAL(data.cellDim, submesh->getDimension());
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -457,7 +457,7 @@
pylith::faults::TestFaultCohesive::_testAdjustTopology(Fault* fault,
const CohesiveData& data)
{ // _testAdjustTopology
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
meshio::MeshIOAscii iohandler;
iohandler.filename(data.filename);
iohandler.debug(false);
@@ -572,7 +572,7 @@
Fault* faultB,
const CohesiveData& data)
{ // _testAdjustTopology
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
meshio::MeshIOAscii iohandler;
iohandler.filename(data.filename);
iohandler.debug(false);
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -482,7 +482,7 @@
// ----------------------------------------------------------------------
// Initialize FaultCohesiveKin interface condition.
void
-pylith::faults::TestFaultCohesiveKin::_initialize(ALE::Obj<ALE::Mesh>* mesh,
+pylith::faults::TestFaultCohesiveKin::_initialize(ALE::Obj<Mesh>* mesh,
FaultCohesiveKin* const fault) const
{ // _initialize
CPPUNIT_ASSERT(0 != _data);
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -106,7 +106,7 @@
* @param mesh PETSc mesh to initialize
* @param fault Cohesive fault interface condition to initialize.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
FaultCohesiveKin* const fault) const;
/** Determine if vertex is a Lagrange multiplier constraint vertex.
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -152,7 +152,7 @@
{ // testUpdateState
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
ElasticityExplicit integrator;
topology::FieldsManager fields(mesh);
_initialize(&mesh, &integrator, &fields);
@@ -170,7 +170,7 @@
{ // testIntegrateResidual
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
ElasticityExplicit integrator;
topology::FieldsManager fields(mesh);
_initialize(&mesh, &integrator, &fields);
@@ -202,7 +202,7 @@
{ // testIntegrateJacobian
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
ElasticityExplicit integrator;
topology::FieldsManager fields(mesh);
_initialize(&mesh, &integrator, &fields);
@@ -265,7 +265,7 @@
// Initialize elasticity integrator.
void
pylith::feassemble::TestElasticityExplicit::_initialize(
- ALE::Obj<ALE::Mesh>* mesh,
+ ALE::Obj<Mesh>* mesh,
ElasticityExplicit* const integrator,
topology::FieldsManager* fields)
{ // _initialize
@@ -279,7 +279,7 @@
spatialdata::geocoords::CSCart cs;
cs.setSpaceDim(_data->spaceDim);
cs.initialize();
- *mesh = new ALE::Mesh(PETSC_COMM_WORLD, _data->cellDim);
+ *mesh = new Mesh(PETSC_COMM_WORLD, _data->cellDim);
CPPUNIT_ASSERT(!mesh->isNull());
ALE::Obj<sieve_type> sieve = new sieve_type((*mesh)->comm());
CPPUNIT_ASSERT(!sieve.isNull());
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -112,7 +112,7 @@
* @param integrator ElasticityIntegrator to initialize.
* @param fields Solution fields.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
ElasticityExplicit* const integrator,
topology::FieldsManager* const fields);
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -142,7 +142,7 @@
{ // testUpdateState
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
ElasticityImplicit integrator;
topology::FieldsManager fields(mesh);
_initialize(&mesh, &integrator, &fields);
@@ -161,7 +161,7 @@
{ // testIntegrateResidual
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
ElasticityImplicit integrator;
topology::FieldsManager fields(mesh);
_initialize(&mesh, &integrator, &fields);
@@ -193,7 +193,7 @@
{ // testIntegrateJacobian
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<ALE::Mesh> mesh;
+ ALE::Obj<Mesh> mesh;
ElasticityImplicit integrator;
topology::FieldsManager fields(mesh);
_initialize(&mesh, &integrator, &fields);
@@ -256,7 +256,7 @@
// Initialize elasticity integrator.
void
pylith::feassemble::TestElasticityImplicit::_initialize(
- ALE::Obj<ALE::Mesh>* mesh,
+ ALE::Obj<Mesh>* mesh,
ElasticityImplicit* const integrator,
topology::FieldsManager* fields)
{ // _initialize
@@ -270,7 +270,7 @@
spatialdata::geocoords::CSCart cs;
cs.setSpaceDim(_data->spaceDim);
cs.initialize();
- *mesh = new ALE::Mesh(PETSC_COMM_WORLD, _data->cellDim);
+ *mesh = new Mesh(PETSC_COMM_WORLD, _data->cellDim);
CPPUNIT_ASSERT(!mesh->isNull());
ALE::Obj<sieve_type> sieve = new sieve_type((*mesh)->comm());
CPPUNIT_ASSERT(!sieve.isNull());
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -112,7 +112,7 @@
* @param integrator ElasticityIntegrator to initialize.
* @param fields Solution fields.
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh,
+ void _initialize(ALE::Obj<Mesh>* mesh,
ElasticityImplicit* const integrator,
topology::FieldsManager* const fields);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKBCMesh.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -45,7 +45,7 @@
const char* label = _data->bcLabel;
_mesh =
- ALE::Selection<ALE::Mesh>::submesh(_meshDomain,
+ ALE::Selection<Mesh>::submesh(_meshDomain,
_meshDomain->getIntSection(label));
CPPUNIT_ASSERT(!_mesh.isNull());
_mesh->setRealSection("coordinates",
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2008-04-03 18:48:51 UTC (rev 11748)
@@ -25,7 +25,7 @@
// ----------------------------------------------------------------------
// Get simple mesh for testing I/O.
-ALE::Obj<ALE::Mesh>*
+ALE::Obj<Mesh>*
pylith::meshio::TestMeshIO::_createMesh(const MeshData& data)
{ // _createMesh
// buildTopology() requires zero based index
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -48,14 +48,14 @@
*
* @returns PETSc mesh
*/
- ALE::Obj<ALE::Mesh>* _createMesh(const MeshData& data);
+ ALE::Obj<Mesh>* _createMesh(const MeshData& data);
/** Check values in mesh against data.
*
* @param mesh PETSc mesh
* @param data Mesh data
*/
- void _checkVals(const ALE::Obj<ALE::Mesh>& mesh,
+ void _checkVals(const ALE::Obj<Mesh>& mesh,
const MeshData& data);
/** Test debug().
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldsManager.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldsManager.hh 2008-04-03 18:23:47 UTC (rev 11747)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldsManager.hh 2008-04-03 18:48:51 UTC (rev 11748)
@@ -122,7 +122,7 @@
*
* @param mesh PETSc mesh to initialize
*/
- void _initialize(ALE::Obj<ALE::Mesh>* mesh) const;
+ void _initialize(ALE::Obj<Mesh>* mesh) const;
}; // class TestFieldsManager
More information about the cig-commits
mailing list