[cig-commits] r16791 - in short/3D/PyLith/trunk: libsrc/faults libsrc/feassemble unittests/libtests/faults unittests/libtests/faults/data
brad at geodynamics.org
brad at geodynamics.org
Tue May 25 23:04:40 PDT 2010
Author: brad
Date: 2010-05-25 23:04:39 -0700 (Tue, 25 May 2010)
New Revision: 16791
Modified:
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.hh
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.hh
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.hh
short/3D/PyLith/trunk/libsrc/feassemble/Integrator.icc
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
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py
Log:
Fixed integrateResidual*() and integrateJacobian*() for fault. Need to assemble across processors, but there is no assembly across cells in this implementation. Updated unit tests.
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -140,15 +140,15 @@
// ----------------------------------------------------------------------
// Integrate contributions to residual term (r) for operator.
void
-pylith::faults::FaultCohesiveDyn::integrateResidualAssembled(
+pylith::faults::FaultCohesiveDyn::integrateResidual(
const topology::Field<topology::Mesh>& residual,
const double t,
topology::SolutionFields* const fields)
-{ // integrateResidualAssembled
+{ // integrateResidual
assert(0 != fields);
assert(0 != _fields);
- FaultCohesiveLagrange::integrateResidualAssembled(residual, t, fields);
+ FaultCohesiveLagrange::integrateResidual(residual, t, fields);
// No contribution if no initial tractions are specified.
if (0 == _dbInitialTract)
@@ -201,7 +201,7 @@
} // for
PetscLogFlops(numVertices*spaceDim);
-} // integrateResidualAssembled
+} // integrateResidual
// ----------------------------------------------------------------------
// Update state variables as needed.
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -77,7 +77,7 @@
const double normalDir[3]);
/** Integrate contributions to residual term (r) for operator that
- * do not require assembly across cells, vertices, or processors.
+ * require assembly processors.
*
* Initial tractions (if specified) contribute to the residual like
* Neumann boundary conditions.
@@ -87,9 +87,9 @@
* @param fields Solution fields
*/
virtual
- void integrateResidualAssembled(const topology::Field<topology::Mesh>& residual,
- const double t,
- topology::SolutionFields* const fields);
+ void integrateResidual(const topology::Field<topology::Mesh>& residual,
+ const double t,
+ topology::SolutionFields* const fields);
/** Update state variables as needed.
*
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -113,10 +113,11 @@
// Integrate contribution of cohesive cells to residual term that do
// not require assembly across cells, vertices, or processors.
void
-pylith::faults::FaultCohesiveKin::integrateResidualAssembled(const topology::Field<
- topology::Mesh>& residual,
- const double t,
- topology::SolutionFields* const fields) { // integrateResidualAssembled
+pylith::faults::FaultCohesiveKin::integrateResidual(
+ const topology::Field<topology::Mesh>& residual,
+ const double t,
+ topology::SolutionFields* const fields)
+{ // integrateResidual
assert(0 != fields);
assert(0 != _fields);
assert(0 != _logger);
@@ -137,9 +138,9 @@
_logger->eventEnd(setupEvent);
- FaultCohesiveLagrange::integrateResidualAssembled(residual, t, fields);
+ FaultCohesiveLagrange::integrateResidual(residual, t, fields);
-} // integrateResidualAssembled
+} // integrateResidual
// ----------------------------------------------------------------------
// Get vertex field associated with integrator.
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -80,9 +80,9 @@
* @param t Current time
* @param fields Solution fields
*/
- void integrateResidualAssembled(const topology::Field<topology::Mesh>& residual,
- const double t,
- topology::SolutionFields* const fields);
+ void integrateResidual(const topology::Field<topology::Mesh>& residual,
+ const double t,
+ topology::SolutionFields* const fields);
/** Get vertex field associated with integrator.
*
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -162,10 +162,11 @@
// Integrate contribution of cohesive cells to residual term that do
// not require assembly across cells, vertices, or processors.
void
-pylith::faults::FaultCohesiveLagrange::integrateResidualAssembled(const topology::Field<
- topology::Mesh>& residual,
- const double t,
- topology::SolutionFields* const fields) { // integrateResidualAssembled
+pylith::faults::FaultCohesiveLagrange::integrateResidual(
+ const topology::Field<topology::Mesh>& residual,
+ const double t,
+ topology::SolutionFields* const fields)
+{ // integrateResidual
assert(0 != fields);
assert(0 != _fields);
assert(0 != _logger);
@@ -320,16 +321,17 @@
#if !defined(DETAILED_EVENT_LOGGING)
_logger->eventEnd(computeEvent);
#endif
-} // integrateResidualAssembled
+} // integrateResidual
// ----------------------------------------------------------------------
// Compute Jacobian matrix (A) associated with operator that do not
// require assembly across cells, vertices, or processors.
void
-pylith::faults::FaultCohesiveLagrange::integrateJacobianAssembled(topology::Jacobian* jacobian,
- const double t,
- topology::SolutionFields* const fields)
-{ // integrateJacobianAssembled
+pylith::faults::FaultCohesiveLagrange::integrateJacobian(
+ topology::Jacobian* jacobian,
+ const double t,
+ topology::SolutionFields* const fields)
+{ // integrateJacobian
assert(0 != jacobian);
assert(0 != fields);
assert(0 != _fields);
@@ -415,7 +417,7 @@
indicesL.size(), &indicesL[0],
indicesP.size(), &indicesP[0],
&jacobianVertex[0],
- INSERT_VALUES);
+ ADD_VALUES);
// Values at negative vertex, entry L,N in Jacobian
jacobianVertex *= -1.0;
@@ -423,7 +425,7 @@
indicesL.size(), &indicesL[0],
indicesN.size(), &indicesN[0],
&jacobianVertex[0],
- INSERT_VALUES);
+ ADD_VALUES);
// Values associated with [C]^T
// Transpose orientation matrix
@@ -435,7 +437,7 @@
indicesP.size(), &indicesP[0],
indicesL.size(), &indicesL[0],
&jacobianVertex[0],
- INSERT_VALUES);
+ ADD_VALUES);
// Values at negative vertex, entry L,N in Jacobian
jacobianVertex *= -1.0;
@@ -443,7 +445,7 @@
indicesN.size(), &indicesN[0],
indicesL.size(), &indicesL[0],
&jacobianVertex[0],
- INSERT_VALUES);
+ ADD_VALUES);
// Values at Lagrange vertex, entry L,L in Jacobian
jacobianVertex = 0.0;
@@ -451,7 +453,7 @@
indicesL.size(), &indicesL[0],
indicesL.size(), &indicesL[0],
&jacobianVertex[0],
- INSERT_VALUES);
+ ADD_VALUES);
#if defined(DETAILED_EVENT_LOGGING)
PetscLogFlops(spaceDim*spaceDim*2);
@@ -466,17 +468,17 @@
#endif
_needNewJacobian = false;
-} // integrateJacobianAssembled
+} // integrateJacobian
// ----------------------------------------------------------------------
// Compute Jacobian matrix (A) associated with operator that do not
// require assembly across cells, vertices, or processors.
void
-pylith::faults::FaultCohesiveLagrange::integrateJacobianAssembled(
+pylith::faults::FaultCohesiveLagrange::integrateJacobian(
topology::Field<topology::Mesh>* jacobian,
const double t,
topology::SolutionFields* const fields)
-{ // integrateJacobianAssembled
+{ // integrateJacobian
assert(0 != jacobian);
assert(0 != fields);
assert(0 != _fields);
@@ -527,7 +529,7 @@
#endif
_needNewJacobian = false;
-} // integrateJacobianAssembled
+} // integrateJacobian
// ----------------------------------------------------------------------
// Integrate contributions to Jacobian matrix (A) associated with
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -117,42 +117,40 @@
void splitField(topology::Field<topology::Mesh>* field);
/** Integrate contributions to residual term (r) for operator that
- * do not require assembly across cells, vertices, or processors.
+ * require assembly 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);
+ void integrateResidual(const topology::Field<topology::Mesh>& residual,
+ const double t,
+ topology::SolutionFields* const fields);
/** Integrate contributions to Jacobian matrix (A) associated with
- * operator that do not require assembly across cells, vertices, or
- * processors.
+ * operator that require assembly across processors.
*
* @param jacobian Sparse matrix
* @param t Current time
* @param fields Solution fields
*/
virtual
- void integrateJacobianAssembled(topology::Jacobian* jacobian,
- const double t,
- topology::SolutionFields* const fields);
+ void integrateJacobian(topology::Jacobian* jacobian,
+ const double t,
+ topology::SolutionFields* const fields);
/** Integrate contributions to Jacobian matrix (A) associated with
- * operator that do not require assembly across cells, vertices, or
- * processors.
+ * operator that require assembly processors.
*
* @param jacobian Diagonal Jacobian matrix as a field.
* @param t Current time
* @param fields Solution fields
*/
virtual
- void integrateJacobianAssembled(topology::Field<topology::Mesh>* jacobian,
- const double t,
- topology::SolutionFields* const fields);
+ void integrateJacobian(topology::Field<topology::Mesh>* jacobian,
+ const double t,
+ topology::SolutionFields* const fields);
/** Compute custom fault precoditioner using Schur complement.
*
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Integrator.icc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Integrator.icc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Integrator.icc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -126,6 +126,7 @@
topology::Jacobian* jacobian,
const double t,
topology::SolutionFields* const fields) {
+ _needNewJacobian = false;
} // integrateJacobianAssembled
// Integrate contributions to Jacobian matrix (A) associated with
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -238,10 +238,10 @@
} // testInitialize
// ----------------------------------------------------------------------
-// Test integrateResidual().
+// Test integrateResidualAssembled().
void
-pylith::faults::TestFaultCohesiveKin::testIntegrateResidual(void)
-{ // testIntegrateResidual
+pylith::faults::TestFaultCohesiveKin::testIntegrateResidualAssembled(void)
+{ // testIntegrateResidualAssembled
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -274,7 +274,7 @@
fault.timeStep(dt);
{ // Integrate residual with disp (as opposed to disp increment).
fault.useSolnIncr(false);
- fault.integrateResidual(residual, t, &fields);
+ fault.integrateResidualAssembled(residual, t, &fields);
//residual.view("RESIDUAL"); // DEBUGGING
@@ -301,7 +301,7 @@
residual.zero();
{ // Integrate residual with disp increment.
fault.useSolnIncr(true);
- fault.integrateResidual(residual, t, &fields);
+ fault.integrateResidualAssembled(residual, t, &fields);
//residual.view("RESIDUAL"); // DEBUGGING
@@ -324,13 +324,13 @@
} // for
} // for
} // Integrate residual with disp increment.
-} // testIntegrateResidual
+} // testIntegrateResidualAssembled
// ----------------------------------------------------------------------
-// Test integrateResidualAssembled().
+// Test integrateResidual().
void
-pylith::faults::TestFaultCohesiveKin::testIntegrateResidualAssembled(void)
-{ // testIntegrateResidualAssembled
+pylith::faults::TestFaultCohesiveKin::testIntegrateResidual(void)
+{ // testIntegrateResidual
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -359,11 +359,12 @@
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);
+ fault.integrateResidual(residual, t, &fields);
- //residual.view("RESIDUAL"); // DEBUGGING
+ residual.view("RESIDUAL"); // DEBUGGING
// Check values
const double* valsE = _data->residual;
@@ -392,9 +393,9 @@
residual.zero();
{ // Integrate residual with disp increment.
fault.useSolnIncr(true);
- fault.integrateResidualAssembled(residual, t, &fields);
+ fault.integrateResidual(residual, t, &fields);
- //residual->view("RESIDUAL"); // DEBUGGING
+ residual.view("RESIDUAL"); // DEBUGGING
// Check values
const double* valsE = _data->residualIncr;
@@ -419,13 +420,13 @@
} // for
} // for
} // Integrate residual with disp increment.
-} // testIntegrateResidualAssembled
+} // testIntegrateResidual
// ----------------------------------------------------------------------
-// Test integrateJacobian().
+// Test integrateJacobianAssembled().
void
-pylith::faults::TestFaultCohesiveKin::testIntegrateJacobian(void)
-{ // testIntegrateJacobian
+pylith::faults::TestFaultCohesiveKin::testIntegrateJacobianAssembled(void)
+{ // testIntegrateJacobianAssembled
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -451,7 +452,7 @@
topology::Jacobian jacobian(fields.solution());
const double t = 2.134;
- fault.integrateJacobian(&jacobian, t, &fields);
+ fault.integrateJacobianAssembled(&jacobian, t, &fields);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
jacobian.assemble("final_assembly");
@@ -499,13 +500,13 @@
MatDestroy(jDense);
MatDestroy(jSparseAIJ);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
-} // testIntegrateJacobian
+} // testIntegrateJacobianAssembled
// ----------------------------------------------------------------------
-// Test integrateJacobianAssembled().
+// Test integrateJacobian().
void
-pylith::faults::TestFaultCohesiveKin::testIntegrateJacobianAssembled(void)
-{ // testIntegrateJacobianAssembled
+pylith::faults::TestFaultCohesiveKin::testIntegrateJacobian(void)
+{ // testIntegrateJacobian
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -530,7 +531,7 @@
topology::Jacobian jacobian(fields.solution());
const double t = 2.134;
- fault.integrateJacobianAssembled(&jacobian, t, &fields);
+ fault.integrateJacobian(&jacobian, t, &fields);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
jacobian.assemble("final_assembly");
@@ -582,13 +583,13 @@
MatDestroy(jDense);
MatDestroy(jSparseAIJ);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
-} // testIntegrateJacobianAssembled
+} // testIntegrateJacobian
// ----------------------------------------------------------------------
-// Test integrateJacobianAssembled() with lumped Jacobian.
+// Test integrateJacobian() with lumped Jacobian.
void
-pylith::faults::TestFaultCohesiveKin::testIntegrateJacobianAssembledLumped(void)
-{ // testIntegrateJacobianAssembledLumped
+pylith::faults::TestFaultCohesiveKin::testIntegrateJacobianLumped(void)
+{ // testIntegrateJacobianLumped
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -601,7 +602,7 @@
jacobian.allocate();
const double t = 2.134;
- fault.integrateJacobianAssembled(&jacobian, t, &fields);
+ fault.integrateJacobian(&jacobian, t, &fields);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
jacobian.complete();
@@ -651,7 +652,7 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, jacobianVertex[iDim],
tolerance);
} // for
-} // testIntegrateJacobianAssembledLumped
+} // testIntegrateJacobianLumped
// ----------------------------------------------------------------------
// Test adjustSolnLumped().
@@ -783,7 +784,7 @@
const double dt = 0.01;
fault.useSolnIncr(false);
fault.timeStep(dt);
- fault.integrateResidualAssembled(residual, t, &fields);
+ fault.integrateResidual(residual, t, &fields);
fault.updateStateVars(t, &fields);
CPPUNIT_ASSERT(0 != fault._faultMesh);
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -102,7 +102,7 @@
void testIntegrateJacobianAssembled(void);
/// Test integrateJacobianAssembled() with lumped Jacobian.
- void testIntegrateJacobianAssembledLumped(void);
+ void testIntegrateJacobianLumped(void);
/// Test adjustSolnLumped().
void testAdjustSolnLumped(void);
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinHex8.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinHex8.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -42,7 +42,7 @@
CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -42,7 +42,7 @@
CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -42,7 +42,7 @@
CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -41,7 +41,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST( testSplitField );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -41,7 +41,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -42,7 +42,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -41,7 +41,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -41,7 +41,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -41,7 +41,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -42,7 +42,7 @@
CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -41,7 +41,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST( testSplitField );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -41,7 +41,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST( testSplitField );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -42,7 +42,7 @@
CPPUNIT_TEST( testIntegrateResidualAssembled );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testAdjustSolnLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh 2010-05-26 06:04:39 UTC (rev 16791)
@@ -41,7 +41,7 @@
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianAssembled );
- CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST( testSplitField );
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -176,9 +176,9 @@
+6.1, +4.1, // 13
+6.3, +4.3, // 15
+6.5, +4.5, // 17
- -0.3, -0.3, // 16
- 0.8, 0.8, // 17
- 0.6, 0.6, // 18
+ -0.3+1.77538035254, -0.3+0.14794836271, // 16
+ 0.8+1.89546413727, 0.8+0.08241148423, // 17
+ 0.6+1.59887481971, 0.6+0.19186497837, // 18
};
const double pylith::faults::CohesiveKinDataQuad4e::_residualIncr[] = {
@@ -194,9 +194,9 @@
+6.1, +4.1, // 13
+6.3, +4.3, // 15
+6.5, +4.5, // 17
- -0.3, -0.3, // 16
- 0.8, 0.8, // 17
- 0.6, 0.6, // 18
+ -0.3+1.77538035254, -0.3+0.14794836271, // 16
+ 0.8+1.89546413727, 0.8+0.08241148423, // 17
+ 0.6+1.59887481971, 0.6+0.19186497837, // 18
};
const double pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -144,10 +144,10 @@
-7.0, -3.0, -5.0, // 11
-8.2, -4.2, -6.2, // 12
-8.4, -4.4, -6.4, // 13
- -0.5, -0.5, -0.5, // 14
- -0.6, -0.6, -0.6, // 15
- -0.7, -0.7, -0.7, // 16
- -0.8, -0.8, -0.8, // 17
+ -0.5+1.82575588523, -0.5+-0.55566483464, -0.5+0.07938069066, // 14
+ -0.6+1.69682900001, -0.6+-0.56560966667, -0.6+0.14140241667, // 15
+ -0.7+1.51709826228, -0.7-0.54615537442, -0.7+0.18205179147, // 16
+ -0.8+1.29378670385, -0.8-0.49761027071, -0.8+0.19904410828, // 17
};
const double pylith::faults::CohesiveKinDataTet4e::_residualIncr[] = {
@@ -161,10 +161,10 @@
-7.0, -3.0, -5.0, // 11
-8.2, -4.2, -6.2, // 12
-8.4, -4.4, -6.4, // 13
- -0.5, -0.5, -0.5, // 14
- -0.6, -0.6, -0.6, // 15
- -0.7, -0.7, -0.7, // 16
- -0.8, -0.8, -0.8, // 17
+ -0.5+1.82575588523, -0.5+-0.55566483464, -0.5+0.07938069066, // 14
+ -0.6+1.69682900001, -0.6+-0.56560966667, -0.6+0.14140241667, // 15
+ -0.7+1.51709826228, -0.7-0.54615537442, -0.7+0.18205179147, // 16
+ -0.8+1.29378670385, -0.8-0.49761027071, -0.8+0.19904410828, // 17
};
const double pylith::faults::CohesiveKinDataTet4e::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -136,9 +136,9 @@
+9.7, +7.7, +8.7, // 7
+9.9, +7.9, +8.9, // 8
+9.1, +7.1, +8.1, // 9
- 0.4, 0.4, 0.4, // 10
- 0.5, 0.5, 0.5, // 11
- -0.4, -0.4, -0.4, // 12
+ 0.4+1.82575588523, 0.4+-0.55566483464, 0.4+0.07938069066, // 10
+ 0.5+1.69682900001, 0.5+-0.56560966667, 0.5+0.14140241667, // 11
+ -0.4+1.51709826228, -0.4+-0.54615537442, -0.4+0.18205179147, // 12
};
const double pylith::faults::CohesiveKinDataTet4f::_residualIncr[] = {
@@ -150,9 +150,9 @@
+9.7, +7.7, +8.7, // 7
+9.9, +7.9, +8.9, // 8
+9.1, +7.1, +8.1, // 9
- 0.4, 0.4, 0.4, // 10
- 0.5, 0.5, 0.5, // 11
- -0.4, -0.4, -0.4, // 12
+ 0.4+1.82575588523, 0.4+-0.55566483464, 0.4+0.07938069066, // 10
+ 0.5+1.69682900001, 0.5+-0.56560966667, 0.5+0.14140241667, // 11
+ -0.4+1.51709826228, -0.4+-0.54615537442, -0.4+0.18205179147, // 12
};
const double pylith::faults::CohesiveKinDataTet4f::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -168,9 +168,9 @@
+1.4142135623730949, +11.030865786510143, // 10
+8.0, +6.0, // 11
-7.2, +9.2, // 12
- 0.0, +0.70710678118654757, // 13
- 0.6, 0.6, // 14
- -0.6, 0.6, // 15
+ 0.0+1.89546413727, +0.70710678118654757+0.08241148423, // 13
+ 0.6+1.77538035254, 0.6+0.14794836271, // 14
+ -0.6+1.59887481971, 0.6+0.19186497837, // 15
};
const double pylith::faults::CohesiveKinDataTri3d::_residualIncr[] = {
@@ -183,9 +183,9 @@
+1.4142135623730949, +11.030865786510143, // 10
+8.0, +6.0, // 11
-7.2, +9.2, // 12
- 0.0, +0.70710678118654757, // 13
- 0.6, 0.6, // 14
- -0.6, 0.6, // 15
+ 0.0+1.89546413727, +0.70710678118654757+0.08241148423, // 13
+ 0.6+1.77538035254, 0.6+0.14794836271, // 14
+ -0.6+1.59887481971, 0.6+0.19186497837, // 15
};
const double pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -176,10 +176,10 @@
+9.6,+5.6,+7.6, // 15
+9.8,+5.8,+7.8, // 16
+9.0,+5.0,+7.0, // 17
- 0.8, 0.8, 0.8, // 18 (constraint)
- 0.9, 0.9, 0.9, // 19 (constraint)
- 1.0, 1.0, 1.0, // 20 (constraint)
- 1.1, 1.1, 1.1, // 21 (constraint)
+ 0.8+1.82575588523+0.91680340354, 0.8+-0.55566483464-0.27902712282, 0.8+0.07938069066+0.03986101755, // 18 (constraint)
+ 0.9+1.69682900001+0.62551316338, 0.9+-0.56560966667-0.20850438779, 0.9+0.14140241667+0.05212609695, // 19 (constraint)
+ 1.0+1.51709826228+0.34903622931, 1.0+-0.54615537442-0.12565304255, 1.0+0.18205179147+0.04188434752, // 20 (constraint)
+ 1.1+1.29378670385+0.12855127934, 1.1+-0.49761027071+-0.04944279975, 1.1+0.19904410828+0.01977711990, // 21 (constraint)
};
const double pylith::faults::CohesiveKinSrcsDataHex8::_residualIncr[] = {
@@ -199,10 +199,10 @@
+9.6,+5.6,+7.6, // 15
+9.8,+5.8,+7.8, // 16
+9.0,+5.0,+7.0, // 17
- 0.8, 0.8, 0.8, // 18 (constraint)
- 0.9, 0.9, 0.9, // 19 (constraint)
- 1.0, 1.0, 1.0, // 20 (constraint)
- 1.1, 1.1, 1.1, // 21 (constraint)
+ 0.8+1.82575588523+0.91680340354, 0.8+-0.55566483464-0.27902712282, 0.8+0.07938069066+0.03986101755, // 18 (constraint)
+ 0.9+1.69682900001+0.62551316338, 0.9+-0.56560966667-0.20850438779, 0.9+0.14140241667+0.05212609695, // 19 (constraint)
+ 1.0+1.51709826228+0.34903622931, 1.0+-0.54615537442-0.12565304255, 1.0+0.18205179147+0.04188434752, // 20 (constraint)
+ 1.1+1.29378670385+0.12855127934, 1.1+-0.49761027071+-0.04944279975, 1.1+0.19904410828+0.01977711990, // 21 (constraint)
};
const double pylith::faults::CohesiveKinSrcsDataHex8::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -112,7 +112,7 @@
7.5,
0.0,
-7.5,
- -0.2
+ -0.2+1.89546413727+0.99414665414,
};
const double pylith::faults::CohesiveKinSrcsDataLine2::_residual[] = {
@@ -120,7 +120,7 @@
7.5,
0.0,
-7.5,
- -0.2
+ -0.2+1.89546413727+0.99414665414,
};
const double pylith::faults::CohesiveKinSrcsDataLine2::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -145,8 +145,8 @@
0.0, 0.0,
-9.8, -8.8, // 8
-9.0, -8.0, // 9
- -0.4, -0.4, // 10
- -0.5, -0.5, // 11
+ -0.4+1.77538035254+0.68377062865, -0.4+0.14794836271+0.05698088572, // 10
+ -0.5+1.89546413727+0.99414665414, -0.5+0.08241148423+0.04322376757, // 11
};
const double pylith::faults::CohesiveKinSrcsDataQuad4::_residualIncr[] = {
@@ -158,8 +158,8 @@
0.0, 0.0,
-9.8, -8.8, // 8
-9.0, -8.0, // 9
- -0.4, -0.4, // 10
- -0.5, -0.5, // 11
+ -0.4+1.77538035254+0.68377062865, -0.4+0.14794836271+0.05698088572, // 10
+ -0.5+1.89546413727+0.99414665414, -0.5+0.08241148423+0.04322376757, // 11
};
const double pylith::faults::CohesiveKinSrcsDataQuad4::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -136,9 +136,9 @@
-9.7, -7.7, -8.7, // 7
-9.9, -7.9, -8.9, // 4
-9.1, -7.1, -8.1, // 5
- -0.4, -0.4, -0.4, // 10
- -0.5, -0.5, -0.5, // 11
- 0.4, 0.4, 0.4, // 12
+ -0.4+1.82575588523+0.91680340354, -0.4+-0.55566483464+-0.27902712282, -0.4+0.07938069066+0.03986101755, // 10
+ -0.5+1.69682900001+0.62551316338, -0.5+-0.56560966667+-0.20850438779, -0.5+0.14140241667+0.05212609695, // 11
+ 0.4+1.51709826228+0.34903622931, 0.4+-0.54615537442+-0.12565304255, 0.4+0.18205179147+0.04188434752, // 12
};
const double pylith::faults::CohesiveKinSrcsDataTet4::_residualIncr[] = {
@@ -150,9 +150,9 @@
-9.7, -7.7, -8.7, // 7
-9.9, -7.9, -8.9, // 4
-9.1, -7.1, -8.1, // 5
- -0.4, -0.4, -0.4, // 10
- -0.5, -0.5, -0.5, // 11
- 0.4, 0.4, 0.4, // 12
+ -0.4+1.82575588523+0.91680340354, -0.4+-0.55566483464+-0.27902712282, -0.4+0.07938069066+0.03986101755, // 10
+ -0.5+1.69682900001+0.62551316338, -0.5+-0.56560966667+-0.20850438779, -0.5+0.14140241667+0.05212609695, // 11
+ 0.4+1.51709826228+0.34903622931, 0.4+-0.54615537442+-0.12565304255, 0.4+0.18205179147+0.04188434752, // 12
};
const double pylith::faults::CohesiveKinSrcsDataTet4::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2010-05-26 06:04:39 UTC (rev 16791)
@@ -155,8 +155,8 @@
0.0, 0.0,
+9.6, +8.6, // 6
+9.8, +8.8, // 7
- 0.3, 0.3, // 8
- 0.4, 0.4, // 9
+ 0.3+1.89546413727+0.99414665414, 0.3+0.08241148423+0.04322376757, // 8
+ 0.4+1.77538035254+0.68377062865, 0.4+0.14794836271+0.05698088572, // 9
};
const double pylith::faults::CohesiveKinSrcsDataTri3::_residualIncr[] = {
@@ -166,8 +166,8 @@
0.0, 0.0,
+9.6, +8.6, // 6
+9.8, +8.8, // 7
- 0.3, 0.3, // 8
- 0.4, 0.4, // 9
+ 0.3+1.89546413727+0.99414665414, 0.3+0.08241148423+0.04322376757, // 8
+ 0.4+1.77538035254+0.68377062865, 0.4+0.14794836271+0.05698088572, // 9
};
const double pylith::faults::CohesiveKinSrcsDataTri3::_jacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py 2010-05-26 05:59:44 UTC (rev 16790)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py 2010-05-26 06:04:39 UTC (rev 16791)
@@ -5,8 +5,8 @@
slipMag = (finalSlip[0]**2+finalSlip[1]**2+finalSlip[2]**2)**0.5
-slipTime1 = 1.5
-slipTime2 = 1.5
+slipTime1 = 2.0
+slipTime2 = 0.7
t = 2.134
dt = 0.01
More information about the CIG-COMMITS
mailing list