[cig-commits] r15315 - in short/3D/PyLith/trunk: libsrc/faults unittests/libtests/faults unittests/libtests/faults/data
brad at geodynamics.org
brad at geodynamics.org
Wed Jun 17 09:05:58 PDT 2009
Author: brad
Date: 2009-06-17 09:05:54 -0700 (Wed, 17 Jun 2009)
New Revision: 15315
Modified:
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh
Log:
Fixed bug in computing residual for full displacement solution (was okay for static problems so simulation results are not affected since we used to switch to a solution increment solution; now we always use solution increment approach but test will stay for safety).
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -229,9 +229,6 @@
// slip
// * DOF k: slip values
- if (!_useSolnIncr)
- return;
-
// Get cell information and setup storage for cell data
const int spaceDim = _quadrature->spaceDim();
const int orientationSize = spaceDim*spaceDim;
@@ -977,10 +974,20 @@
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.
+ // normal with preferred normal is negative, flip up/down dip
+ // direction.
+ //
+ // If the user gives the correct normal direction (points from
+ // footwall to ahanging wall), we should end up with
+ // left-lateral-slip, reverse-slip, and fault-opening for positive
+ // slip values.
+ //
+ // When we flip the up/down dip direction, we create a left-handed
+ // strike/dip/normal coordinate system, but it gives the correct
+ // sense of slip. In reality the strike/dip/normal directions that
+ // are used are the opposite of what we would want, but we cannot
+ // flip the fault normal direction because it is tied to how the
+ // cohesive cells are created.
assert(vertices->size() > 0);
orientationSection->restrictPoint(*vertices->begin(), &orientationVertex[0],
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -246,7 +246,7 @@
fault.useSolnIncr(false);
fault.integrateResidual(residual, t, &fields);
- //residual->view("RESIDUAL"); // DEBUGGING
+ residual.view("RESIDUAL"); // DEBUGGING
// Check values
const double* valsE = _data->valsResidual;
@@ -261,19 +261,12 @@
const double* vals = residualSection->restrictPoint(*v_iter);
CPPUNIT_ASSERT(0 != vals);
- const bool isConstraint = _isConstraintVertex(*v_iter);
- if (!isConstraint) {
- for (int i=0; i < fiberDimE; ++i) {
- const int index = iVertex*spaceDim+i;
- const double valE = valsE[index];
- if (fabs(valE) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valE, tolerance);
- else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[i], tolerance);
- } // for
- } else {
- const double valE = 0.0; // no contribution
- for (int i=0; i < fiberDimE; ++i)
+ for (int i=0; i < fiberDimE; ++i) {
+ const int index = iVertex*spaceDim+i;
+ const double valE = valsE[index];
+ if (fabs(valE) > tolerance)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valE, tolerance);
+ else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[i], tolerance);
} // for
} // for
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -39,7 +39,6 @@
valsResidual(0),
valsResidualIncr(0),
valsJacobian(0),
- pseudoStiffness(0),
numConstraintVert(0)
{ // constructor
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -76,7 +76,6 @@
double* valsResidualIncr;
double* valsJacobian; ///< Expected values from Jacobian calculation.
- double pseudoStiffness; ///< Fake stiffness for conditioning
int numConstraintVert; ///< Number of constraint vertices
//@}
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -153,22 +153,22 @@
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
+ -9.4,-5.4,-7.4, // 6
+ -9.6,-5.6,-7.6, // 7
+ -9.8,-5.8,-7.8, // 8
+ -9.0,-5.0,-7.0, // 9
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 1.07974939836, -0.32861938211, 0.04694562602, // 18 (constraint)
- 1.00381374723, -0.33460458241, 0.08365114560, // 19 (constraint)
- 0.90493237602, -0.32577565537, 0.10859188512, // 20 (constraint)
- 0.78469841324, -0.30180708202, 0.12072283281, // 21 (constraint)
+ +9.4,+5.4,+7.4, // 14
+ +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)
};
const double pylith::faults::CohesiveKinDataHex8::_valsResidualIncr[] = {
@@ -1397,8 +1397,6 @@
0.0, 0.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataHex8::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataHex8::CohesiveKinDataHex8(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -1425,7 +1423,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -106,10 +106,10 @@
const double pylith::faults::CohesiveKinDataLine2::_valsResidual[] = {
0.0,
+ 7.5,
0.0,
- 0.0,
- 0.0,
- 1.05168389458
+ -7.5,
+ -0.2,
};
const double pylith::faults::CohesiveKinDataLine2::_valsJacobian[] = {
@@ -120,8 +120,6 @@
0.0, -1.0, 0.0, +1.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataLine2::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataLine2::CohesiveKinDataLine2(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -148,7 +146,6 @@
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsResidual = const_cast<double*>(_valsResidual);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation with solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -128,14 +128,14 @@
const double pylith::faults::CohesiveKinDataQuad4::_valsResidual[] = {
0.0, 0.0,
0.0, 0.0,
+ 9.8, 8.8, // 4
+ 9.0, 8.0, // 5
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.989535448086, 0.0824612873405, // 10
- 1.05057813143, 0.0456773100622, // 11
+ -9.8, -8.8, // 8
+ -9.0, -8.0, // 9
+ -0.4, -0.4, // 10
+ -0.5, -0.5, // 11
};
const double pylith::faults::CohesiveKinDataQuad4::_valsResidualIncr[] = {
@@ -354,8 +354,6 @@
0.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataQuad4::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataQuad4::CohesiveKinDataQuad4(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -382,7 +380,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -155,19 +155,19 @@
const double pylith::faults::CohesiveKinDataQuad4e::_valsResidual[] = {
0.0, 0.0,
0.0, 0.0,
+ -6.1, -4.1, // 6
+ -6.3, -4.3, // 7
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ -6.5, -4.5, // 11
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.989535448086, 0.0824612873405, // 16
- 1.05057813143, 0.0456773100622, // 17
- 0.90435792846, 0.10852295130, // 18
+ +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
};
const double pylith::faults::CohesiveKinDataQuad4e::_valsResidualIncr[] = {
@@ -641,8 +641,6 @@
0.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataQuad4e::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataQuad4e::CohesiveKinDataQuad4e(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -669,7 +667,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -118,16 +118,16 @@
const double pylith::faults::CohesiveKinDataTet4::_valsResidual[] = {
0.0, 0.0, 0.0,
+ 9.7, 7.7, 8.7, // 3
+ 9.9, 7.9, 8.9, // 4
+ 9.1, 7.1, 8.1, // 5
0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 1.07974939836, -0.32861938211, 0.04694562602, // 10
- 1.00381374723, -0.33460458241, 0.08365114560, // 11
- 0.90493237602, -0.32577565537, 0.10859188512, // 12
+ -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
};
const double pylith::faults::CohesiveKinDataTet4::_valsResidualIncr[] = {
@@ -510,8 +510,6 @@
0.0, 0.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataTet4::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataTet4::CohesiveKinDataTet4(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -538,7 +536,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -123,19 +123,19 @@
const double pylith::faults::CohesiveKinDataTet4e::_valsResidual[] = {
0.0, 0.0, 0.0,
+ 7.8, 3.8, 5.8, // 5
+ 7.0, 3.0, 5.0, // 6
+ 8.2, 4.2, 6.2, // 7
+ 8.4, 4.4, 6.4, // 8
0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 1.07974939836, -0.32861938211, 0.04694562602, // 14
- 1.00381374723, -0.33460458241, 0.08365114560, // 15
- 0.90493237602, -0.32577565537, 0.10859188512, // 16
- 0.78469841324, -0.30180708202, 0.12072283281, // 17
+ -7.8, -3.8, -5.8, // 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
};
const double pylith::faults::CohesiveKinDataTet4e::_valsResidualIncr[] = {
@@ -746,8 +746,6 @@
0.0, 0.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataTet4e::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataTet4e::CohesiveKinDataTet4e(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -774,7 +772,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -118,16 +118,16 @@
const double pylith::faults::CohesiveKinDataTet4f::_valsResidual[] = {
0.0, 0.0, 0.0,
+ -9.7, -7.7, -8.7, // 3
+ -9.9, -7.9, -8.9, // 4
+ -9.1, -7.1, -8.1, // 5
0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 1.07974939836, -0.32861938211, 0.04694562602, // 10
- 1.00381374723, -0.33460458241, 0.08365114560, // 11
- 0.90493237602, -0.32577565537, 0.10859188512, // 12
+ +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
};
const double pylith::faults::CohesiveKinDataTet4f::_valsResidualIncr[] = {
@@ -510,8 +510,6 @@
0.0, 0.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataTet4f::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataTet4f::CohesiveKinDataTet4f(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -538,7 +536,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -128,13 +128,13 @@
const double pylith::faults::CohesiveKinDataTri3::_valsResidual[] = {
0.0, 0.0,
+ -9.6, -8.6, // 3
+ -9.8, -8.8, // 4
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 1.05057813143, 0.0456773100622, // 8
- 0.989535448086, 0.0824612873405, // 9
+ +9.6, +8.6, // 6
+ +9.8, +8.8, // 7
+ 0.3, 0.3, // 8
+ 0.4, 0.4, // 9
};
const double pylith::faults::CohesiveKinDataTri3::_valsResidualIncr[] = {
@@ -281,8 +281,6 @@
0.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataTri3::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataTri3::CohesiveKinDataTri3(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -309,7 +307,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -150,17 +150,17 @@
const double pylith::faults::CohesiveKinDataTri3d::_valsResidual[] = {
0.0, 0.0,
+ -1.4142135623730949, -11.030865786510143, // 5
+ -8.0, -6.0, // 6
0.0, 0.0,
+ +7.2, -9.2, // 8
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 1.05057813143, 0.0456773100622, // 13
- 0.989535448086, 0.0824612873405, // 14
- 0.90435792846, 0.10852295130, // 15
+ +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
};
const double pylith::faults::CohesiveKinDataTri3d::_valsResidualIncr[] = {
@@ -469,8 +469,6 @@
0.0, 0.0,
};
-const double pylith::faults::CohesiveKinDataTri3d::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinDataTri3d::CohesiveKinDataTri3d(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -497,7 +495,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -153,22 +153,22 @@
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
+ -9.4,-5.4,-7.4, // 6
+ -9.6,-5.6,-7.6, // 7
+ -9.8,-5.8,-7.8, // 8
+ -9.0,-5.0,-7.0, // 9
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 1.46662437631, -0.44636394062, 0.06376627723, // 18 (constraint)
- 1.27479107177, -0.42493035726, 0.10623258931, // 19 (constraint)
- 1.06176823515, -0.38223656465, 0.12741218822, // 20 (constraint)
- 0.84520045818, -0.32507709930, 0.13003083972, // 21 (constraint)
+ +9.4,+5.4,+7.4, // 14
+ +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)
};
const double pylith::faults::CohesiveKinSrcsDataHex8::_valsResidualIncr[] = {
@@ -1397,8 +1397,6 @@
0.0, 0.0, 0.0,
};
-const double pylith::faults::CohesiveKinSrcsDataHex8::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinSrcsDataHex8::CohesiveKinSrcsDataHex8(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -1425,7 +1423,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -106,10 +106,10 @@
const double pylith::faults::CohesiveKinSrcsDataLine2::_valsResidual[] = {
0.0,
+ 7.5,
0.0,
- 0.0,
- 0.0,
- 1.42456033340
+ -7.5,
+ -0.2
};
const double pylith::faults::CohesiveKinSrcsDataLine2::_valsJacobian[] = {
@@ -120,8 +120,6 @@
0.0, -1.0, 0.0, +1.0, 0.0,
};
-const double pylith::faults::CohesiveKinSrcsDataLine2::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinSrcsDataLine2::CohesiveKinSrcsDataLine2(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -148,7 +146,6 @@
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsResidual = const_cast<double*>(_valsResidual);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation with solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -128,14 +128,14 @@
const double pylith::faults::CohesiveKinSrcsDataQuad4::_valsResidual[] = {
0.0, 0.0,
0.0, 0.0,
+ 9.8, 8.8, // 4
+ 9.0, 8.0, // 5
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 1.25514570482, 0.10459547540, // 10
- 1.42290872258, 0.06186559663, // 11
+ -9.8, -8.8, // 8
+ -9.0, -8.0, // 9
+ -0.4, -0.4, // 10
+ -0.5, -0.5, // 11
};
const double pylith::faults::CohesiveKinSrcsDataQuad4::_valsResidualIncr[] = {
@@ -354,8 +354,6 @@
0.0, 0.0,
};
-const double pylith::faults::CohesiveKinSrcsDataQuad4::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinSrcsDataQuad4::CohesiveKinSrcsDataQuad4(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -382,7 +380,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -118,16 +118,16 @@
const double pylith::faults::CohesiveKinSrcsDataTet4::_valsResidual[] = {
0.0, 0.0, 0.0,
+ 9.7, 7.7, 8.7, // 3
+ 9.9, 7.9, 8.9, // 4
+ 9.1, 7.1, 8.1, // 5
0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- 1.46662437631, -0.44636394062, 0.06376627723, // 10
- 1.27479107177, -0.42493035726, 0.10623258931, // 11
- 1.06176823515, -0.38223656465, 0.12741218822, // 12
+ -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
};
const double pylith::faults::CohesiveKinSrcsDataTet4::_valsResidualIncr[] = {
@@ -510,8 +510,6 @@
0.0, 0.0, 0.0,
};
-const double pylith::faults::CohesiveKinSrcsDataTet4::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinSrcsDataTet4::CohesiveKinSrcsDataTet4(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -538,7 +536,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2009-06-17 16:05:54 UTC (rev 15315)
@@ -139,13 +139,13 @@
const double pylith::faults::CohesiveKinSrcsDataTri3::_valsResidual[] = {
0.0, 0.0,
+ -9.6, -8.6, // 3
+ -9.8, -8.8, // 4
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- 1.42290872258, 0.06186559663, // 8
- 1.25514570482, 0.10459547540, // 9
+ +9.6, +8.6, // 6
+ +9.8, +8.8, // 7
+ 0.3, 0.3, // 8
+ 0.4, 0.4, // 9
};
const double pylith::faults::CohesiveKinSrcsDataTri3::_valsResidualIncr[] = {
@@ -292,8 +292,6 @@
0.0, 0.0,
};
-const double pylith::faults::CohesiveKinSrcsDataTri3::_pseudoStiffness = 2.4;
-
pylith::faults::CohesiveKinSrcsDataTri3::CohesiveKinSrcsDataTri3(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
@@ -320,7 +318,6 @@
valsResidual = const_cast<double*>(_valsResidual);
valsResidualIncr = const_cast<double*>(_valsResidualIncr);
valsJacobian = const_cast<double*>(_valsJacobian);
- pseudoStiffness = _pseudoStiffness;
numConstraintVert = _numConstraintVert;
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh 2009-06-17 15:43:57 UTC (rev 15314)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh 2009-06-17 16:05:54 UTC (rev 15315)
@@ -66,7 +66,6 @@
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
- static const double _pseudoStiffness; ///< Fake stiffness for conditioning
static const int _numConstraintVert; ///< Number of constraint vertices
};
More information about the CIG-COMMITS
mailing list