[cig-commits] r16802 - in short/3D/PyLith/trunk: libsrc/faults libsrc/feassemble libsrc/problems modulesrc/faults modulesrc/feassemble pylith/feassemble unittests/libtests/faults
brad at geodynamics.org
brad at geodynamics.org
Wed May 26 21:40:27 PDT 2010
Author: brad
Date: 2010-05-26 21:40:27 -0700 (Wed, 26 May 2010)
New Revision: 16802
Modified:
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
short/3D/PyLith/trunk/libsrc/feassemble/Integrator.hh
short/3D/PyLith/trunk/libsrc/feassemble/Integrator.icc
short/3D/PyLith/trunk/libsrc/problems/Formulation.cc
short/3D/PyLith/trunk/modulesrc/faults/FaultCohesiveKin.i
short/3D/PyLith/trunk/modulesrc/feassemble/Integrator.i
short/3D/PyLith/trunk/pylith/feassemble/Integrator.py
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinHex8.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3.hh
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh
Log:
Clean of integrators. Eliminated integrate*Assembled() routines. Use globalOrder->isLocal() rather than assembly weight.
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2010-05-27 04:40:27 UTC (rev 16802)
@@ -172,9 +172,12 @@
const ALE::Obj<RealSection>& slipSection = _fields->get("slip").section();
assert(!slipSection.isNull());
- const ALE::Obj<RealSection>& assemblyWtSection =
- _fields->get("assembly weight").section();
- assert(!assemblyWtSection.isNull());
+ const ALE::Obj<SieveMesh>& sieveMesh = fields->mesh().sieveMesh();
+ assert(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::order_type>& globalOrder =
+ sieveMesh->getFactory()->getGlobalOrder(sieveMesh, "default",
+ residualSection);
+ assert(!globalOrder.isNull());
const int numVertices = _cohesiveVertices.size();
for (int iVertex=0; iVertex < numVertices; ++iVertex) {
@@ -183,6 +186,10 @@
const int v_negative = _cohesiveVertices[iVertex].negative;
const int v_positive = _cohesiveVertices[iVertex].positive;
+ // Compute contribution only if Lagrange constraint is local.
+ if (!globalOrder->isLocal(v_lagrange))
+ continue;
+
// Get initial forces at fault vertex. Forces are in the global
// coordinate system so no rotation is necessary.
forcesInitialSection->restrictPoint(v_fault,
@@ -193,19 +200,10 @@
const double* slipVertex = slipSection->restrictPoint(v_fault);
assert(0 != slipVertex);
- // Get assembly weight for fault vertex.
- assert(1 == assemblyWtSection->getFiberDimension(v_fault));
- const double* assemblyWtVertex =
- assemblyWtSection->restrictPoint(v_fault);
- assert(0 != assemblyWtVertex);
-
// only apply initial tractions if there is no opening
if (0.0 == slipVertex[spaceDim-1]) {
residualVertex = forcesInitialVertex;
- // Avoid double sum across processors
- residualVertex *= *assemblyWtVertex;
-
assert(residualVertex.size() ==
residualSection->getFiberDimension(v_positive));
residualSection->updateAddPoint(v_positive, &residualVertex[0]);
@@ -668,10 +666,6 @@
const ALE::Obj<RealSection>& areaSection = _fields->get("area").section();
assert(!areaSection.isNull());
- const ALE::Obj<RealSection>& assemblyWtSection =
- _fields->get("assembly weight").section();
- assert(!assemblyWtSection.isNull());
-
double_array orientationVertex(orientationSize);
const ALE::Obj<RealSection>& orientationSection =
_fields->get("orientation").section();
@@ -704,6 +698,13 @@
const ALE::Obj<RealSection>& residualSection =
fields->get("residual").section();
+ const ALE::Obj<SieveMesh>& sieveMesh = fields->mesh().sieveMesh();
+ assert(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::order_type>& globalOrder =
+ sieveMesh->getFactory()->getGlobalOrder(sieveMesh, "default",
+ jacobianSection);
+ assert(!globalOrder.isNull());
+
adjustSolnLumped_fn_type adjustSolnLumpedFn;
constrainSolnSpace_fn_type constrainSolnSpaceFn;
sensitivitySolveLumped_fn_type sensitivitySolveLumpedFn;
@@ -751,6 +752,10 @@
const int v_negative = _cohesiveVertices[iVertex].negative;
const int v_positive = _cohesiveVertices[iVertex].positive;
+ // Compute contribution only if Lagrange constraint is local.
+ if (!globalOrder->isLocal(v_lagrange))
+ continue;
+
#if defined(DETAILED_EVENT_LOGGING)
_logger->eventBegin(restrictEvent);
#endif
@@ -767,12 +772,6 @@
assert(0 != areaVertex);
assert(1 == areaSection->getFiberDimension(v_fault));
- // Get assembly weight for fault vertex.
- assert(1 == assemblyWtSection->getFiberDimension(v_fault));
- const double* assemblyWtVertex =
- assemblyWtSection->restrictPoint(v_fault);
- assert(0 != assemblyWtVertex);
-
// Get fault orientation
orientationSection->restrictPoint(v_fault, &orientationVertex[0],
orientationVertex.size());
@@ -949,11 +948,6 @@
_logger->eventBegin(updateEvent);
#endif
- // Avoid double sum across processors
- dispTIncrVertexN *= *assemblyWtVertex;
- dispTIncrVertexP *= *assemblyWtVertex;
- lagrangeTIncrVertex *= *assemblyWtVertex;
-
// Adjust displacements to account for Lagrange multiplier values
// (assumed to be zero in perliminary solve).
assert(dispTIncrVertexN.size() ==
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc 2010-05-27 04:40:27 UTC (rev 16802)
@@ -159,8 +159,7 @@
} // splitField
// ----------------------------------------------------------------------
-// Integrate contribution of cohesive cells to residual term that do
-// not require assembly across cells, vertices, or processors.
+// Integrate contribution of cohesive cells to residual term.
void
pylith::faults::FaultCohesiveLagrange::integrateResidual(
const topology::Field<topology::Mesh>& residual,
@@ -212,10 +211,6 @@
const ALE::Obj<RealSection>& slipSection = slip.section();
assert(!slipSection.isNull());
- const ALE::Obj<RealSection>& assemblyWtSection =
- _fields->get("assembly weight").section();
- assert(!assemblyWtSection.isNull());
-
const ALE::Obj<RealSection>& residualSection = residual.section();
assert(!residualSection.isNull());
@@ -231,6 +226,12 @@
const ALE::Obj<RealSection>& dispTIncrSection = dispTIncr.section();
assert(!dispTIncrSection.isNull());
+ const ALE::Obj<SieveMesh>& sieveMesh = fields->mesh().sieveMesh();
+ assert(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::order_type>& globalOrder =
+ sieveMesh->getFactory()->getGlobalOrder(sieveMesh, "default", residualSection);
+ assert(!globalOrder.isNull());
+
_logger->eventEnd(setupEvent);
#if !defined(DETAILED_EVENT_LOGGING)
_logger->eventBegin(computeEvent);
@@ -243,6 +244,10 @@
const int v_negative = _cohesiveVertices[iVertex].negative;
const int v_positive = _cohesiveVertices[iVertex].positive;
+ // Compute contribution only if Lagrange constraint is local.
+ if (!globalOrder->isLocal(v_lagrange))
+ continue;
+
#if defined(DETAILED_EVENT_LOGGING)
_logger->eventBegin(restrictEvent);
#endif
@@ -250,12 +255,6 @@
// Get slip at fault vertex.
slipSection->restrictPoint(v_fault, &slipVertex[0], slipVertex.size());
- // Get assembly weight for fault vertex.
- assert(1 == assemblyWtSection->getFiberDimension(v_fault));
- const double* assemblyWtVertex =
- assemblyWtSection->restrictPoint(v_fault);
- assert(0 != assemblyWtVertex);
-
// Get orientations at fault vertex.
orientationSection->restrictPoint(v_fault, &orientationVertex[0],
orientationVertex.size());
@@ -310,12 +309,6 @@
_logger->eventBegin(updateEvent);
#endif
- // Weight assembly contributions to avoid double counting across
- // processors
- residualVertexN *= *assemblyWtVertex;
- residualVertexP *= *assemblyWtVertex;
- residualVertexL *= *assemblyWtVertex;
-
assert(residualVertexN.size() ==
residualSection->getFiberDimension(v_negative));
residualSection->updateAddPoint(v_negative, &residualVertexN[0]);
@@ -340,8 +333,7 @@
} // integrateResidual
// ----------------------------------------------------------------------
-// Compute Jacobian matrix (A) associated with operator that do not
-// require assembly across cells, vertices, or processors.
+// Compute Jacobian matrix (A) associated with operator.
void
pylith::faults::FaultCohesiveLagrange::integrateJacobian(
topology::Jacobian* jacobian,
@@ -383,10 +375,6 @@
const ALE::Obj<RealSection>& solutionSection = fields->solution().section();
assert(!solutionSection.isNull());
- const ALE::Obj<RealSection>& assemblyWtSection =
- _fields->get("assembly weight").section();
- assert(!assemblyWtSection.isNull());
-
const ALE::Obj<RealSection>& orientationSection =
_fields->get("orientation").section();
assert(!orientationSection.isNull());
@@ -413,6 +401,10 @@
const int v_negative = _cohesiveVertices[iVertex].negative;
const int v_positive = _cohesiveVertices[iVertex].positive;
+ // Compute contribution only if Lagrange constraint is local.
+ if (!globalOrder->isLocal(v_lagrange))
+ continue;
+
#if defined(DETAILED_EVENT_LOGGING)
_logger->eventBegin(restrictEvent);
#endif
@@ -420,12 +412,6 @@
// Get orientations at fault cell's vertices.
orientationSection->restrictPoint(v_fault, &orientationVertex[0], orientationVertex.size());
- // Get assembly weight for fault vertex.
- assert(1 == assemblyWtSection->getFiberDimension(v_fault));
- const double* assemblyWtVertex =
- assemblyWtSection->restrictPoint(v_fault);
- assert(0 != assemblyWtVertex);
-
// Set global order indices
indicesL = indicesRel + globalOrder->getIndex(v_lagrange);
indicesN = indicesRel + globalOrder->getIndex(v_negative);
@@ -439,7 +425,6 @@
// Values associated with [C]
// Values at positive vertex, entry L,P in Jacobian
jacobianVertex = orientationVertex;
- jacobianVertex *= *assemblyWtVertex; // avoid double sum across processors
MatSetValues(jacobianMatrix,
indicesL.size(), &indicesL[0],
indicesP.size(), &indicesP[0],
@@ -462,8 +447,6 @@
jacobianVertex[iDim*spaceDim+jDim] =
orientationVertex[jDim*spaceDim+iDim];
- jacobianVertex *= *assemblyWtVertex; // avoid double sum across processors
-
// Values at positive vertex, entry P,L in Jacobian
MatSetValues(jacobianMatrix,
indicesP.size(), &indicesP[0],
@@ -503,8 +486,7 @@
} // integrateJacobian
// ----------------------------------------------------------------------
-// Compute Jacobian matrix (A) associated with operator that do not
-// require assembly across processors.
+// Compute Jacobian matrix (A) associated with operator.
void
pylith::faults::FaultCohesiveLagrange::integrateJacobian(
topology::Field<topology::Mesh>* jacobian,
@@ -535,6 +517,12 @@
const ALE::Obj<RealSection>& jacobianSection = jacobian->section();
assert(!jacobianSection.isNull());
+ const ALE::Obj<SieveMesh>& sieveMesh = fields->mesh().sieveMesh();
+ assert(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::order_type>& globalOrder =
+ sieveMesh->getFactory()->getGlobalOrder(sieveMesh, "default", jacobianSection);
+ assert(!globalOrder.isNull());
+
_logger->eventEnd(setupEvent);
#if !defined(DETAILED_EVENT_LOGGING)
_logger->eventBegin(computeEvent);
@@ -544,6 +532,10 @@
for (int iVertex=0; iVertex < numVertices; ++iVertex) {
const int v_lagrange = _cohesiveVertices[iVertex].lagrange;
+ // Compute contribution only if Lagrange constraint is local.
+ if (!globalOrder->isLocal(v_lagrange))
+ continue;
+
assert(jacobianSection->getFiberDimension(v_lagrange) == spaceDim);
#if defined(DETAILED_EVENT_LOGGING)
@@ -1062,10 +1054,6 @@
const ALE::Obj<RealSection>& slipSection = _fields->get("slip").section();
assert(!slipSection.isNull());
- const ALE::Obj<RealSection>& assemblyWtSection =
- _fields->get("assembly weight").section();
- assert(!assemblyWtSection.isNull());
-
double_array jacobianVertexN(spaceDim);
double_array jacobianVertexP(spaceDim);
const ALE::Obj<RealSection>& jacobianSection = jacobian.section();
@@ -1093,6 +1081,12 @@
"dispIncr adjust").section();
assert(!dispTIncrAdjSection.isNull());
+ const ALE::Obj<SieveMesh>& sieveMesh = fields->mesh().sieveMesh();
+ assert(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::order_type>& globalOrder =
+ sieveMesh->getFactory()->getGlobalOrder(sieveMesh, "default", jacobianSection);
+ assert(!globalOrder.isNull());
+
adjustSolnLumped_fn_type adjustSolnLumpedFn;
switch (spaceDim) { // switch
case 1:
@@ -1126,6 +1120,10 @@
const int v_negative = _cohesiveVertices[iVertex].negative;
const int v_positive = _cohesiveVertices[iVertex].positive;
+ // Compute contribution only if Lagrange constraint is local.
+ if (!globalOrder->isLocal(v_lagrange))
+ continue;
+
#if defined(DETAILED_EVENT_LOGGING)
_logger->eventBegin(restrictEvent);
#endif
@@ -1137,12 +1135,6 @@
// Get slip at fault cell's vertices.
slipSection->restrictPoint(v_fault, &slipVertex[0], slipVertex.size());
- // Get assembly weight for fault vertex.
- assert(1 == assemblyWtSection->getFiberDimension(v_fault));
- const double* assemblyWtVertex =
- assemblyWtSection->restrictPoint(v_fault);
- assert(0 != assemblyWtVertex);
-
// Get residual at cohesive cell's vertices.
residualSection->restrictPoint(v_negative, &residualVertexN[0],
residualVertexN.size());
@@ -1179,11 +1171,6 @@
_logger->eventBegin(updateEvent);
#endif
- // Avoid double sum across processors
- dispTIncrVertexN *= *assemblyWtVertex;
- dispTIncrVertexP *= *assemblyWtVertex;
- lagrangeTIncrVertex *= *assemblyWtVertex;
-
// Adjust displacements to account for Lagrange multiplier values
// (assumed to be zero in preliminary solve).
assert(dispTIncrVertexN.size() ==
@@ -1646,14 +1633,6 @@
assert(!areaSection.isNull());
topology::Mesh::UpdateAddVisitor areaVisitor(*areaSection, &areaCell[0]);
- // Allocate assembly weight fild
- _fields->add("assembly weight", "assembly_weight");
- topology::Field<topology::SubMesh>& assemblyWt =
- _fields->get("assembly weight");
- assemblyWt.cloneSection(area);
- const ALE::Obj<RealSection>& assemblyWtSection = assemblyWt.section();
- assert(!assemblyWtSection.isNull());
-
double_array coordinatesCell(numBasis * spaceDim);
const ALE::Obj<RealSection>& coordinates = faultSieveMesh->getRealSection(
"coordinates");
@@ -1698,32 +1677,10 @@
PetscLogFlops( numQuadPts*(1+numBasis*2) );
} // for
- // Use area / areaTotal as assembly weight
- // Copy area to assembly weight.
- assemblyWt.copy(area);
// Assemble area information
area.complete();
- // Compute assembly weight as area / areaTotal;
- const int numVertices = _cohesiveVertices.size();
- for (int iVertex=0; iVertex < numVertices; ++iVertex) {
- const int v_fault = _cohesiveVertices[iVertex].fault;
-
- assert(1 == assemblyWtSection->getFiberDimension(v_fault));
- const double* areaLocal = assemblyWtSection->restrictPoint(v_fault);
- assert(0 != areaLocal);
-
- assert(1 == areaSection->getFiberDimension(v_fault));
- const double* areaTotal = areaSection->restrictPoint(v_fault);
- assert(0 != areaTotal);
-
- const double wt = (*areaLocal) / (*areaTotal);
-
- assert(1 == assemblyWtSection->getFiberDimension(v_fault));
- assemblyWtSection->updatePoint(v_fault, &wt);
- } // for
-
#if 0 // DEBUGGING
area.view("AREA");
//_faultMesh->getSendOverlap()->view("Send fault overlap");
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Integrator.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Integrator.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Integrator.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -149,18 +149,6 @@
const double t,
topology::SolutionFields* const fields);
- /** Integrate contributions to residual term (r) for operator that
- * do not require assembly over cells, vertices, or processors.
- *
- * @param residual Field containing values for residual
- * @param t Current time
- * @param fields Solution fields
- */
- virtual
- void integrateResidualAssembled(const topology::Field<topology::Mesh>& residual,
- const double t,
- topology::SolutionFields* const fields);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
@@ -172,18 +160,6 @@
const double t,
topology::SolutionFields* const fields);
- /** Integrate contributions to residual term (r) for operator that
- * do not require assembly over cells, vertices, or processors.
- *
- * @param residual Field containing values for residual
- * @param t Current time
- * @param fields Solution fields
- */
- virtual
- void integrateResidualLumpedAssembled(const topology::Field<topology::Mesh>& residual,
- const double t,
- topology::SolutionFields* const fields);
-
/** Integrate contributions to Jacobian matrix (A) associated with
* operator.
*
@@ -197,19 +173,6 @@
topology::SolutionFields* const fields);
/** Integrate contributions to Jacobian matrix (A) associated with
- * operator that do not require assembly over cells, vertices, or
- * processors
- *
- * @param jacobian Sparse matrix for Jacobian of system.
- * @param t Current time
- * @param fields Solution fields
- */
- virtual
- void integrateJacobianAssembled(topology::Jacobian* jacobian,
- const double t,
- topology::SolutionFields* const fields);
-
- /** Integrate contributions to Jacobian matrix (A) associated with
* operator.
*
* @param jacobian Diagonal matrix (as field) for Jacobian of system.
@@ -222,19 +185,6 @@
topology::SolutionFields* const fields);
/** Integrate contributions to Jacobian matrix (A) associated with
- * operator that do not require assembly over cells, vertices, or
- * processors
- *
- * @param jacobian Diagonal matrix (as field) for Jacobian of system.
- * @param t Current time
- * @param fields Solution fields
- */
- virtual
- void integrateJacobianAssembled(topology::Field<topology::Mesh>* jacobian,
- const double t,
- topology::SolutionFields* const fields);
-
- /** Integrate contributions to Jacobian matrix (A) associated with
* operator.
*
* @param precondMatrix Custom preconditioning matrix.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Integrator.icc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Integrator.icc 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Integrator.icc 2010-05-27 04:40:27 UTC (rev 16802)
@@ -70,17 +70,6 @@
topology::SolutionFields* const fields) {
} // integrateResidual
-// Integrate contributions to residual term (r) for operator that
-// do not require assembly over cells, vertices, or processors.
-template<typename quadrature_type>
-inline
-void
-pylith::feassemble::Integrator<quadrature_type>::integrateResidualAssembled(
- const topology::Field<topology::Mesh>& residual,
- const double t,
- topology::SolutionFields* const fields) {
-} // integrateResidualAssembled
-
// Integrate contributions to residual term (r) for operator.
template<typename quadrature_type>
inline
@@ -92,18 +81,6 @@
integrateResidual(residual, t, fields);
} // integrateResidual
-// Integrate contributions to residual term (r) for operator that
-// do not require assembly over cells, vertices, or processors.
-template<typename quadrature_type>
-inline
-void
-pylith::feassemble::Integrator<quadrature_type>::integrateResidualLumpedAssembled(
- const topology::Field<topology::Mesh>& residual,
- const double t,
- topology::SolutionFields* const fields) {
- integrateResidualAssembled(residual, t, fields);
-} // integrateResidualAssembled
-
// Integrate contributions to Jacobian matrix (A) associated with
// operator.
template<typename quadrature_type>
@@ -117,19 +94,6 @@
} // integrateJacobian
// Integrate contributions to Jacobian matrix (A) associated with
-// operator that do not require assembly over cells, vertices, or
-// processors
-template<typename quadrature_type>
-inline
-void
-pylith::feassemble::Integrator<quadrature_type>::integrateJacobianAssembled(
- topology::Jacobian* jacobian,
- const double t,
- topology::SolutionFields* const fields) {
- _needNewJacobian = false;
-} // integrateJacobianAssembled
-
-// Integrate contributions to Jacobian matrix (A) associated with
// operator.
template<typename quadrature_type>
inline
@@ -142,18 +106,6 @@
} // integrateJacobian
// Integrate contributions to Jacobian matrix (A) associated with
-// operator that do not require assembly over cells, vertices, or
-// processors
-template<typename quadrature_type>
-inline
-void
-pylith::feassemble::Integrator<quadrature_type>::integrateJacobianAssembled(
- topology::Field<topology::Mesh>* jacobian,
- const double t,
- topology::SolutionFields* const fields) {
-} // integrateJacobianAssembled
-
-// Integrate contributions to Jacobian matrix (A) associated with
// operator.
template<typename quadrature_type>
inline
Modified: short/3D/PyLith/trunk/libsrc/problems/Formulation.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/problems/Formulation.cc 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/libsrc/problems/Formulation.cc 2010-05-27 04:40:27 UTC (rev 16802)
@@ -252,14 +252,6 @@
// Assemble residual.
residual.complete();
- // Add in contributions that do not require assembly.
- numIntegrators = _meshIntegrators.size();
- for (int i=0; i < numIntegrators; ++i)
- _meshIntegrators[i]->integrateResidualAssembled(residual, _t, _fields);
- numIntegrators = _submeshIntegrators.size();
- for (int i=0; i < numIntegrators; ++i)
- _submeshIntegrators[i]->integrateResidualAssembled(residual, _t, _fields);
-
// Update PETSc view of residual
if (0 != tmpResidualVec)
residual.scatterSectionToVector(*tmpResidualVec);
@@ -308,14 +300,6 @@
// Assemble residual.
residual.complete();
- // Add in contributions that do not require assembly.
- numIntegrators = _meshIntegrators.size();
- for (int i=0; i < numIntegrators; ++i)
- _meshIntegrators[i]->integrateResidualLumpedAssembled(residual, _t, _fields);
- numIntegrators = _submeshIntegrators.size();
- for (int i=0; i < numIntegrators; ++i)
- _submeshIntegrators[i]->integrateResidualLumpedAssembled(residual, _t, _fields);
-
// Update PETSc view of residual
if (0 != tmpResidualVec)
residual.scatterSectionToVector(*tmpResidualVec);
@@ -344,20 +328,9 @@
// Set jacobian to zero.
_jacobian->zero();
- // Add in contributions that do not require assembly.
+ // Add in contributions that require assembly.
int numIntegrators = _meshIntegrators.size();
for (int i=0; i < numIntegrators; ++i)
- _meshIntegrators[i]->integrateJacobianAssembled(_jacobian, _t, _fields);
- numIntegrators = _submeshIntegrators.size();
- for (int i=0; i < numIntegrators; ++i)
- _submeshIntegrators[i]->integrateJacobianAssembled(_jacobian, _t, _fields);
-
- // Flush assembled portion.
- _jacobian->assemble("flush_assembly");
-
- // Add in contributions that require assembly.
- numIntegrators = _meshIntegrators.size();
- for (int i=0; i < numIntegrators; ++i)
_meshIntegrators[i]->integrateJacobian(_jacobian, _t, _fields);
numIntegrators = _submeshIntegrators.size();
for (int i=0; i < numIntegrators; ++i)
@@ -407,16 +380,6 @@
// Assemble jacbian.
_jacobianLumped->complete();
- // Add in contributions that do not require assembly.
- numIntegrators = _meshIntegrators.size();
- for (int i=0; i < numIntegrators; ++i)
- _meshIntegrators[i]->integrateJacobianAssembled(_jacobianLumped,
- _t, _fields);
- numIntegrators = _submeshIntegrators.size();
- for (int i=0; i < numIntegrators; ++i)
- _submeshIntegrators[i]->integrateJacobianAssembled(_jacobianLumped,
- _t, _fields);
-
} // reformJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/modulesrc/faults/FaultCohesiveKin.i
===================================================================
--- short/3D/PyLith/trunk/modulesrc/faults/FaultCohesiveKin.i 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/modulesrc/faults/FaultCohesiveKin.i 2010-05-27 04:40:27 UTC (rev 16802)
@@ -74,9 +74,9 @@
* @param t Current time
* @param fields Solution fields
*/
- void integrateResidualAssembled(const pylith::topology::Field<pylith::topology::Mesh>& residual,
- const double t,
- pylith::topology::SolutionFields* const fields);
+ void integrateResidual(const pylith::topology::Field<pylith::topology::Mesh>& residual,
+ const double t,
+ pylith::topology::SolutionFields* const fields);
/** Get vertex field associated with integrator.
*
Modified: short/3D/PyLith/trunk/modulesrc/feassemble/Integrator.i
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/Integrator.i 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/Integrator.i 2010-05-27 04:40:27 UTC (rev 16802)
@@ -126,18 +126,6 @@
const double t,
pylith::topology::SolutionFields* const fields);
- /** Integrate contributions to residual term (r) for operator that
- * do not require assembly over cells, vertices, or processors.
- *
- * @param residual Field containing values for residual
- * @param t Current time
- * @param fields Solution fields
- */
- virtual
- void integrateResidualAssembled(const pylith::topology::Field<pylith::topology::Mesh>& residual,
- const double t,
- pylith::topology::SolutionFields* const fields);
-
/** Integrate contributions to Jacobian matrix (A) associated with
* operator.
*
@@ -151,19 +139,6 @@
pylith::topology::SolutionFields* const fields);
/** Integrate contributions to Jacobian matrix (A) associated with
- * operator that do not require assembly over cells, vertices, or
- * processors
- *
- * @param jacobian Sparse matrix for Jacobian of system.
- * @param t Current time
- * @param fields Solution fields
- */
- virtual
- void integrateJacobianAssembled(pylith::topology::Jacobian* jacobian,
- const double t,
- pylith::topology::SolutionFields* const fields);
-
- /** Integrate contributions to Jacobian matrix (A) associated with
* operator.
*
* @param jacobian Diagonal matrix (as field) for Jacobian of system.
@@ -175,19 +150,6 @@
const double t,
pylith::topology::SolutionFields* const fields);
- /** Integrate contributions to Jacobian matrix (A) associated with
- * operator that do not require assembly over cells, vertices, or
- * processors
- *
- * @param jacobian Diagonal matrix (as field) for Jacobian of system.
- * @param t Current time
- * @param fields Solution fields
- */
- virtual
- void integrateJacobianAssembled(pylith::topology::Field<pylith::topology::Mesh>* jacobian,
- const double t,
- pylith::topology::SolutionFields* const fields);
-
/** Update state variables as needed.
*
* @param t Current time
Modified: short/3D/PyLith/trunk/pylith/feassemble/Integrator.py
===================================================================
--- short/3D/PyLith/trunk/pylith/feassemble/Integrator.py 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/pylith/feassemble/Integrator.py 2010-05-27 04:40:27 UTC (rev 16802)
@@ -28,8 +28,6 @@
"useSolnIncr",
"integrateResidual",
"integrateJacobian",
- "integrateResidualAssembled",
- "integrateJacobianAssembled",
"preinitialize",
"verifyConfiguration",
"initialize",
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2010-05-27 04:40:27 UTC (rev 16802)
@@ -238,95 +238,6 @@
} // testInitialize
// ----------------------------------------------------------------------
-// Test integrateResidualAssembled().
-void
-pylith::faults::TestFaultCohesiveKin::testIntegrateResidualAssembled(void)
-{ // testIntegrateResidualAssembled
- topology::Mesh mesh;
- FaultCohesiveKin fault;
- topology::SolutionFields fields(mesh);
- _initialize(&mesh, &fault, &fields);
-
- const int spaceDim = _data->spaceDim;
- topology::Field<topology::Mesh>& residual = fields.get("residual");
- const ALE::Obj<RealSection>& residualSection = residual.section();
- CPPUNIT_ASSERT(!residualSection.isNull());
-
- const ALE::Obj<RealSection>& dispSection =
- fields.get("disp(t)").section();
- CPPUNIT_ASSERT(!dispSection.isNull());
-
- 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 SieveMesh::label_sequence::iterator verticesBegin = vertices->begin();
- const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
- int iVertex = 0;
- for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
- v_iter != verticesEnd;
- ++v_iter, ++iVertex)
- dispSection->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
-
- const double t = 2.134;
- const double dt = 0.01;
- fault.timeStep(dt);
- { // Integrate residual with disp (as opposed to disp increment).
- fault.useSolnIncr(false);
- fault.integrateResidualAssembled(residual, t, &fields);
-
- //residual.view("RESIDUAL"); // DEBUGGING
-
- // Check values
- iVertex = 0;
- const int fiberDimE = spaceDim;
- const double tolerance = 1.0e-06;
- for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
- v_iter != verticesEnd;
- ++v_iter, ++iVertex) {
- const int fiberDim = residualSection->getFiberDimension(*v_iter);
- CPPUNIT_ASSERT_EQUAL(fiberDimE, fiberDim);
- const double* vals = residualSection->restrictPoint(*v_iter);
- CPPUNIT_ASSERT(0 != vals);
-
- for (int i=0; i < fiberDimE; ++i) {
- const int index = iVertex*spaceDim+i;
- const double valE = 0.0;
- CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[i], tolerance);
- } // for
- } // for
- } // Integrate residual with disp (as opposed to disp increment).
-
- residual.zero();
- { // Integrate residual with disp increment.
- fault.useSolnIncr(true);
- fault.integrateResidualAssembled(residual, t, &fields);
-
- //residual.view("RESIDUAL"); // DEBUGGING
-
- // Check values
- iVertex = 0;
- const int fiberDimE = spaceDim;
- const double tolerance = 1.0e-06;
- for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
- v_iter != verticesEnd;
- ++v_iter, ++iVertex) {
- const int fiberDim = residualSection->getFiberDimension(*v_iter);
- CPPUNIT_ASSERT_EQUAL(fiberDimE, fiberDim);
- const double* vals = residualSection->restrictPoint(*v_iter);
- CPPUNIT_ASSERT(0 != vals);
-
- for (int i=0; i < fiberDimE; ++i) {
- const int index = iVertex*spaceDim+i;
- const double valE = 0.0;
- CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[i], tolerance);
- } // for
- } // for
- } // Integrate residual with disp increment.
-} // testIntegrateResidualAssembled
-
-// ----------------------------------------------------------------------
// Test integrateResidual().
void
pylith::faults::TestFaultCohesiveKin::testIntegrateResidual(void)
@@ -423,86 +334,6 @@
} // testIntegrateResidual
// ----------------------------------------------------------------------
-// Test integrateJacobianAssembled().
-void
-pylith::faults::TestFaultCohesiveKin::testIntegrateJacobianAssembled(void)
-{ // testIntegrateJacobianAssembled
- topology::Mesh mesh;
- FaultCohesiveKin fault;
- topology::SolutionFields fields(mesh);
- _initialize(&mesh, &fault, &fields);
-
- const ALE::Obj<RealSection>& dispSection = fields.get("disp(t)").section();
- CPPUNIT_ASSERT(!dispSection.isNull());
-
- const int spaceDim = _data->spaceDim;
- 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 SieveMesh::label_sequence::iterator verticesBegin = vertices->begin();
- const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
- int iVertex = 0;
- for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
- v_iter != verticesEnd;
- ++v_iter, ++iVertex) {
- dispSection->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
- } // for
-
- topology::Jacobian jacobian(fields.solution());
-
- const double t = 2.134;
- fault.integrateJacobianAssembled(&jacobian, t, &fields);
- CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
-
- jacobian.assemble("final_assembly");
-
- //MatView(jacobian, PETSC_VIEWER_STDOUT_WORLD); // DEBUGGING
-
- const double* valsE = _data->jacobian;
- const int nrowsE = dispSection->sizeWithBC();
- const int ncolsE = nrowsE;
-
- int nrows = 0;
- int ncols = 0;
- PetscMat jacobianMat = jacobian.matrix();
- MatGetSize(jacobianMat, &nrows, &ncols);
- CPPUNIT_ASSERT_EQUAL(nrowsE, nrows);
- CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
-
- PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
-
- double_array vals(nrows*ncols);
- int_array rows(nrows);
- int_array cols(ncols);
- for (int iRow=0; iRow < nrows; ++iRow)
- rows[iRow] = iRow;
- for (int iCol=0; iCol < ncols; ++iCol)
- cols[iCol] = iCol;
- MatGetValues(jDense, nrows, &rows[0], ncols, &cols[0], &vals[0]);
- const double tolerance = 1.0e-06;
- for (int iRow=0; iRow < nrows; ++iRow)
- for (int iCol=0; iCol < ncols; ++iCol) {
- const int index = ncols*iRow+iCol;
- const double valE = 0.0;
-#if 0 // DEBUGGING
- if (fabs(valE-vals[index]) > tolerance)
- std::cout << "ERROR: iRow: " << iRow << ", iCol: " << iCol
- << "valE: " << valE
- << ", val: " << vals[index]
- << std::endl;
-#endif // DEBUGGING
- CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[index], tolerance);
- } // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
- CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
-} // testIntegrateJacobianAssembled
-
-// ----------------------------------------------------------------------
// Test integrateJacobian().
void
pylith::faults::TestFaultCohesiveKin::testIntegrateJacobian(void)
@@ -691,7 +522,6 @@
topology::Field<topology::Mesh>& residual = fields.get("residual");
fault.integrateResidual(residual, t, &fields);
residual.complete();
- fault.integrateResidualAssembled(residual, t, &fields);
{ // setup disp increment
const ALE::Obj<RealSection>& dispIncrSection = fields.get("dispIncr(t->t+dt)").section();
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -92,16 +92,10 @@
/// Test integrateResidual().
void testIntegrateResidual(void);
- /// Test integrateResidualAssembled().
- void testIntegrateResidualAssembled(void);
-
/// Test integrateJacobian().
void testIntegrateJacobian(void);
- /// Test integrateJacobianAssembled().
- void testIntegrateJacobianAssembled(void);
-
- /// Test integrateJacobianAssembled() with lumped Jacobian.
+ /// Test integrateJacobian() with lumped Jacobian.
void testIntegrateJacobianLumped(void);
/// Test adjustSolnLumped().
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinHex8.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinHex8.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -39,9 +39,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
- CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -39,9 +39,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
- CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -39,9 +39,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
- CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -40,7 +40,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -40,7 +40,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -41,7 +41,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -40,7 +40,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -40,7 +40,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -40,7 +40,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -39,9 +39,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
- CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -40,7 +40,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -40,7 +40,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -39,9 +39,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
- CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh 2010-05-27 03:35:09 UTC (rev 16801)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh 2010-05-27 04:40:27 UTC (rev 16802)
@@ -40,7 +40,6 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testIntegrateJacobianAssembled );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
More information about the CIG-COMMITS
mailing list