[cig-commits] r21645 - in short/3D/PyLith/trunk/libsrc/pylith: bc faults friction problems topology
brad at geodynamics.org
brad at geodynamics.org
Tue Mar 26 15:41:06 PDT 2013
Author: brad
Date: 2013-03-26 15:41:06 -0700 (Tue, 26 Mar 2013)
New Revision: 21645
Modified:
short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc
short/3D/PyLith/trunk/libsrc/pylith/bc/BCIntegratorSubMesh.cc
short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/BruneSlipFn.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/ConstRateSlipFn.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/LiuCosSlipFn.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/StepSlipFn.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/TimeHistorySlipFn.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/TractPerturbation.cc
short/3D/PyLith/trunk/libsrc/pylith/friction/FrictionModel.cc
short/3D/PyLith/trunk/libsrc/pylith/problems/Explicit.cc
short/3D/PyLith/trunk/libsrc/pylith/problems/Implicit.cc
short/3D/PyLith/trunk/libsrc/pylith/problems/SolverLumped.cc
short/3D/PyLith/trunk/libsrc/pylith/topology/MeshOps.cc
short/3D/PyLith/trunk/libsrc/pylith/topology/VisitorSubMesh.hh
short/3D/PyLith/trunk/libsrc/pylith/topology/VisitorSubMesh.icc
Log:
Change to more meaningful variables names for vertex and cell stratums.
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -87,9 +87,9 @@
// Get 'surface' cells (1 dimension lower than top-level cells)
const PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
// Get damping constants at each quadrature point and rotate to
// global coordinate frame using orientation information
@@ -274,9 +274,9 @@
#endif
// Get 'surface' cells (1 dimension lower than top-level cells)
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
_logger->eventEnd(setupEvent);
#if !defined(DETAILED_EVENT_LOGGING)
@@ -389,9 +389,9 @@
// Get 'surface' cells (1 dimension lower than top-level cells)
const PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
// Get sections
topology::Field<topology::SubMesh>& dampingConsts = _parameters->get("damping constants");
@@ -524,9 +524,9 @@
// Get 'surface' cells (1 dimension lower than top-level cells)
const PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
// Get sections
topology::Field<topology::SubMesh>& dampingConsts = _parameters->get("damping constants");
@@ -659,9 +659,9 @@
// Get 'surface' cells (1 dimension lower than top-level cells)
const PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
// Get parameters used in integration.
const PylithScalar dt = _dt;
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/BCIntegratorSubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/BCIntegratorSubMesh.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/BCIntegratorSubMesh.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -89,9 +89,9 @@
// Get 'surface' cells (1 dimension lower than top-level cells)
const PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
// Make sure surface cells are compatible with quadrature.
PetscInt depth = 0;
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -98,9 +98,9 @@
// Get cell information
PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
// Get sections
_calculateValue(t);
@@ -381,9 +381,9 @@
// Get 'surface' cells (1 dimension lower than top-level cells)
PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
const int cellDim = _quadrature->cellDim() > 0 ? _quadrature->cellDim() : 1;
const int numBasis = _quadrature->numBasis();
@@ -473,9 +473,9 @@
// Get 'surface' cells (1 dimension lower than top-level cells)
PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
// Quadrature related values.
const feassemble::CellGeometry& cellGeometry = _quadrature->refGeometry();
@@ -607,9 +607,9 @@
// Get 'surface' cells (1 dimension lower than top-level cells)
PetscDM dmSubMesh = _boundaryMesh->dmMesh();assert(dmSubMesh);
- topology::Stratum heightStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ topology::Stratum cellsStratum(dmSubMesh, topology::Stratum::HEIGHT, 1);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
const int spaceDim = _quadrature->spaceDim();
const int numQuadPts = _quadrature->numQuadPts();
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/BruneSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/BruneSlipFn.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/BruneSlipFn.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -84,9 +84,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = faultMesh.dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
delete _parameters; _parameters = new topology::Fields<topology::Field<topology::SubMesh> >(faultMesh);
assert(_parameters);
@@ -234,9 +234,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = _parameters->mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
// Get sections
const topology::Field<topology::SubMesh>& finalSlip = _parameters->get("final slip");
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/ConstRateSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/ConstRateSlipFn.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/ConstRateSlipFn.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -82,9 +82,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = faultMesh.dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
delete _parameters; _parameters = new topology::Fields<topology::Field<topology::SubMesh> >(faultMesh);
assert(_parameters);
@@ -203,9 +203,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = _parameters->mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
// Get sections
const topology::Field<topology::SubMesh>& slipRate = _parameters->get("slip rate");
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/LiuCosSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/LiuCosSlipFn.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/LiuCosSlipFn.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -84,9 +84,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = faultMesh.dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
delete _parameters; _parameters = new topology::Fields<topology::Field<topology::SubMesh> >(faultMesh);
assert(_parameters);
@@ -234,9 +234,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = _parameters->mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
// Get sections
const topology::Field<topology::SubMesh>& finalSlip = _parameters->get("final slip");
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/StepSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/StepSlipFn.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/StepSlipFn.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -80,9 +80,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = faultMesh.dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
delete _parameters; _parameters = new topology::Fields<topology::Field<topology::SubMesh> >(faultMesh);
assert(_parameters);
@@ -202,9 +202,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = _parameters->mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
// Get sections
const topology::Field<topology::SubMesh>& finalSlip = _parameters->get("final slip");
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/TimeHistorySlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/TimeHistorySlipFn.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/TimeHistorySlipFn.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -86,9 +86,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = faultMesh.dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
delete _parameters; _parameters = new topology::Fields<topology::Field<topology::SubMesh> >(faultMesh);
assert(_parameters);
@@ -213,9 +213,9 @@
// Get vertices in fault mesh
PetscDM dmMesh = _parameters->mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
// Get sections
const topology::Field<topology::SubMesh>& slipAmplitude = _parameters->get("slip amplitude");
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/TractPerturbation.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/TractPerturbation.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/TractPerturbation.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -256,9 +256,9 @@
// Get vertices.
PetscDM dmMesh = _parameters->mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
const spatialdata::geocoords::CoordSys* cs = _parameters->mesh().coordsys();assert(cs);
const int spaceDim = cs->spaceDim();
@@ -433,9 +433,9 @@
// Get vertices.
PetscDM dmMesh = _parameters->mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
const spatialdata::geocoords::CoordSys* cs = _parameters->mesh().coordsys();assert(cs);
const int spaceDim = cs->spaceDim();
Modified: short/3D/PyLith/trunk/libsrc/pylith/friction/FrictionModel.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/friction/FrictionModel.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/friction/FrictionModel.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -96,9 +96,9 @@
// Get vertices associated with friction interface
PetscDM faultDMMesh = faultMesh.dmMesh();assert(faultDMMesh);
- topology::Stratum depthStratum(faultDMMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(faultDMMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
const spatialdata::geocoords::CoordSys* cs = faultMesh.coordsys();
assert(cs);
Modified: short/3D/PyLith/trunk/libsrc/pylith/problems/Explicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/problems/Explicit.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/problems/Explicit.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -79,9 +79,9 @@
// Get mesh vertices.
PetscDM dmMesh = dispIncr.mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
for(PetscInt v = vStart; v < vEnd; ++v) {
const PetscInt dioff = dispIncrVisitor.sectionOffset(v);
Modified: short/3D/PyLith/trunk/libsrc/pylith/problems/Implicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/problems/Implicit.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/problems/Implicit.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -61,9 +61,9 @@
// Get mesh vertices.
PetscDM dmMesh = dispIncr.mesh().dmMesh();assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
for(PetscInt v = vStart; v < vEnd; ++v) {
const PetscInt dioff = dispIncrVisitor.sectionOffset(v);
Modified: short/3D/PyLith/trunk/libsrc/pylith/problems/SolverLumped.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/problems/SolverLumped.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/problems/SolverLumped.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -85,9 +85,9 @@
// Get mesh vertices.
PetscDM dmMesh = solution->mesh().dmMesh(); assert(dmMesh);
- topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = depthStratum.begin();
- const PetscInt vEnd = depthStratum.end();
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
// Get sections.
topology::VecVisitorMesh solutionVisitor(*solution);
Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/MeshOps.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/MeshOps.cc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/MeshOps.cc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -51,9 +51,9 @@
matCellCounts = 0;
PetscDM dmMesh = mesh.dmMesh();assert(dmMesh);
- Stratum heightStratum(dmMesh, Stratum::HEIGHT, 0);
- const PetscInt cStart = heightStratum.begin();
- const PetscInt cEnd = heightStratum.end();
+ Stratum cellsStratum(dmMesh, Stratum::HEIGHT, 0);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
PetscDMLabel materialsLabel = NULL;
err = DMPlexGetLabel(dmMesh, "material-id", &materialsLabel);CHECK_PETSC_ERROR(err);assert(materialsLabel);
Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/VisitorSubMesh.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/VisitorSubMesh.hh 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/VisitorSubMesh.hh 2013-03-26 22:41:06 UTC (rev 21645)
@@ -267,11 +267,25 @@
*/
PetscIS indexSet(void) const;
+ /** Get array of points in index set.
+ *
+ * @return Array of points.
+ */
+ const PetscInt* points(void) const;
+
+ /** Get number of points in index set.
+ *
+ * @return Number of points.
+ */
+ PetscInt size(void) const;
+
// PRIVATE MEMBERS //////////////////////////////////////////////////////
private :
const SubMesh& _submesh;
PetscIS _indexSet; ///< PETSc index set.
+ PetscInt _size; ///< Size of index set.
+ const PetscInt* _points; ///< Array of points in index set.
}; // SubMeshIS
Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/VisitorSubMesh.icc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/VisitorSubMesh.icc 2013-03-26 22:40:40 UTC (rev 21644)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/VisitorSubMesh.icc 2013-03-26 22:41:06 UTC (rev 21645)
@@ -207,8 +207,8 @@
inline
void
pylith::topology::MatVisitorSubMesh::getClosure(PetscScalar** valuesCell,
- PetscInt* valuesSize,
- const PetscInt cell) const
+ PetscInt* valuesSize,
+ const PetscInt cell) const
{ // getClosure
assert(_dm);
assert(_subsection);
@@ -263,7 +263,10 @@
_indexSet(NULL)
{ // constructor
PetscDM dmMesh = submesh.dmMesh();assert(dmMesh);
- PetscErrorCode err = DMPlexCreateSubpointIS(dmMesh, &_indexSet);CHECK_PETSC_ERROR(err);
+ PetscErrorCode err;
+ err = DMPlexCreateSubpointIS(dmMesh, &_indexSet);CHECK_PETSC_ERROR(err);
+ err = ISGetSize(_indexSet, &_size);CHECK_PETSC_ERROR(err);assert(_size >= 0);
+ err = ISGetIndices(_indexSet, &_points);CHECK_PETSC_ERROR(err);assert(_points);
} // constructor
// ----------------------------------------------------------------------
@@ -280,7 +283,9 @@
void
pylith::topology::SubMeshIS::deallocate(void)
{ // deallocate
- PetscErrorCode err = ISDestroy(&_indexSet);CHECK_PETSC_ERROR(err);assert(!_indexSet);
+ PetscErrorCode err;
+ err = ISRestoreIndices(_indexSet, &_points);CHECK_PETSC_ERROR(err);_points=NULL;
+ err = ISDestroy(&_indexSet);CHECK_PETSC_ERROR(err);assert(!_indexSet);
} // deallocate
// ----------------------------------------------------------------------
@@ -301,7 +306,25 @@
return _indexSet;
} // indexSet
+// ----------------------------------------------------------------------
+// Get array of points in index set.
+inline
+const PetscInt*
+pylith::topology::SubMeshIS::points(void) const
+{ // points
+ return _points;
+} // points
+// ----------------------------------------------------------------------
+// Get number of points in index set.
+inline
+PetscInt
+pylith::topology::SubMeshIS::size(void) const
+{ // size
+ return _size;
+} // size
+
+
#endif
More information about the CIG-COMMITS
mailing list