[cig-commits] r14791 - in short/3D/PyLith/branches/pylith-swig: libsrc/faults unittests/libtests/faults unittests/libtests/faults/data
brad at geodynamics.org
brad at geodynamics.org
Sun Apr 26 11:39:14 PDT 2009
Author: brad
Date: 2009-04-26 11:39:11 -0700 (Sun, 26 Apr 2009)
New Revision: 14791
Modified:
short/3D/PyLith/branches/pylith-swig/libsrc/faults/BruneSlipFn.hh
short/3D/PyLith/branches/pylith-swig/libsrc/faults/Fault.hh
short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveDyn.cc
short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveDyn.hh
short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc
short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinData.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinData.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataHex8.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh
Log:
Worked on updating C++ fault stuff and associated unit tests.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/BruneSlipFn.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/BruneSlipFn.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/BruneSlipFn.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -121,7 +121,7 @@
*
* @param t Time relative to slip starting time at point.
* @param finalSlip Final slip at point.
- * @param riseTime Peak slip rate at point.
+ * @param riseTime Rise time at point.
*
* @returns Slip at point at time t
*/
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/Fault.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/Fault.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/Fault.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -97,8 +97,8 @@
*/
virtual
void initialize(const topology::Mesh& mesh,
- const double_array& upDir,
- const double_array& normalDir,
+ const double upDir[3],
+ const double normalDir[3],
spatialdata::spatialdb::SpatialDB* matDB) = 0;
/** Get mesh associated with fault fields.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveDyn.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveDyn.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -37,8 +37,8 @@
// Initialize fault. Determine orientation and setup boundary
void
pylith::faults::FaultCohesiveDyn::initialize(const topology::Mesh& mesh,
- const double_array& upDir,
- const double_array& normalDir,
+ const double upDir[3],
+ const double normalDir[3],
spatialdata::spatialdb::SpatialDB* matDB)
{ // initialize
throw std::logic_error("FaultCohesiveDyn::initialize() not implemented.");
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveDyn.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveDyn.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveDyn.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -60,8 +60,8 @@
* (used to improve conditioning of Jacobian matrix)
*/
void initialize(const topology::Mesh& mesh,
- const double_array& upDir,
- const double_array& normalDir,
+ const double upDir[3],
+ const double normalDir[3],
spatialdata::spatialdb::SpatialDB* matDB);
/** Integrate contribution of cohesive cells to residual term.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -79,22 +79,17 @@
// Initialize fault. Determine orientation and setup boundary
void
pylith::faults::FaultCohesiveKin::initialize(const topology::Mesh& mesh,
- const double_array& upDir,
- const double_array& normalDir,
+ const double upDir[3],
+ const double normalDir[3],
spatialdata::spatialdb::SpatialDB* matDB)
{ // initialize
+ assert(0 != upDir);
+ assert(0 != normalDir);
assert(0 != _quadrature);
const spatialdata::geocoords::CoordSys* cs = mesh.coordsys();
assert(0 != cs);
- if (3 != upDir.size())
- throw std::runtime_error("Up direction for fault orientation must be "
- "a vector with 3 components.");
- if (3 != normalDir.size())
- throw std::runtime_error("Normal direction for fault orientation must be "
- "a vector with 3 components.");
-
CohesiveTopology::createFaultParallel(_faultMesh, &_cohesiveToFault,
mesh, id(), _useLagrangeConstraints());
//_faultMesh->getLabel("height")->view("Fault mesh height");
@@ -137,6 +132,9 @@
// Compute tributary area for each vertex in fault mesh.
_calcArea();
+
+ // Create empty tractions field for change in fault tractions.
+ _fields->add("tractions", "tractions_change");
} // initialize
// ----------------------------------------------------------------------
@@ -489,7 +487,11 @@
const ALE::Obj<SieveMesh::order_type>& globalOrder =
sieveMesh->getFactory()->getGlobalOrder(sieveMesh, "default", solutionSection);
assert(!globalOrder.isNull());
- visitor_type iV(*solutionSection, *globalOrder, (int) pow(sieveMesh->getSieve()->getMaxConeSize(), sieveMesh->depth())*spaceDim);
+ // We would need to request unique points here if we had an interpolated mesh
+ topology::Mesh::IndicesVisitor jacobianVisitor(*solutionSection,
+ *globalOrder,
+ (int) pow(sieveMesh->getSieve()->getMaxConeSize(),
+ sieveMesh->depth())*spaceDim);
for (SieveMesh::label_sequence::iterator c_iter=cellsCohesiveBegin;
c_iter != cellsCohesiveEnd;
@@ -547,10 +549,10 @@
} // for
// Insert cell contribution into PETSc Matrix
- err = updateOperator(*jacobianMatrix, *sieveMesh->getSieve(), iV, *c_iter, &matrixCell[0], INSERT_VALUES);
- if (err)
- throw std::runtime_error("Update to PETSc Mat failed.");
- iV.clear();
+ jacobianVisitor.clear();
+ err = updateOperator(jacobianMatrix, *sieveMesh->getSieve(),
+ jacobianVisitor, *c_iter, &matrixCell[0], ADD_VALUES);
+ CHECK_PETSC_ERROR_MSG(err, "Update to PETSc Mat failed.");
} // for
PetscLogFlops(cellsCohesiveSize*numConstraintVert*spaceDim*spaceDim*4);
_needNewJacobian = false;
@@ -754,39 +756,69 @@
// ----------------------------------------------------------------------
// Calculate orientation at fault vertices.
void
-pylith::faults::FaultCohesiveKin::_calcOrientation(const double_array& upDir,
- const double_array& normalDir)
+pylith::faults::FaultCohesiveKin::_calcOrientation(const double upDir[3],
+ const double normalDir[3])
{ // _calcOrientation
-#if 0
- assert(!_faultMesh.isNull());
+ assert(0 != upDir);
+ assert(0 != normalDir);
+ assert(0 != _faultMesh);
+ assert(0 != _fields);
- // Get vertices in fault mesh
- const ALE::Obj<SubMesh::label_sequence>& vertices =
- _faultMesh->depthStratum(0);
- const SubMesh::label_sequence::iterator verticesEnd = vertices->end();
+ double_array upDirArray(upDir, 3);
- // Create orientation section for fault (constraint) vertices
- const int cohesiveDim = _faultMesh->getDimension();
- const int spaceDim = cohesiveDim + 1;
+ // Get vertices in fault mesh.
+ const ALE::Obj<SieveSubMesh>& faultSieveMesh = _faultMesh->sieveMesh();
+ assert(!faultSieveMesh.isNull());
+ const ALE::Obj<SieveSubMesh::label_sequence>& vertices =
+ faultSieveMesh->depthStratum(0);
+ const SieveSubMesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
+
+ // Containers for orientation information.
+ const int cohesiveDim = _faultMesh->dimension();
+ const int numBasis = _quadrature->numBasis();
+ const int spaceDim = _quadrature->spaceDim();
const int orientationSize = spaceDim*spaceDim;
- _orientation = new real_section_type(_faultMesh->comm(),
- _faultMesh->debug());
- assert(!_orientation.isNull());
+ const feassemble::CellGeometry& cellGeometry = _quadrature->refGeometry();
+ const double_array& verticesRef = cellGeometry.vertices();
+ const int jacobianSize = (cohesiveDim > 0) ? spaceDim * cohesiveDim : 1;
+ const double_array& quadWts = _quadrature->quadWts();
+ double_array jacobian(jacobianSize);
+ double jacobianDet = 0;
+ double_array orientationVertex(orientationSize);
+ double_array coordinatesCell(numBasis*spaceDim);
+ double_array refCoordsVertex(cohesiveDim);
+
+ // Allocate orientation field.
+ _fields->add("orientation", "orientation");
+ topology::Field<topology::SubMesh>& orientation = _fields->get("orientation");
+ orientation.newSection(topology::FieldBase::VERTICES_FIELD, orientationSize);
+ const ALE::Obj<RealSection>& orientationSection = orientation.section();
+ assert(!orientationSection.isNull());
+ // Create subspaces for along-strike, up-dip, and normal directions
for (int iDim=0; iDim <= cohesiveDim; ++iDim)
- _orientation->addSpace();
- assert(cohesiveDim+1 == _orientation->getNumSpaces());
- _orientation->setChart(real_section_type::chart_type(*std::min_element(vertices->begin(), vertices->end()), *std::max_element(vertices->begin(), vertices->end())+1));
- _orientation->setFiberDimension(vertices, orientationSize);
+ orientationSection->addSpace();
for (int iDim=0; iDim <= cohesiveDim; ++iDim)
- _orientation->setFiberDimension(vertices, spaceDim, iDim);
- _faultMesh->allocate(_orientation);
+ orientationSection->setFiberDimension(vertices, spaceDim, iDim);
+ orientation.allocate();
+ orientation.zero();
+ // Get fault cells (1 dimension lower than top-level cells)
+ const ALE::Obj<SieveSubMesh::label_sequence>& cells =
+ faultSieveMesh->heightStratum(1);
+ assert(!cells.isNull());
+ const SieveSubMesh::label_sequence::iterator cellsBegin = cells->begin();
+ const SieveSubMesh::label_sequence::iterator cellsEnd = cells->end();
+
// Compute orientation of fault at constraint vertices
// Get section containing coordinates of vertices
- const ALE::Obj<real_section_type>& coordinates =
- _faultMesh->getRealSection("coordinates");
- assert(!coordinates.isNull());
+ const ALE::Obj<RealSection>& coordinatesSection =
+ faultSieveMesh->getRealSection("coordinates");
+ assert(!coordinatesSection.isNull());
+ topology::Mesh::RestrictVisitor coordinatesVisitor(*coordinatesSection,
+ coordinatesCell.size(),
+ &coordinatesCell[0]);
// Set orientation function
assert(cohesiveDim == _quadrature->cellDim());
@@ -794,127 +826,103 @@
// Loop over cohesive cells, computing orientation weighted by
// jacobian at constraint vertices
- const int numBasis = _quadrature->numBasis();
- const feassemble::CellGeometry& cellGeometry = _quadrature->refGeometry();
- const double_array& verticesRef = cellGeometry.vertices();
- const int jacobianSize = (cohesiveDim > 0) ? spaceDim * cohesiveDim : 1;
- double_array jacobian(jacobianSize);
- double jacobianDet = 0;
- double_array vertexOrientation(orientationSize);
- double_array faceVertices(numBasis*spaceDim);
- // Get fault cells (1 dimension lower than top-level cells)
- const int faultDepth = _faultMesh->depth()-1; // depth of fault cells
- const ALE::Obj<SubMesh::label_sequence>& cells =
- _faultMesh->depthStratum(faultDepth);
- assert(!cells.isNull());
- const SubMesh::label_sequence::iterator cellsEnd = cells->end();
-
- const ALE::Obj<sieve_type>& sieve = _faultMesh->getSieve();
+ const ALE::Obj<SieveSubMesh::sieve_type>& sieve = faultSieveMesh->getSieve();
assert(!sieve.isNull());
- typedef ALE::SieveAlg<Mesh> SieveAlg;
+ typedef ALE::SieveAlg<SieveSubMesh> SieveAlg;
- ALE::ISieveVisitor::NConeRetriever<sieve_type> ncV(*sieve, (size_t) pow(sieve->getMaxConeSize(), std::max(0, _faultMesh->depth())));
+ ALE::ISieveVisitor::NConeRetriever<sieve_type> ncV(*sieve, (size_t) pow(sieve->getMaxConeSize(), std::max(0, faultSieveMesh->depth())));
- for (SubMesh::label_sequence::iterator c_iter=cells->begin();
+ for (SieveSubMesh::label_sequence::iterator c_iter=cellsBegin;
c_iter != cellsEnd;
++c_iter) {
- _faultMesh->restrictClosure(coordinates, *c_iter,
- &faceVertices[0], faceVertices.size());
+ // Get orientations at fault cell's vertices.
+ coordinatesVisitor.clear();
+ faultSieveMesh->restrictClosure(*c_iter, coordinatesVisitor);
- ALE::ISieveTraversal<sieve_type>::orientedClosure(*sieve, *c_iter, ncV);
+ ALE::ISieveTraversal<SieveSubMesh::sieve_type>::orientedClosure(*sieve, *c_iter, ncV);
const int coneSize = ncV.getSize();
const Mesh::point_type *cone = ncV.getPoints();
for(int v = 0; v < coneSize; ++v) {
// Compute Jacobian and determinant of Jacobian at vertex
- double_array vertex(&verticesRef[v*cohesiveDim], cohesiveDim);
- cellGeometry.jacobian(&jacobian, &jacobianDet, faceVertices, vertex);
+ memcpy(&refCoordsVertex[0], &verticesRef[v*cohesiveDim],
+ cohesiveDim*sizeof(double));
+ cellGeometry.jacobian(&jacobian, &jacobianDet, coordinatesCell,
+ refCoordsVertex);
// Compute orientation
- cellGeometry.orientation(&vertexOrientation, jacobian, jacobianDet,
- upDir);
+ cellGeometry.orientation(&orientationVertex, jacobian, jacobianDet,
+ upDirArray);
// Update orientation
- _orientation->updateAddPoint(cone[v], &vertexOrientation[0]);
+ orientationSection->updateAddPoint(cone[v], &orientationVertex[0]);
} // for
ncV.clear();
} // for
// Assemble orientation information
- ALE::Completion::completeSectionAdd(_faultMesh->getSendOverlap(),
- _faultMesh->getRecvOverlap(),
- _orientation, _orientation);
+ orientation.complete();
// Loop over vertices, make orientation information unit magnitude
double_array vertexDir(orientationSize);
int count = 0;
- for (SubMesh::label_sequence::iterator v_iter=vertices->begin();
+ for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++count) {
- const real_section_type::value_type* vertexOrient =
- _orientation->restrictPoint(*v_iter);
- assert(0 != vertexOrient);
-
- assert(spaceDim*spaceDim == orientationSize);
+ orientationVertex = 0.0;
+ orientationSection->restrictPoint(*v_iter, &orientationVertex[0],
+ orientationVertex.size());
for (int iDim=0; iDim < spaceDim; ++iDim) {
double mag = 0;
for (int jDim=0, index=iDim*spaceDim; jDim < spaceDim; ++jDim)
- mag += pow(vertexOrient[index+jDim],2);
+ mag += pow(orientationVertex[index+jDim],2);
mag = sqrt(mag);
assert(mag > 0.0);
for (int jDim=0, index=iDim*spaceDim; jDim < spaceDim; ++jDim)
- vertexDir[index+jDim] =
- vertexOrient[index+jDim] / mag;
+ orientationVertex[index+jDim] /= mag;
} // for
- _orientation->updatePoint(*v_iter, &vertexDir[0]);
+ orientationSection->updatePoint(*v_iter, &orientationVertex[0]);
} // for
PetscLogFlops(count * orientationSize * 4);
- if (2 == cohesiveDim) {
+ if (2 == cohesiveDim && vertices->size() > 0) {
// Check orientation of first vertex, if dot product of fault
// normal with preferred normal is negative, flip up/down dip direction.
// If the user gives the correct normal direction, we should end
// up with left-lateral-slip, reverse-slip, and fault-opening for
// positive slip values.
-
- const real_section_type::value_type* vertexOrient =
- _orientation->restrictPoint(*vertices->begin());
- assert(0 != vertexOrient);
-
- double_array vertNormalDir(&vertexOrient[6], 3);
+
+ assert(vertices->size() > 0);
+ orientationSection->restrictPoint(*vertices->begin(), &orientationVertex[0],
+ orientationVertex.size());
+
+ assert(3 == spaceDim);
+ double_array normalDirVertex(&orientationVertex[6], 3);
const double dot =
- normalDir[0]*vertNormalDir[0] +
- normalDir[1]*vertNormalDir[1] +
- normalDir[2]*vertNormalDir[2];
+ normalDir[0]*normalDirVertex[0] +
+ normalDir[1]*normalDirVertex[1] +
+ normalDir[2]*normalDirVertex[2];
if (dot < 0.0)
- for (SubMesh::label_sequence::iterator v_iter=vertices->begin();
+ for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter) {
- const real_section_type::value_type* vertexOrient =
- _orientation->restrictPoint(*v_iter);
- assert(0 != vertexOrient);
- assert(9 == _orientation->getFiberDimension(*v_iter));
- // Keep along-strike direction
- for (int iDim=0; iDim < 3; ++iDim)
- vertexDir[iDim] = vertexOrient[iDim];
+ orientationSection->restrictPoint(*vertices->begin(), &orientationVertex[0],
+ orientationVertex.size());
+ assert(9 == orientationSection->getFiberDimension(*v_iter));
// Flip up-dip direction
for (int iDim=3; iDim < 6; ++iDim)
- vertexDir[iDim] = -vertexOrient[iDim];
- // Keep normal direction
- for (int iDim=6; iDim < 9; ++iDim)
- vertexDir[iDim] = vertexOrient[iDim];
+ orientationVertex[iDim] = -orientationVertex[iDim];
// Update direction
- _orientation->updatePoint(*v_iter, &vertexDir[0]);
+ orientationSection->updatePoint(*v_iter, &orientationVertex[0]);
} // for
PetscLogFlops(5 + count * 3);
} // if
//_orientation->view("ORIENTATION");
-#endif
} // _calcOrientation
// ----------------------------------------------------------------------
@@ -923,58 +931,63 @@
const spatialdata::geocoords::CoordSys* cs,
spatialdata::spatialdb::SpatialDB* matDB)
{ // _calcConditioning
-#if 0
assert(0 != cs);
assert(0 != matDB);
- assert(!_faultMesh.isNull());
+ assert(0 != _faultMesh);
+ assert(0 != _fields);
const int spaceDim = cs->spaceDim();
- // Get vertices in fault mesh
- const ALE::Obj<SubMesh::label_sequence>& vertices =
- _faultMesh->depthStratum(0);
- const SubMesh::label_sequence::iterator verticesEnd = vertices->end();
+ // Get vertices in fault mesh.
+ const ALE::Obj<SieveSubMesh>& faultSieveMesh = _faultMesh->sieveMesh();
+ assert(!faultSieveMesh.isNull());
+ const ALE::Obj<SieveSubMesh::label_sequence>& vertices =
+ faultSieveMesh->depthStratum(0);
+ const SieveSubMesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
- _pseudoStiffness = new real_section_type(_faultMesh->comm(),
- _faultMesh->debug());
- assert(!_pseudoStiffness.isNull());
- _pseudoStiffness->setChart(real_section_type::chart_type(*std::min_element(vertices->begin(),
- vertices->end()),
- *std::max_element(vertices->begin(),
- vertices->end())+1));
- _pseudoStiffness->setFiberDimension(vertices, 1);
- _faultMesh->allocate(_pseudoStiffness);
-
+ // Allocate stiffness field.
+ _fields->add("stiffness", "stiffness");
+ topology::Field<topology::SubMesh>& stiffness = _fields->get("stiffness");
+ stiffness.newSection(topology::FieldBase::VERTICES_FIELD, 1);
+ stiffness.allocate();
+ stiffness.zero();
+ const ALE::Obj<RealSection>& stiffnessSection = stiffness.section();
+ assert(!stiffnessSection.isNull());
+
+ // Setup queries of physical properties.
matDB->open();
const char* stiffnessVals[] = { "density", "vs" };
const int numStiffnessVals = 2;
matDB->queryVals(stiffnessVals, numStiffnessVals);
// Get section containing coordinates of vertices
- const ALE::Obj<real_section_type>& coordinates =
- _faultMesh->getRealSection("coordinates");
+ const ALE::Obj<RealSection>& coordinates =
+ faultSieveMesh->getRealSection("coordinates");
assert(!coordinates.isNull());
+ // Get dimensional scales.
assert(0 != _normalizer);
const double pressureScale = _normalizer->pressureScale();
const double lengthScale = _normalizer->lengthScale();
double_array matprops(numStiffnessVals);
- double_array vCoords(spaceDim);
+ double_array coordsVertex(spaceDim);
int count = 0;
- for (SubMesh::label_sequence::iterator v_iter=vertices->begin();
+ // Set values in orientation section.
+ for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++count) {
- coordinates->restrictPoint(*v_iter, &vCoords[0], vCoords.size());
- _normalizer->dimensionalize(&vCoords[0], vCoords.size(), lengthScale);
- int err = matDB->query(&matprops[0], numStiffnessVals, &vCoords[0],
- vCoords.size(), cs);
+ coordinates->restrictPoint(*v_iter, &coordsVertex[0], coordsVertex.size());
+ _normalizer->dimensionalize(&coordsVertex[0], coordsVertex.size(), lengthScale);
+ int err = matDB->query(&matprops[0], numStiffnessVals, &coordsVertex[0],
+ coordsVertex.size(), cs);
if (err) {
std::ostringstream msg;
msg << "Could not find material properties at (";
for (int i=0; i < spaceDim; ++i)
- msg << " " << vCoords[i];
+ msg << " " << coordsVertex[i];
msg << ") using spatial database " << matDB->label() << ".";
throw std::runtime_error(msg.str());
} // if
@@ -983,49 +996,37 @@
const double vs = matprops[1];
const double mu = density * vs*vs;
const double muN = _normalizer->nondimensionalize(mu, pressureScale);
- _pseudoStiffness->updatePoint(*v_iter, &muN);
+ stiffnessSection->updatePoint(*v_iter, &muN);
} // for
PetscLogFlops(count * 2);
matDB->close();
-#endif
} // _calcConditioning
// ----------------------------------------------------------------------
void
pylith::faults::FaultCohesiveKin::_calcArea(void)
{ // _calcArea
-#if 0
- assert(!_faultMesh.isNull());
+ assert(0 != _faultMesh);
+ assert(0 != _fields);
- // Get vertices in fault mesh
- const ALE::Obj<SubMesh::label_sequence>& vertices =
- _faultMesh->depthStratum(0);
- const SubMesh::label_sequence::iterator verticesEnd = vertices->end();
- const int numVertices = vertices->size();
-
- _area = new real_section_type(_faultMesh->comm(),
- _faultMesh->debug());
- assert(!_area.isNull());
- _area->setChart(real_section_type::chart_type(*std::min_element(vertices->begin(),
- vertices->end()),
- *std::max_element(vertices->begin(),
- vertices->end())+1));
- _area->setFiberDimension(vertices, 1);
- _faultMesh->allocate(_area);
+ // Get vertices in fault mesh.
+ const ALE::Obj<SieveSubMesh>& faultSieveMesh = _faultMesh->sieveMesh();
+ assert(!faultSieveMesh.isNull());
+ const ALE::Obj<SieveSubMesh::label_sequence>& vertices =
+ faultSieveMesh->depthStratum(0);
+ const SieveSubMesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
- // Get fault cells (1 dimension lower than top-level cells)
- const int faultDepth = submesh->depth()-1; // depth of bndry cells
- const ALE::Obj<SubMesh::label_sequence>& cells =
- _faultMesh->depthStratum(faultDepth);
- assert(!cells.isNull());
- const SubMesh::label_sequence::iterator cellsEnd = cells->end();
-
- // Get section containing coordinates of vertices
- const ALE::Obj<real_section_type>& coordinates =
- _faultMesh->getRealSection("coordinates");
- assert(!coordinates.isNull());
-
+ // Allocate area field.
+ _fields->add("area", "area");
+ topology::Field<topology::SubMesh>& area = _fields->get("area");
+ area.newSection(topology::FieldBase::VERTICES_FIELD, 1);
+ area.allocate();
+ area.zero();
+ const ALE::Obj<RealSection>& areaSection = area.section();
+ assert(!areaSection.isNull());
+
// Containers for area information
const int cellDim = _quadrature->cellDim();
const int numBasis = _quadrature->numBasis();
@@ -1036,13 +1037,22 @@
assert(quadWts.size() == numQuadPts);
double jacobianDet = 0;
double_array areaCell(numBasis);
- double_array cellVertices(numBasis*spaceDim);
+ double_array verticesCell(numBasis*spaceDim);
+ // Get fault cells (1 dimension lower than top-level cells)
+ const ALE::Obj<SieveSubMesh::label_sequence>& cells =
+ faultSieveMesh->heightStratum(1);
+ assert(!cells.isNull());
+ const SieveSubMesh::label_sequence::iterator cellsBegin = cells->begin();
+ const SieveSubMesh::label_sequence::iterator cellsEnd = cells->end();
+
+ _quadrature->computeGeometry(*_faultMesh, cells);
+
// Loop over cells in fault mesh, compute area
- for(SubMesh::label_sequence::iterator c_iter = cells->begin();
+ for(SieveSubMesh::label_sequence::iterator c_iter = cellsBegin;
c_iter != cellsEnd;
++c_iter) {
- _quadrature->computeGeometry(_faultMesh, coordinates, *c_iter);
+ _quadrature->retrieveGeometry(*c_iter);
areaCell = 0.0;
// Get cell geometry information that depends on cell
@@ -1057,20 +1067,19 @@
areaCell[iBasis] += dArea;
} // for
} // for
- _faultMesh->updateAdd(_area, *c_iter, &areaCell[0]);
+ areaSection->updateAddPoint(*c_iter, &areaCell[0]);
PetscLogFlops( numQuadPts*(1+numBasis*2) );
} // for
// Assemble area information
- ALE::Completion::completeSectionAdd(_faultMesh->getSendOverlap(), _faultMesh->getRecvOverlap(), _area, _area);
+ area.complete();
#if 0 // DEBUGGING
- _area->view("AREA");
+ area.view("AREA");
_faultMesh->getSendOverlap()->view("Send fault overlap");
_faultMesh->getRecvOverlap()->view("Receive fault overlap");
#endif
-#endif
} // _calcArea
// ----------------------------------------------------------------------
@@ -1081,23 +1090,39 @@
topology::Field<topology::SubMesh>* tractions,
const topology::Field<topology::Mesh>& solution)
{ // _calcTractionsChange
-#if 0
assert(0 != tractions);
- assert(!mesh.isNull());
- assert(!solution.isNull());
- assert(!_faultMesh.isNull());
- assert(!_pseudoStiffness.isNull());
- assert(!_area.isNull());
+ assert(0 != _faultMesh);
+ assert(0 != _fields);
- const ALE::Obj<Mesh::label_sequence>& vertices =
- mesh->depthStratum(0);
- const Mesh::label_sequence::iterator verticesEnd = vertices->end();
+ // Get vertices from mesh of domain.
+ const ALE::Obj<SieveMesh>& sieveMesh = solution.mesh().sieveMesh();
+ assert(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::label_sequence>& vertices =
+ sieveMesh->depthStratum(0);
+ assert(!vertices.isNull());
+ const SieveMesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
- const ALE::Obj<Mesh::label_sequence>& fvertices =
- _faultMesh->depthStratum(0);
- const Mesh::label_sequence::iterator fverticesEnd = fvertices->end();
+ // Get fault vertices
+ const ALE::Obj<SieveMesh>& faultSieveMesh = _faultMesh->sieveMesh();
+ assert(!faultSieveMesh.isNull());
+ const ALE::Obj<SieveSubMesh::label_sequence>& fvertices =
+ faultSieveMesh->depthStratum(0);
+ const SieveSubMesh::label_sequence::iterator fverticesBegin = fvertices->begin();
+ const SieveSubMesh::label_sequence::iterator fverticesEnd = fvertices->end();
+
+ // Get sections.
+ const ALE::Obj<RealSection>& stiffnessSection =
+ _fields->get("pseudostiffness").section();
+ assert(!stiffnessSection.isNull());
+ const ALE::Obj<RealSection>& areaSection =
+ _fields->get("area").section();
+ assert(!areaSection.isNull());
+ const ALE::Obj<RealSection>& solutionSection = solution.section();
+ assert(!solutionSection.isNull());
+
const int numFaultVertices = fvertices->size();
- Mesh::renumbering_type& renumbering = _faultMesh->getRenumbering();
+ Mesh::renumbering_type& renumbering = faultSieveMesh->getRenumbering();
#if 0 // MOVE TO SEPARATE CHECK METHOD
// Check fault mesh and volume mesh coordinates
@@ -1123,46 +1148,43 @@
// Fiber dimension of tractions matches spatial dimension.
const int fiberDim = _quadrature->spaceDim();
- double_array tractionValues(fiberDim);
+ double_array tractionsVertex(fiberDim);
// Allocate buffer for tractions field (if nec.).
- if (tractions->isNull() ||
- fiberDim != (*tractions)->getFiberDimension(*fvertices->begin())) {
- *tractions = new real_section_type(_faultMesh->comm(), _faultMesh->debug());
- (*tractions)->setChart(real_section_type::chart_type(
- *std::min_element(fvertices->begin(), fvertices->end()),
- *std::max_element(fvertices->begin(), fvertices->end())+1));
- (*tractions)->setFiberDimension(fvertices, fiberDim);
- _faultMesh->allocate(*tractions);
- assert(!tractions->isNull());
+ const ALE::Obj<RealSection>& tractionsSection = tractions->section();
+ if (tractionsSection.isNull()) {
+ tractions->newSection(topology::FieldBase::VERTICES_FIELD, fiberDim);
+ tractions->allocate();
} // if
+ assert(!tractionsSection.isNull());
+ tractions->zero();
- for (Mesh::label_sequence::iterator v_iter = vertices->begin();
+ for (SieveMesh::label_sequence::iterator v_iter = verticesBegin;
v_iter != verticesEnd;
++v_iter)
if (renumbering.find(*v_iter) != renumbering.end()) {
const int vertexMesh = *v_iter;
const int vertexFault = renumbering[*v_iter];
- assert(fiberDim == solution->getFiberDimension(vertexMesh));
- assert(fiberDim == (*tractions)->getFiberDimension(vertexFault));
- assert(1 == _pseudoStiffness->getFiberDimension(vertexFault));
- assert(1 == _area->getFiberDimension(vertexFault));
+ assert(fiberDim == solutionSection->getFiberDimension(vertexMesh));
+ assert(fiberDim == tractionsSection->getFiberDimension(vertexFault));
+ assert(1 == stiffnessSection->getFiberDimension(vertexFault));
+ assert(1 == areaSection->getFiberDimension(vertexFault));
- const real_section_type::value_type* solutionValues =
- solution->restrictPoint(vertexMesh);
- assert(0 != solutionValues);
- const real_section_type::value_type* pseudoStiffValue =
- _pseudoStiffness->restrictPoint(vertexFault);
- assert(0 != _pseudoStiffness);
- const real_section_type::value_type* areaValue =
- _area->restrictPoint(vertexFault);
- assert(0 != _area);
+ const real_section_type::value_type* solutionVertex =
+ solutionSection->restrictPoint(vertexMesh);
+ assert(0 != solutionVertex);
+ const real_section_type::value_type* stiffnessVertex =
+ stiffnessSection->restrictPoint(vertexFault);
+ assert(0 != stiffnessVertex);
+ const real_section_type::value_type* areaVertex =
+ areaSection->restrictPoint(vertexFault);
+ assert(0 != areaVertex);
- const double scale = pseudoStiffValue[0] / areaValue[0];
+ const double scale = stiffnessVertex[0] / areaVertex[0];
for (int i=0; i < fiberDim; ++i)
- tractionValues[i] = solutionValues[i] * scale;
+ tractionsVertex[i] = solutionVertex[i] * scale;
- (*tractions)->updatePoint(vertexFault, &tractionValues[0]);
+ tractionsSection->updatePoint(vertexFault, &tractionsVertex[0]);
} // if
PetscLogFlops(numFaultVertices * (1 + fiberDim) );
@@ -1173,7 +1195,6 @@
_pseudoStiffness->view("CONDITIONING");
(*tractions)->view("TRACTIONS");
#endif
-#endif
} // _calcTractionsChange
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -87,8 +87,8 @@
* (used to improve conditioning of Jacobian matrix)
*/
void initialize(const topology::Mesh& mesh,
- const double_array& upDir,
- const double_array& normalDir,
+ const double upDir[3],
+ const double normalDir[3],
spatialdata::spatialdb::SpatialDB* matDB);
/** Integrate contributions to residual term (r) for operator that
@@ -183,8 +183,8 @@
* (used to pick which of two possible normal directions for
* interface; only applies to fault surfaces in a 3-D domain).
*/
- void _calcOrientation(const double_array& upDir,
- const double_array& normalDir);
+ void _calcOrientation(const double upDir[3],
+ const double normalDir[3]);
/** Calculate conditioning field.
*
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am 2009-04-26 18:39:11 UTC (rev 14791)
@@ -28,9 +28,9 @@
TestBruneSlipFn.cc \
TestLiuCosSlipFn.cc \
TestEqKinSrc.cc \
+ TestFaultCohesiveKin.cc \
test_faults.cc
-# TestFaultCohesiveKin.cc \
# TestFaultCohesiveKinLine2.cc \
# TestFaultCohesiveKinTri3.cc \
# TestFaultCohesiveKinTri3d.cc \
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -20,10 +20,11 @@
#include "pylith/faults/EqKinSrc.hh" // USES EqKinSrc
#include "pylith/faults/BruneSlipFn.hh" // USES BruneSlipFn
+#include "pylith/topology/Mesh.hh" // USES Mesh
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
#include "pylith/feassemble/Quadrature.hh" // USES Quadrature
-#include "pylith/topology/FieldsManager.hh" // USES FieldsManager
+#include "pylith/topology/SolutionFields.hh" // USES SolutionFields
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
-#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
#include "spatialdata/geocoords/CSCart.hh" // USES CSCart
#include "spatialdata/spatialdb/SimpleDB.hh" // USES SimpleDB
@@ -35,6 +36,11 @@
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::faults::TestFaultCohesiveKin );
// ----------------------------------------------------------------------
+typedef pylith::topology::Mesh::SieveMesh SieveMesh;
+typedef pylith::topology::Mesh::RealSection RealSection;
+typedef pylith::topology::SubMesh::SieveMesh SieveSubMesh;
+
+// ----------------------------------------------------------------------
// Setup testing data.
void
pylith::faults::TestFaultCohesiveKin::setUp(void)
@@ -129,76 +135,88 @@
void
pylith::faults::TestFaultCohesiveKin::testInitialize(void)
{ // testInitialize
- ALE::Obj<Mesh> mesh;
+ topology::Mesh mesh;
FaultCohesiveKin fault;
_initialize(&mesh, &fault);
- //mesh->view(_data->meshFilename);
+ //mesh.view(_data->meshFilename);
- Mesh::renumbering_type& renumbering = fault._faultMesh->getRenumbering();
- const ALE::Obj<Mesh::label_sequence>& vertices =
- fault._faultMesh->depthStratum(0);
- const Mesh::label_sequence::iterator verticesEnd = vertices->end();
+ const ALE::Obj<SieveSubMesh>& faultSieveMesh = fault._faultMesh->sieveMesh();
+ CPPUNIT_ASSERT(!faultSieveMesh.isNull());
+ SieveSubMesh::renumbering_type& renumbering =
+ faultSieveMesh->getRenumbering();
+ const ALE::Obj<SieveSubMesh::label_sequence>& vertices =
+ faultSieveMesh->depthStratum(0);
+ const SieveSubMesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
int iVertex = 0;
- for (Mesh::label_sequence::iterator v_iter=vertices->begin();
+ for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) {
- CPPUNIT_ASSERT(renumbering.find(_data->constraintVertices[iVertex]) != renumbering.end());
+ CPPUNIT_ASSERT(renumbering.find(_data->constraintVertices[iVertex]) !=
+ renumbering.end());
CPPUNIT_ASSERT_EQUAL(renumbering[_data->constraintVertices[iVertex]],
*v_iter);
} // for
CPPUNIT_ASSERT_EQUAL(_data->numConstraintVert, iVertex);
// Check orientation
+ const ALE::Obj<RealSection>& orientationSection =
+ fault._fields->get("orientation").section();
+ CPPUNIT_ASSERT(!orientationSection.isNull());
const int cellDim = _data->cellDim;
const int spaceDim = _data->spaceDim;
const int orientationSize = spaceDim*spaceDim;
iVertex = 0;
- for (Mesh::label_sequence::iterator v_iter=vertices->begin();
+ for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) {
- const int fiberDim = fault._orientation->getFiberDimension(*v_iter);
+ const int fiberDim = orientationSection->getFiberDimension(*v_iter);
CPPUNIT_ASSERT_EQUAL(orientationSize, fiberDim);
- const real_section_type::value_type* vertexOrient =
- fault._orientation->restrictPoint(*v_iter);
- CPPUNIT_ASSERT(0 != vertexOrient);
+ const double* orientationVertex =
+ orientationSection->restrictPoint(*v_iter);
+ CPPUNIT_ASSERT(0 != orientationVertex);
const double tolerance = 1.0e-06;
for (int i=0; i < orientationSize; ++i) {
const int index = iVertex*orientationSize+i;
CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->orientation[index],
- vertexOrient[i], tolerance);
+ orientationVertex[i], tolerance);
} // for
} // for
// Check area
+ const ALE::Obj<RealSection>& areaSection =
+ fault._fields->get("area").section();
+ CPPUNIT_ASSERT(!areaSection.isNull());
iVertex = 0;
- for (Mesh::label_sequence::iterator v_iter=vertices->begin();
+ for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) {
- const int fiberDim = fault._area->getFiberDimension(*v_iter);
+ const int fiberDim = areaSection->getFiberDimension(*v_iter);
CPPUNIT_ASSERT_EQUAL(1, fiberDim);
- const real_section_type::value_type* vertexArea =
- fault._area->restrictPoint(*v_iter);
- CPPUNIT_ASSERT(0 != vertexArea);
+ const double* areaVertex = areaSection->restrictPoint(*v_iter);
+ CPPUNIT_ASSERT(0 != areaVertex);
const double tolerance = 1.0e-06;
- CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->area[iVertex], vertexArea[0],
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->area[iVertex], areaVertex[0],
tolerance);
} // for
// Check pseudoStiffness
+ const ALE::Obj<RealSection>& stiffnessSection =
+ fault._fields->get("stiffness").section();
+ CPPUNIT_ASSERT(!stiffnessSection.isNull());
iVertex = 0;
- for (Mesh::label_sequence::iterator v_iter=vertices->begin();
+ for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) {
- const int fiberDim = fault._pseudoStiffness->getFiberDimension(*v_iter);
+ const int fiberDim = stiffnessSection->getFiberDimension(*v_iter);
CPPUNIT_ASSERT_EQUAL(1, fiberDim);
- const real_section_type::value_type* vertexStiffness =
- fault._pseudoStiffness->restrictPoint(*v_iter);
- CPPUNIT_ASSERT(0 != vertexStiffness);
+ const double* stiffnessVertex = stiffnessSection->restrictPoint(*v_iter);
+ CPPUNIT_ASSERT(0 != stiffnessVertex);
const double tolerance = 1.0e-06;
- CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->pseudoStiffness, vertexStiffness[0],
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->pseudoStiffness, stiffnessVertex[0],
tolerance);
} // for
} // testInitialize
@@ -208,49 +226,50 @@
void
pylith::faults::TestFaultCohesiveKin::testIntegrateResidual(void)
{ // testIntegrateResidual
- ALE::Obj<Mesh> mesh;
+ topology::Mesh mesh;
FaultCohesiveKin fault;
_initialize(&mesh, &fault);
spatialdata::geocoords::CSCart cs;
- cs.setSpaceDim((mesh)->getDimension());
+ cs.setSpaceDim(mesh.dimension());
cs.initialize();
// Setup fields
- topology::FieldsManager fields(mesh);
- fields.addReal("residual");
- fields.addReal("solution");
- fields.solutionField("solution");
-
- const ALE::Obj<real_section_type>& residual = fields.getReal("residual");
- CPPUNIT_ASSERT(!residual.isNull());
+ topology::SolutionFields fields(mesh);
+ fields.add("residual", "residual");
+ fields.add("solution", "displacement");
+ fields.solutionName("solution");
+
const int spaceDim = _data->spaceDim;
- residual->setChart(mesh->getSieve()->getChart());
- residual->setFiberDimension(mesh->depthStratum(0), spaceDim);
- mesh->allocate(residual);
- residual->zero();
+ topology::Field<topology::Mesh>& residual = fields.get("residual");
+ residual.newSection(topology::FieldBase::VERTICES_FIELD, spaceDim);
+ residual.allocate();
fields.copyLayout("residual");
+ const ALE::Obj<RealSection>& residualSection = residual.section();
- const ALE::Obj<real_section_type>& solution = fields.getReal("solution");
- CPPUNIT_ASSERT(!solution.isNull());
+ const ALE::Obj<RealSection>& solutionSection =
+ fields.get("solution").section();
+ CPPUNIT_ASSERT(!solutionSection.isNull());
- const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
+ const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
+ CPPUNIT_ASSERT(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::label_sequence>& vertices =
+ sieveMesh->depthStratum(0);
CPPUNIT_ASSERT(!vertices.isNull());
- const Mesh::label_sequence::iterator vBegin = vertices->begin();
- const Mesh::label_sequence::iterator vEnd = vertices->end();
+ const SieveMesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
int iVertex = 0;
- for (Mesh::label_sequence::iterator v_iter=vBegin;
- v_iter != vEnd;
- ++v_iter, ++iVertex) {
- solution->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
- } // for
+ for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
+ ++v_iter, ++iVertex)
+ solutionSection->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
const double t = 2.134;
const double dt = 0.01;
fault.timeStep(dt);
{ // Integrate residual with solution (as opposed to solution increment).
fault.useSolnIncr(false);
- fault.integrateResidual(residual, t, &fields, mesh, &cs);
+ fault.integrateResidual(residual, t, &fields);
//residual->view("RESIDUAL"); // DEBUGGING
@@ -259,13 +278,12 @@
iVertex = 0;
const int fiberDimE = spaceDim;
const double tolerance = 1.0e-06;
- for (Mesh::label_sequence::iterator v_iter=vBegin;
- v_iter != vEnd;
+ for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
++v_iter, ++iVertex) {
- const int fiberDim = residual->getFiberDimension(*v_iter);
+ const int fiberDim = residualSection->getFiberDimension(*v_iter);
CPPUNIT_ASSERT_EQUAL(fiberDimE, fiberDim);
- const real_section_type::value_type* vals =
- residual->restrictPoint(*v_iter);
+ const double* vals = residualSection->restrictPoint(*v_iter);
CPPUNIT_ASSERT(0 != vals);
const bool isConstraint = _isConstraintVertex(*v_iter);
@@ -287,10 +305,10 @@
} // for
} // Integrate residual with solution (as opposed to solution increment).
- residual->zero();
+ residual.zero();
{ // Integrate residual with solution increment.
fault.useSolnIncr(true);
- fault.integrateResidual(residual, t, &fields, mesh, &cs);
+ fault.integrateResidual(residual, t, &fields);
//residual->view("RESIDUAL"); // DEBUGGING
@@ -299,13 +317,12 @@
iVertex = 0;
const int fiberDimE = spaceDim;
const double tolerance = 1.0e-06;
- for (Mesh::label_sequence::iterator v_iter=vBegin;
- v_iter != vEnd;
+ for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
++v_iter, ++iVertex) {
- const int fiberDim = residual->getFiberDimension(*v_iter);
+ const int fiberDim = residualSection->getFiberDimension(*v_iter);
CPPUNIT_ASSERT_EQUAL(fiberDimE, fiberDim);
- const real_section_type::value_type* vals =
- residual->restrictPoint(*v_iter);
+ const double* vals = residualSection->restrictPoint(*v_iter);
CPPUNIT_ASSERT(0 != vals);
const bool isConstraint = _isConstraintVertex(*v_iter);
@@ -333,6 +350,7 @@
void
pylith::faults::TestFaultCohesiveKin::testIntegrateJacobian(void)
{ // testIntegrateJacobian
+#if 0
ALE::Obj<Mesh> mesh;
FaultCohesiveKin fault;
_initialize(&mesh, &fault);
@@ -357,11 +375,11 @@
const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
CPPUNIT_ASSERT(!vertices.isNull());
- const Mesh::label_sequence::iterator vBegin = vertices->begin();
- const Mesh::label_sequence::iterator vEnd = vertices->end();
+ const Mesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const Mesh::label_sequence::iterator verticesEnd = vertices->end();
int iVertex = 0;
- for (Mesh::label_sequence::iterator v_iter=vBegin;
- v_iter != vEnd;
+ for (Mesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
++v_iter, ++iVertex) {
solution->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
} // for
@@ -421,6 +439,7 @@
MatDestroy(jDense);
MatDestroy(jSparseAIJ);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
+#endif
} // testIntegrateJacobian
// ----------------------------------------------------------------------
@@ -428,6 +447,7 @@
void
pylith::faults::TestFaultCohesiveKin::testIntegrateResidualAssembled(void)
{ // testIntegrateResidualAssembled
+#if 0
ALE::Obj<Mesh> mesh;
FaultCohesiveKin fault;
_initialize(&mesh, &fault);
@@ -456,11 +476,11 @@
const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
CPPUNIT_ASSERT(!vertices.isNull());
- const Mesh::label_sequence::iterator vBegin = vertices->begin();
- const Mesh::label_sequence::iterator vEnd = vertices->end();
+ const Mesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const Mesh::label_sequence::iterator verticesEnd = vertices->end();
int iVertex = 0;
- for (Mesh::label_sequence::iterator v_iter=vBegin;
- v_iter != vEnd;
+ for (Mesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
++v_iter, ++iVertex) {
solution->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
} // for
@@ -479,8 +499,8 @@
iVertex = 0;
const int fiberDimE = spaceDim;
const double tolerance = 1.0e-06;
- for (Mesh::label_sequence::iterator v_iter=vBegin;
- v_iter != vEnd;
+ for (Mesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
++v_iter, ++iVertex) {
const int fiberDim = residual->getFiberDimension(*v_iter);
CPPUNIT_ASSERT_EQUAL(fiberDimE, fiberDim);
@@ -519,8 +539,8 @@
iVertex = 0;
const int fiberDimE = spaceDim;
const double tolerance = 1.0e-06;
- for (Mesh::label_sequence::iterator v_iter=vBegin;
- v_iter != vEnd;
+ for (Mesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
++v_iter, ++iVertex) {
const int fiberDim = residual->getFiberDimension(*v_iter);
CPPUNIT_ASSERT_EQUAL(fiberDimE, fiberDim);
@@ -546,6 +566,7 @@
} // if/else
} // for
} // Integrate residual with solution increment.
+#endif
} // testIntegrateResidualAssembled
// ----------------------------------------------------------------------
@@ -553,6 +574,7 @@
void
pylith::faults::TestFaultCohesiveKin::testIntegrateJacobianAssembled(void)
{ // testIntegrateJacobianAssembled
+#if 0
ALE::Obj<Mesh> mesh;
FaultCohesiveKin fault;
_initialize(&mesh, &fault);
@@ -577,11 +599,11 @@
const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
CPPUNIT_ASSERT(!vertices.isNull());
- const Mesh::label_sequence::iterator vBegin = vertices->begin();
- const Mesh::label_sequence::iterator vEnd = vertices->end();
+ const Mesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const Mesh::label_sequence::iterator verticesEnd = vertices->end();
int iVertex = 0;
- for (Mesh::label_sequence::iterator v_iter=vBegin;
- v_iter != vEnd;
+ for (Mesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
++v_iter, ++iVertex) {
solution->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
} // for
@@ -646,6 +668,7 @@
MatDestroy(jDense);
MatDestroy(jSparseAIJ);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
+#endif
} // testIntegrateJacobianAssembled
// ----------------------------------------------------------------------
@@ -653,6 +676,7 @@
void
pylith::faults::TestFaultCohesiveKin::testUpdateState(void)
{ // testUpdateState
+#if 0
ALE::Obj<Mesh> mesh;
FaultCohesiveKin fault;
_initialize(&mesh, &fault);
@@ -757,6 +781,7 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(slipE[iDim], slipV[iDim], tolerance);
} // for
} // for
+#endif
} // testUpdateState
// ----------------------------------------------------------------------
@@ -764,6 +789,7 @@
void
pylith::faults::TestFaultCohesiveKin::testCalcTractionsChange(void)
{ // testCalcTractionsChange
+#if 0
ALE::Obj<Mesh> mesh;
FaultCohesiveKin fault;
_initialize(&mesh, &fault);
@@ -847,34 +873,38 @@
tolerance);
} // for
} // for
+#endif
} // testCalcTractionsChange
// ----------------------------------------------------------------------
// Initialize FaultCohesiveKin interface condition.
void
-pylith::faults::TestFaultCohesiveKin::_initialize(ALE::Obj<Mesh>* mesh,
+pylith::faults::TestFaultCohesiveKin::_initialize(
+ topology::Mesh* mesh,
FaultCohesiveKin* const fault) const
{ // _initialize
- CPPUNIT_ASSERT(0 != _data);
CPPUNIT_ASSERT(0 != mesh);
CPPUNIT_ASSERT(0 != fault);
+ CPPUNIT_ASSERT(0 != _data);
CPPUNIT_ASSERT(0 != _quadrature);
try {
meshio::MeshIOAscii iohandler;
iohandler.filename(_data->meshFilename);
iohandler.read(mesh);
- CPPUNIT_ASSERT(!mesh->isNull());
//(*mesh)->setDebug(true); // DEBUGGING
spatialdata::geocoords::CSCart cs;
- cs.setSpaceDim((*mesh)->getDimension());
+ cs.setSpaceDim(mesh->dimension());
cs.initialize();
- _quadrature->initialize(_data->basis, _data->basisDeriv, _data->quadPts,
- _data->quadWts, _data->cellDim, _data->numBasis,
- _data->numQuadPts, _data->spaceDim);
+ _quadrature->initialize(_data->basis, _data->numQuadPts, _data->numBasis,
+ _data->basisDeriv,
+ _data->numQuadPts, _data->numBasis, _data->cellDim,
+ _data->quadPts, _data->numQuadPts, _data->cellDim,
+ _data->quadWts, _data->numQuadPts,
+ _data->spaceDim);
// Setup earthquake source
spatialdata::spatialdb::SimpleDB dbFinalSlip("final slip");
@@ -887,10 +917,10 @@
ioSlipTime.filename(_data->slipTimeFilename);
dbSlipTime.ioHandler(&ioSlipTime);
- spatialdata::spatialdb::SimpleDB dbPeakRate("peak rate");
- spatialdata::spatialdb::SimpleIOAscii ioPeakRate;
- ioPeakRate.filename(_data->peakRateFilename);
- dbPeakRate.ioHandler(&ioPeakRate);
+ spatialdata::spatialdb::SimpleDB dbRiseTime("rise time");
+ spatialdata::spatialdb::SimpleIOAscii ioRiseTime;
+ ioRiseTime.filename(_data->riseTimeFilename);
+ dbRiseTime.ioHandler(&ioRiseTime);
const int nsrcs = _eqsrcs.size();
CPPUNIT_ASSERT(nsrcs == _slipfns.size());
@@ -899,7 +929,7 @@
for (int i=0; i < nsrcs; ++i) {
_slipfns[i]->dbFinalSlip(&dbFinalSlip);
_slipfns[i]->dbSlipTime(&dbSlipTime);
- _slipfns[i]->dbPeakRate(&dbPeakRate);
+ _slipfns[i]->dbRiseTime(&dbRiseTime);
_eqsrcs[i]->slipfn(_slipfns[i]);
sources[i] = _eqsrcs[i];
@@ -913,20 +943,17 @@
fault->quadrature(_quadrature);
fault->eqsrcs(const_cast<const char**>(names), sources, nsrcs);
- fault->adjustTopology(*mesh, _flipFault);
+ fault->adjustTopology(mesh, _flipFault);
- const double upDirVals[] = { 0.0, 0.0, 1.0 };
- double_array upDir(upDirVals, 3);
+ const double upDir[] = { 0.0, 0.0, 1.0 };
+ const double normalDir[] = { 1.0, 0.0, 0.0 };
- const double normalDirVals[] = { 1.0, 0.0, 0.0 };
- double_array normalDir(normalDirVals, 3);
-
spatialdata::spatialdb::SimpleDB dbMatProp("material properties");
spatialdata::spatialdb::SimpleIOAscii ioMatProp;
ioMatProp.filename(_data->matPropsFilename);
dbMatProp.ioHandler(&ioMatProp);
- fault->initialize(*mesh, &cs, upDir, normalDir, &dbMatProp);
+ fault->initialize(*mesh, upDir, normalDir, &dbMatProp);
delete[] sources; sources = 0;
for (int i=0; i < nsrcs; ++i)
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -23,7 +23,9 @@
#include <cppunit/extensions/HelperMacros.h>
-#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
+#include "pylith/faults/faultsfwd.hh" // forward declarations
+#include "pylith/topology/topologyfwd.hh" // USES Mesh, SubMesh
+#include "pylith/feassemble/feassemblefwd.hh" // HOLDSA Quadrature
#include <vector> // HASA std::vector
@@ -32,15 +34,8 @@
namespace faults {
class TestFaultCohesiveKin;
- class FaultCohesiveKin; // USES FaultCohesiveKin
- class CohesiveKinData; // HOLDSA CohesiveKinData
- class EqKinSrc; // HOLDSA EqKinSrc
- class BruneSlipFn; // HOLDSA BruneSlipFn
+ class CohesiveKinData;
} // faults
-
- namespace feassemble {
- class Quadrature; // HOLDSA Quadrature
- } // feassemble
} // pylith
/// C++ unit testing for FaultCohesiveKin
@@ -62,7 +57,7 @@
protected :
CohesiveKinData* _data; ///< Data for testing
- feassemble::Quadrature* _quadrature; ///< Data used in testing
+ feassemble::Quadrature<topology::SubMesh>* _quadrature; ///< Fault quad.
std::vector<EqKinSrc*> _eqsrcs; ///< Array of Kinematic earthquake sources.
std::vector<BruneSlipFn*> _slipfns; ///< Slip time function.
bool _flipFault; ///< If true, flip fault orientation.
@@ -120,7 +115,7 @@
* @param mesh PETSc mesh to initialize
* @param fault Cohesive fault interface condition to initialize.
*/
- void _initialize(ALE::Obj<Mesh>* mesh,
+ void _initialize(topology::Mesh* mesh,
FaultCohesiveKin* const fault) const;
/** Determine if vertex is a Lagrange multiplier constraint vertex.
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinData.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinData.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinData.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -29,7 +29,7 @@
label(0),
finalSlipFilename(0),
slipTimeFilename(0),
- peakRateFilename(0),
+ riseTimeFilename(0),
matPropsFilename(0),
fieldT(0),
orientation(0),
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinData.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinData.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinData.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -55,7 +55,7 @@
char* label; ///< Label for fault
char* finalSlipFilename; ///< Name of db for final slip
char* slipTimeFilename; ///< Name of db for slip time
- char* peakRateFilename; ///< Name of db for peak rate
+ char* riseTimeFilename; ///< Name of db for rise time
char* matPropsFilename; ///< Name of db for bulk material properties
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -98,8 +98,8 @@
const char* pylith::faults::CohesiveKinDataHex8::_slipTimeFilename =
"data/hex8_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataHex8::_peakRateFilename =
- "data/hex8_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataHex8::_riseTimeFilename =
+ "data/hex8_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataHex8::_matPropsFilename =
"data/bulkprops_3d.spatialdb";
@@ -1415,7 +1415,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataHex8.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataHex8.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataHex8.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataLine2.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataLine2.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -63,8 +63,8 @@
const char* pylith::faults::CohesiveKinDataLine2::_slipTimeFilename =
"data/line2_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataLine2::_peakRateFilename =
- "data/line2_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataLine2::_riseTimeFilename =
+ "data/line2_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataLine2::_matPropsFilename =
"data/bulkprops_1d.spatialdb";
@@ -138,7 +138,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataLine2.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataLine2.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -86,8 +86,8 @@
const char* pylith::faults::CohesiveKinDataQuad4::_slipTimeFilename =
"data/quad4_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataQuad4::_peakRateFilename =
- "data/quad4_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataQuad4::_riseTimeFilename =
+ "data/quad4_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataQuad4::_matPropsFilename =
"data/bulkprops_2d.spatialdb";
@@ -372,7 +372,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -105,8 +105,8 @@
const char* pylith::faults::CohesiveKinDataQuad4e::_slipTimeFilename =
"data/quad4e_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataQuad4e::_peakRateFilename =
- "data/quad4e_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataQuad4e::_riseTimeFilename =
+ "data/quad4e_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataQuad4e::_matPropsFilename =
"data/bulkprops_2d.spatialdb";
@@ -659,7 +659,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -74,8 +74,8 @@
const char* pylith::faults::CohesiveKinDataTet4::_slipTimeFilename =
"data/tet4_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataTet4::_peakRateFilename =
- "data/tet4_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataTet4::_riseTimeFilename =
+ "data/tet4_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataTet4::_matPropsFilename =
"data/bulkprops_3d.spatialdb";
@@ -528,7 +528,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -74,8 +74,8 @@
const char* pylith::faults::CohesiveKinDataTet4e::_slipTimeFilename =
"data/tet4e_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataTet4e::_peakRateFilename =
- "data/tet4e_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataTet4e::_riseTimeFilename =
+ "data/tet4e_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataTet4e::_matPropsFilename =
"data/bulkprops_3d.spatialdb";
@@ -764,7 +764,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -74,8 +74,8 @@
const char* pylith::faults::CohesiveKinDataTet4f::_slipTimeFilename =
"data/tet4_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataTet4f::_peakRateFilename =
- "data/tet4_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataTet4f::_riseTimeFilename =
+ "data/tet4_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataTet4f::_matPropsFilename =
"data/bulkprops_3d.spatialdb";
@@ -528,7 +528,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -89,8 +89,8 @@
const char* pylith::faults::CohesiveKinDataTri3::_slipTimeFilename =
"data/tri3_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataTri3::_peakRateFilename =
- "data/tri3_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataTri3::_riseTimeFilename =
+ "data/tri3_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataTri3::_matPropsFilename =
"data/bulkprops_2d.spatialdb";
@@ -299,7 +299,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -104,8 +104,8 @@
const char* pylith::faults::CohesiveKinDataTri3d::_slipTimeFilename =
"data/tri3d_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataTri3d::_peakRateFilename =
- "data/tri3d_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinDataTri3d::_riseTimeFilename =
+ "data/tri3d_risetime.spatialdb";
const char* pylith::faults::CohesiveKinDataTri3d::_matPropsFilename =
"data/bulkprops_2d.spatialdb";
@@ -487,7 +487,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -98,8 +98,8 @@
const char* pylith::faults::CohesiveKinSrcsDataHex8::_slipTimeFilename =
"data/hex8_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinSrcsDataHex8::_peakRateFilename =
- "data/hex8_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinSrcsDataHex8::_riseTimeFilename =
+ "data/hex8_risetime.spatialdb";
const char* pylith::faults::CohesiveKinSrcsDataHex8::_matPropsFilename =
"data/bulkprops_3d.spatialdb";
@@ -1415,7 +1415,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -63,8 +63,8 @@
const char* pylith::faults::CohesiveKinSrcsDataLine2::_slipTimeFilename =
"data/line2_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinSrcsDataLine2::_peakRateFilename =
- "data/line2_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinSrcsDataLine2::_riseTimeFilename =
+ "data/line2_risetime.spatialdb";
const char* pylith::faults::CohesiveKinSrcsDataLine2::_matPropsFilename =
"data/bulkprops_1d.spatialdb";
@@ -138,7 +138,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -86,8 +86,8 @@
const char* pylith::faults::CohesiveKinSrcsDataQuad4::_slipTimeFilename =
"data/quad4_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinSrcsDataQuad4::_peakRateFilename =
- "data/quad4_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinSrcsDataQuad4::_riseTimeFilename =
+ "data/quad4_risetime.spatialdb";
const char* pylith::faults::CohesiveKinSrcsDataQuad4::_matPropsFilename =
"data/bulkprops_2d.spatialdb";
@@ -372,7 +372,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -74,8 +74,8 @@
const char* pylith::faults::CohesiveKinSrcsDataTet4::_slipTimeFilename =
"data/tet4_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinSrcsDataTet4::_peakRateFilename =
- "data/tet4_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinSrcsDataTet4::_riseTimeFilename =
+ "data/tet4_risetime.spatialdb";
const char* pylith::faults::CohesiveKinSrcsDataTet4::_matPropsFilename =
"data/bulkprops_3d.spatialdb";
@@ -528,7 +528,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2009-04-26 18:39:11 UTC (rev 14791)
@@ -100,8 +100,8 @@
const char* pylith::faults::CohesiveKinSrcsDataTri3::_slipTimeFilename =
"data/tri3_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinSrcsDataTri3::_peakRateFilename =
- "data/tri3_peakrate.spatialdb";
+const char* pylith::faults::CohesiveKinSrcsDataTri3::_riseTimeFilename =
+ "data/tri3_risetime.spatialdb";
const char* pylith::faults::CohesiveKinSrcsDataTri3::_matPropsFilename =
"data/bulkprops_2d.spatialdb";
@@ -310,7 +310,7 @@
label = const_cast<char*>(_label);
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
- peakRateFilename = const_cast<char*>(_peakRateFilename);
+ riseTimeFilename = const_cast<char*>(_riseTimeFilename);
matPropsFilename = const_cast<char*>(_matPropsFilename);
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh 2009-04-24 18:37:49 UTC (rev 14790)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh 2009-04-26 18:39:11 UTC (rev 14791)
@@ -53,7 +53,7 @@
static const char* _label; ///< Label for fault
static const char* _finalSlipFilename; ///< Name of db for final slip
static const char* _slipTimeFilename; ///< Name of db for slip time
- static const char* _peakRateFilename; ///< Name of db for peak rate
+ static const char* _riseTimeFilename; ///< Name of db for rise time
static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
//@}
More information about the CIG-COMMITS
mailing list