[cig-commits] r6512 - in short/3D/PyLith/trunk: libsrc/feassemble
libsrc/materials libsrc/meshio modulesrc/feassemble
modulesrc/materials modulesrc/meshio modulesrc/solver
modulesrc/topology
knepley at geodynamics.org
knepley at geodynamics.org
Fri Apr 6 12:51:38 PDT 2007
Author: knepley
Date: 2007-04-06 12:51:37 -0700 (Fri, 06 Apr 2007)
New Revision: 6512
Modified:
short/3D/PyLith/trunk/libsrc/feassemble/Integrator.hh
short/3D/PyLith/trunk/libsrc/feassemble/ParameterManager.hh
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
short/3D/PyLith/trunk/libsrc/materials/ElasticMaterial.hh
short/3D/PyLith/trunk/libsrc/materials/Material.cc
short/3D/PyLith/trunk/libsrc/materials/Material.hh
short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc
short/3D/PyLith/trunk/libsrc/meshio/MeshIO.hh
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
Log:
Updated to latest PETSc interface
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Integrator.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Integrator.hh 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Integrator.hh 2007-04-06 19:51:37 UTC (rev 6512)
@@ -43,7 +43,7 @@
// PUBLIC TYPEDEFS //////////////////////////////////////////////////////
public :
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::point_type point_type;
typedef Mesh::real_section_type real_section_type;
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ParameterManager.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ParameterManager.hh 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ParameterManager.hh 2007-04-06 19:51:37 UTC (rev 6512)
@@ -42,7 +42,7 @@
// PUBLIC TYPEDEFS //////////////////////////////////////////////////////
public :
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::point_type point_type;
typedef Mesh::real_section_type real_section_type;
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh 2007-04-06 19:51:37 UTC (rev 6512)
@@ -46,7 +46,7 @@
// PUBLIC TYPEDEFS //////////////////////////////////////////////////////
public :
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::real_section_type real_section_type;
// PUBLIC METHODS ///////////////////////////////////////////////////////
Modified: short/3D/PyLith/trunk/libsrc/materials/ElasticMaterial.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/ElasticMaterial.hh 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/libsrc/materials/ElasticMaterial.hh 2007-04-06 19:51:37 UTC (rev 6512)
@@ -41,7 +41,7 @@
// PUBLIC TYPEDEFS ////////////////////////////////////////////////////
public :
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::real_section_type real_section_type;
// PUBLIC METHODS /////////////////////////////////////////////////////
Modified: short/3D/PyLith/trunk/libsrc/materials/Material.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/Material.cc 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/libsrc/materials/Material.cc 2007-04-06 19:51:37 UTC (rev 6512)
@@ -60,7 +60,7 @@
// ----------------------------------------------------------------------
// Get physical property parameters from database.
void
-pylith::materials::Material::initialize(const ALE::Obj<ALE::Field::Mesh>& mesh,
+pylith::materials::Material::initialize(const ALE::Obj<ALE::Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
pylith::feassemble::Quadrature* quadrature)
{ // initialize
@@ -68,14 +68,14 @@
assert(0 != cs);
assert(0 != quadrature);
- typedef ALE::Field::Mesh::real_section_type real_section_type;
+ typedef ALE::Mesh::real_section_type real_section_type;
// Get cells associated with material
const ALE::Obj<real_section_type>& coordinates =
mesh->getRealSection("coordinates");
- const ALE::Obj<ALE::Field::Mesh::label_sequence>& cells =
+ const ALE::Obj<ALE::Mesh::label_sequence>& cells =
mesh->getLabelStratum("material-id", _id);
- const ALE::Field::Mesh::label_sequence::iterator cellsEnd = cells->end();
+ const ALE::Mesh::label_sequence::iterator cellsEnd = cells->end();
// Check to make sure we have cells
if (0 == cells->size()) {
@@ -113,7 +113,7 @@
double** cellData = (numParams > 0) ? new double*[numParams] : 0;
for (int iParam = 0; iParam < numParams; ++iParam)
cellData[iParam] = (numQuadPts > 0) ? new double[numQuadPts] : 0;
- for (ALE::Field::Mesh::label_sequence::iterator cellIter=cells->begin();
+ for (ALE::Mesh::label_sequence::iterator cellIter=cells->begin();
cellIter != cellsEnd;
++cellIter) {
// Compute geometry information for current cell
Modified: short/3D/PyLith/trunk/libsrc/materials/Material.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/Material.hh 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/libsrc/materials/Material.hh 2007-04-06 19:51:37 UTC (rev 6512)
@@ -47,9 +47,7 @@
/// Namespace for spatialdata package
namespace ALE {
- namespace Field {
- class Mesh;
- }
+ class Mesh;
template<class T> class Obj;
} // ALE
@@ -111,7 +109,7 @@
* @param cs Coordinate system associated with mesh
* @param quadrature Quadrature for finite-element integration
*/
- void initialize(const ALE::Obj<ALE::Field::Mesh>& mesh,
+ void initialize(const ALE::Obj<ALE::Mesh>& mesh,
const spatialdata::geocoords::CoordSys* cs,
pylith::feassemble::Quadrature* quadrature);
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc 2007-04-06 19:51:37 UTC (rev 6512)
@@ -86,14 +86,14 @@
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
- ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, meshDim,
- numCells,
- const_cast<int*>(cells),
- numVertices,
- _interpolate, numCorners);
+ ALE::SieveBuilder<Mesh>::buildTopology(sieve, meshDim,
+ numCells,
+ const_cast<int*>(cells),
+ numVertices,
+ _interpolate, numCorners);
mesh->setSieve(sieve);
mesh->stratify();
- ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, coordinates);
+ ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, coordinates);
} // _buildMesh
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIO.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIO.hh 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIO.hh 2007-04-06 19:51:37 UTC (rev 6512)
@@ -25,7 +25,7 @@
{ // MeshIO
// PUBLIC TYPEDEFS //////////////////////////////////////////////////////
public :
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::sieve_type sieve_type;
typedef Mesh::label_type label_type;
Modified: short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src 2007-04-06 19:51:37 UTC (rev 6512)
@@ -450,8 +450,8 @@
"""
# create shim for method 'integrateConstant'
#embed{ void IntegratorExplicit_integrateConstant(void* objVptr, void* fieldOutVptr, void* fieldInTVptr, void* fieldInTmdtVptr, void* meshVptr)
- typedef ALE::Field::Mesh Mesh;
- typedef ALE::Field::Mesh::real_section_type real_section_type;
+ typedef ALE::Mesh Mesh;
+ typedef ALE::Mesh::real_section_type real_section_type;
try {
assert(0 != objVptr);
@@ -499,8 +499,8 @@
"""
# create shim for method 'integrateJacobian'
#embed{ void IntegratorExplicit_integrateJacobian(void* objVptr, void* matVptr, void* fieldInVptr, void* meshVptr)
- typedef ALE::Field::Mesh Mesh;
- typedef ALE::Field::Mesh::real_section_type real_section_type;
+ typedef ALE::Mesh Mesh;
+ typedef ALE::Mesh::real_section_type real_section_type;
try {
assert(0 != objVptr);
Modified: short/3D/PyLith/trunk/modulesrc/materials/materials.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/materials/materials.pyxe.src 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/modulesrc/materials/materials.pyxe.src 2007-04-06 19:51:37 UTC (rev 6512)
@@ -80,7 +80,7 @@
assert(0 != meshObj);
assert(0 != csObj);
assert(0 != qObj);
- ALE::Obj<ALE::Field::Mesh>* mesh = (ALE::Obj<ALE::Field::Mesh>*) meshObj;
+ ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshObj;
spatialdata::geocoords::CoordSys* cs =
(spatialdata::geocoords::CoordSys*) csObj;
pylith::feassemble::Quadrature* quadrature =
Modified: short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src 2007-04-06 19:51:37 UTC (rev 6512)
@@ -71,7 +71,7 @@
try {
assert(0 != pObj);
assert(0 != pMeshObj);
- ALE::Obj<ALE::Field::Mesh>* pMesh = (ALE::Obj<ALE::Field::Mesh>*) pMeshObj;
+ ALE::Obj<ALE::Mesh>* pMesh = (ALE::Obj<ALE::Mesh>*) pMeshObj;
((pylith::meshio::MeshIO*) pObj)->read(pMesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
@@ -95,7 +95,7 @@
# create shim for method 'write'
#embed{ void MeshIO_write(void* pObj, void* pMeshObj)
try {
- ALE::Obj<ALE::Field::Mesh>* pMesh = (ALE::Obj<ALE::Field::Mesh>*) pMeshObj;
+ ALE::Obj<ALE::Mesh>* pMesh = (ALE::Obj<ALE::Mesh>*) pMeshObj;
((pylith::meshio::MeshIO*) pObj)->write(pMesh);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
Modified: short/3D/PyLith/trunk/modulesrc/solver/solver.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/solver/solver.pyxe.src 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/modulesrc/solver/solver.pyxe.src 2007-04-06 19:51:37 UTC (rev 6512)
@@ -117,10 +117,10 @@
assert(0 != scatterVptr);
assert(0 != meshVptr);
assert(0 != fieldVptr);
- ALE::Obj<ALE::Field::Mesh>* mesh =
- (ALE::Obj<ALE::Field::Mesh>*) meshVptr;
- ALE::Obj<ALE::Field::Mesh::real_section_type>* field =
- (ALE::Obj<ALE::Field::Mesh::real_section_type>*) 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;
VecScatter scatter;
PetscErrorCode err = MeshCreateGlobalScatter(*mesh, *field, &scatter);
if (err) {
@@ -179,7 +179,7 @@
"""
# create shim for method 'solve'
#embed{ int SolverLinear_solve(void* objVptr, void* fieldOutVptr, void* jacobianVptr, void* fieldInVptr, void* scatterVptr)
- typedef ALE::Field::Mesh::real_section_type real_section_type;
+ typedef ALE::Mesh::real_section_type real_section_type;
try {
assert(0 != objVptr);
assert(0 != fieldOutVptr);
Modified: short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src 2007-04-06 18:58:25 UTC (rev 6511)
+++ short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src 2007-04-06 19:51:37 UTC (rev 6512)
@@ -39,7 +39,7 @@
Destroy Petsc Mesh.
"""
#embed{ void MeshPtr_destructor_cpp(void* pObj)
- ALE::Obj<ALE::Field::Mesh>* pMesh = (ALE::Obj<ALE::Field::Mesh>*) pObj;
+ ALE::Obj<ALE::Mesh>* pMesh = (ALE::Obj<ALE::Mesh>*) pObj;
delete pMesh;
#}embed
MeshPtr_destructor_cpp(obj)
@@ -74,7 +74,7 @@
#embed{ void* MeshPtr_constructor()
void* result = 0;
try {
- result = (void*)(new ALE::Obj<ALE::Field::Mesh>);
+ result = (void*)(new ALE::Obj<ALE::Mesh>);
} catch (const std::exception& err) {
PyErr_SetString(PyExc_RuntimeError,
const_cast<char*>(err.what()));
@@ -97,11 +97,11 @@
"""
# create shim for getRealSection
#embed{ void* Mesh_getRealSection(void* pObj, char* label)
- typedef ALE::Field::Mesh::real_section_type real_section_type;
+ typedef ALE::Mesh::real_section_type real_section_type;
void* result = 0;
try {
- ALE::Obj<ALE::Field::Mesh>* mesh = (ALE::Obj<ALE::Field::Mesh>*) pObj;
+ ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) pObj;
assert(0 != mesh);
const ALE::Obj<real_section_type>& section =
(*mesh)->getRealSection(label);
@@ -127,11 +127,11 @@
"""
# create shim for createRealSection
#embed{ void* Mesh_createRealSection(void* pObj, char* label, int fiberDim)
- typedef ALE::Field::Mesh::real_section_type real_section_type;
+ typedef ALE::Mesh::real_section_type real_section_type;
void* result = 0;
try {
- ALE::Obj<ALE::Field::Mesh>* mesh = (ALE::Obj<ALE::Field::Mesh>*) pObj;
+ ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) pObj;
assert(0 != mesh);
const ALE::Obj<real_section_type>& section =
(*mesh)->getRealSection(label);
@@ -160,11 +160,11 @@
"""
# create shim for MeshCreateMatrix
#embed{ void* Mesh_createMatrix(void* objVptr, void* fieldVptr)
- typedef ALE::Field::Mesh::real_section_type real_section_type;
+ typedef ALE::Mesh::real_section_type real_section_type;
void* result = 0;
try {
- ALE::Obj<ALE::Field::Mesh>* mesh = (ALE::Obj<ALE::Field::Mesh>*) objVptr;
+ ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
const ALE::Obj<real_section_type>* field =
@@ -206,7 +206,7 @@
# create shim for method 'debug'
#embed{ void Mesh_debug_set(void* objVptr, int value)
try {
- ALE::Obj<ALE::Field::Mesh>* mesh = (ALE::Obj<ALE::Field::Mesh>*) objVptr;
+ ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
(*mesh)->setDebug(value);
@@ -228,7 +228,7 @@
#embed{ int Mesh_debug_get(void* objVptr)
int result = 0;
try {
- ALE::Obj<ALE::Field::Mesh>* mesh = (ALE::Obj<ALE::Field::Mesh>*) objVptr;
+ ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) objVptr;
assert(0 != mesh);
assert(!mesh->isNull());
result = (*mesh)->debug();
@@ -250,7 +250,7 @@
"""
# create shim for zero section
#embed{ void* Section_zero(void* pObj)
- typedef ALE::Field::Mesh::real_section_type real_section_type;
+ typedef ALE::Mesh::real_section_type real_section_type;
try {
ALE::Obj<real_section_type>* section =
More information about the cig-commits
mailing list