[cig-commits] r18965 - in short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults: . data
brad at geodynamics.org
brad at geodynamics.org
Fri Sep 23 10:26:46 PDT 2011
Author: brad
Date: 2011-09-23 10:26:45 -0700 (Fri, 23 Sep 2011)
New Revision: 18965
Modified:
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
Log:
Improve check of lumped Jacobian for revised fault implementation. Add more consistency checks.
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/TestFaultCohesiveKin.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/TestFaultCohesiveKin.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -143,6 +143,8 @@
void
pylith::faults::TestFaultCohesiveKin::testInitialize(void)
{ // testInitialize
+ CPPUNIT_ASSERT(_data);
+
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -231,6 +233,11 @@
void
pylith::faults::TestFaultCohesiveKin::testIntegrateResidual(void)
{ // testIntegrateResidual
+ CPPUNIT_ASSERT(_data);
+ CPPUNIT_ASSERT(_data->fieldT);
+ CPPUNIT_ASSERT(_data->residual);
+ CPPUNIT_ASSERT(_data->residualIncr);
+
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -328,6 +335,10 @@
void
pylith::faults::TestFaultCohesiveKin::testIntegrateJacobian(void)
{ // testIntegrateJacobian
+ CPPUNIT_ASSERT(_data);
+ CPPUNIT_ASSERT(_data->fieldT);
+ CPPUNIT_ASSERT(_data->jacobian);
+
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -411,6 +422,9 @@
void
pylith::faults::TestFaultCohesiveKin::testIntegrateJacobianLumped(void)
{ // testIntegrateJacobianLumped
+ CPPUNIT_ASSERT(_data);
+ CPPUNIT_ASSERT(_data->jacobianLumped);
+
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -432,46 +446,64 @@
const ALE::Obj<RealSection>& jacobianSection = jacobian.section();
CPPUNIT_ASSERT(!jacobianSection.isNull());
+ // Only check Lagrange multiplier values
+
int iVertex = 0;
const double tolerance = 1.0e-06;
const int spaceDim = _data->spaceDim;
+
+ const ALE::Obj<SieveSubMesh>& 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();
+
const ALE::Obj<SieveSubMesh>& faultSieveMesh = fault._faultMesh->sieveMesh();
CPPUNIT_ASSERT(!faultSieveMesh.isNull());
- const ALE::Obj<SieveMesh::label_sequence>& vertices =
- faultSieveMesh->depthStratum(0);
- CPPUNIT_ASSERT(!vertices.isNull());
- const SieveSubMesh::label_sequence::iterator verticesBegin =
- vertices->begin();
- const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
SieveSubMesh::renumbering_type& renumbering =
faultSieveMesh->getRenumbering();
const SieveMesh::renumbering_type::const_iterator renumberingBegin =
renumbering.begin();
const SieveMesh::renumbering_type::const_iterator renumberingEnd =
renumbering.end();
+
for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) {
- SieveMesh::point_type meshVertex = -1;
bool found = false;
for (SieveMesh::renumbering_type::const_iterator r_iter = renumberingBegin;
r_iter != renumberingEnd;
++r_iter) {
- if (r_iter->second == *v_iter) {
- meshVertex = r_iter->first;
+ if (r_iter->first == *v_iter) {
found = true;
break;
} // if
} // for
+ if (!found) // only check Lagrange multiplier values
+ continue;
+
CPPUNIT_ASSERT(found);
- int fiberDim = jacobianSection->getFiberDimension(meshVertex);
+ int fiberDim = jacobianSection->getFiberDimension(*v_iter);
CPPUNIT_ASSERT_EQUAL(spaceDim, fiberDim);
- const double* jacobianVertex = jacobianSection->restrictPoint(meshVertex);
- CPPUNIT_ASSERT(0 != jacobianVertex);
- for (int iDim=0; iDim < spaceDim; ++iDim)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, jacobianVertex[iDim],
- tolerance);
+ const double* vals = jacobianSection->restrictPoint(*v_iter);
+ CPPUNIT_ASSERT(0 != vals);
+
+ for (int iDim=0; iDim < spaceDim; ++iDim) {
+ const double valE = _data->jacobianLumped[iVertex*spaceDim+iDim];
+#if 1 // debugging
+ std::cout << "vertex: " << *v_iter << ", iDim: " << iDim
+ << ", valE: " << valE
+ << ", val: " << vals[iDim]
+ << std::endl;
+#endif
+ if (fabs(valE) > 1.0)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[iDim]/valE, tolerance);
+ else
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[iDim], tolerance);
+ } // for
} // for
} // testIntegrateJacobianLumped
@@ -480,6 +512,12 @@
void
pylith::faults::TestFaultCohesiveKin::testAdjustSolnLumped(void)
{ // testAdjustSolnLumped
+ CPPUNIT_ASSERT(_data);
+ CPPUNIT_ASSERT(_data->fieldT);
+ CPPUNIT_ASSERT(_data->fieldIncr);
+ CPPUNIT_ASSERT(_data->fieldIncrAdjusted);
+ CPPUNIT_ASSERT(_data->jacobianLumped);
+
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -578,6 +616,10 @@
void
pylith::faults::TestFaultCohesiveKin::testUpdateStateVars(void)
{ // testUpdateStateVars
+ CPPUNIT_ASSERT(_data);
+ CPPUNIT_ASSERT(_data->fieldT);
+ CPPUNIT_ASSERT(_data->verticesLagrange);
+
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -636,7 +678,7 @@
s_iter != srcsEnd;
++s_iter) {
EqKinSrc* src = s_iter->second;
- assert(0 != src);
+ CPPUNIT_ASSERT(0 != src);
if (t >= src->originTime())
src->slip(&slipE, t);
} // for
@@ -681,6 +723,10 @@
void
pylith::faults::TestFaultCohesiveKin::testCalcTractionsChange(void)
{ // testCalcTractionsChange
+ CPPUNIT_ASSERT(_data);
+ CPPUNIT_ASSERT(_data->fieldT);
+ CPPUNIT_ASSERT(_data->area);
+
topology::Mesh mesh;
FaultCohesiveKin fault;
topology::SolutionFields fields(mesh);
@@ -777,7 +823,7 @@
void
pylith::faults::TestFaultCohesiveKin::testSplitField(void)
{ // testSplitField
- assert(0 != _data);
+ CPPUNIT_ASSERT(_data);
topology::Mesh mesh;
FaultCohesiveKin fault;
@@ -941,7 +987,7 @@
bool
pylith::faults::TestFaultCohesiveKin::_isLagrangeVertex(const int vertex) const
{ // _isLagrangeVertex
- assert(0 != _data);
+ CPPUNIT_ASSERT(_data);
const int numFaultVertices = _data->numFaultVertices;
bool isFound = false;
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -170,9 +170,9 @@
1.5, 1.5, 1.5, // 15
1.7, 1.7, 1.7, // 16
1.9, 1.9, 1.9, // 17
- 1.4, 1.4, 1.4, // 18
- 1.6, 1.6, 1.6, // 19
- 1.8, 1.8, 1.8, // 20
+ 1.0, 1.0, 1.0, // 18
+ 1.0, 1.0, 1.0, // 19
+ 1.0, 1.0, 1.0, // 20
1.0, 1.0, 1.0, // 21
};
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -130,7 +130,7 @@
1.6, 1.6,
1.7, 1.7, // 8
1.9, 1.9, // 9
- 1.8, 1.8, // 10
+ 1.0, 1.0, // 10
1.0, 1.0, // 11
};
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -134,6 +134,45 @@
+const double pylith::faults::CohesiveKinDataQuad4e::_fieldIncr[] = {
+ 6.1, 4.1,
+ 6.2, 4.2,
+ 6.3, 4.3, // 6
+ 6.4, 4.4, // 7
+ 6.5, 4.5,
+ 6.6, 4.6,
+ 6.7, 4.7,
+ 6.8, 4.8, // 11
+ 6.9, 4.9,
+ 6.0, 4.0, // 13
+ 5.2, 3.2, // 14
+ 5.4, 3.4, // 15
+ 5.1, 3.1, // 16
+ 5.3, 3.3, // 17
+ 5.5, 3.5, // 18
+};
+
+
+const double pylith::faults::CohesiveKinDataQuad4e::_jacobianLumped[] = {
+ 1.1, 7.1,
+ 1.2, 7.2,
+ 1.3, 7.3, // 6
+ 1.4, 7.4, // 7
+ 1.5, 7.5,
+ 1.6, 7.6,
+ 1.7, 7.7,
+ 1.8, 7.8, // 11
+ 1.9, 7.9,
+ 1.0, 7.0, // 13
+ 2.2, 3.2, // 14
+ 2.4, 3.4, // 15
+ 1.0, 1.0, // 16
+ 2.0, 2.0, // 17
+ 1.0, 1.0, // 18
+};
+
+
+
const double pylith::faults::CohesiveKinDataQuad4e::_orientation[] = {
0.0, -1.0, -1.0, 0.0,
0.0, -1.0, -1.0, 0.0,
@@ -686,6 +725,8 @@
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
riseTimeFilename = const_cast<char*>(_riseTimeFilename);
fieldT = const_cast<double*>(_fieldT);
+ fieldIncr = const_cast<double*>(_fieldIncr);
+ jacobianLumped = const_cast<double*>(_jacobianLumped);
orientation = const_cast<double*>(_orientation);
area = const_cast<double*>(_area);
residual = const_cast<double*>(_residual);
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh 2011-09-23 17:26:45 UTC (rev 18965)
@@ -64,6 +64,8 @@
//@}
static const double _fieldT[]; ///< Solution field at time t.
+ static const double _fieldIncr[]; ///< Solution increment field over domain at time t.
+ static const double _jacobianLumped[]; ///< Lumped Jacobian.
static const double _orientation[]; ///< Expected values for fault orientation.
static const double _area[]; ///< Expected values for fault area.
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -120,9 +120,9 @@
1.6, 1.6, 1.6, // 7
1.8, 1.8, 1.8, // 8
1.0, 1.0, 1.0, // 9
- 1.7, 1.7, 1.7, // 10
- 1.9, 1.9, 1.9, // 11
- 1.1, 1.1, 1.1, // 12
+ 1.0/3.0, 1.0/3.0, 1.0/3.0, // 10
+ 1.0/3.0, 1.0/3.0, 1.0/3.0, // 11
+ 1.0/3.0, 1.0/3.0, 1.0/3.0, // 12
};
const int pylith::faults::CohesiveKinDataTet4::_numFaultVertices = 3;
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -100,7 +100,41 @@
4.4, 6.4, 8.4, // 17
};
+const double pylith::faults::CohesiveKinDataTet4e::_fieldIncr[] = {
+ 6.1, 7.1, 2.1,
+ 6.2, 7.2, 2.2, // 5
+ 6.3, 7.3, 2.3, // 6
+ 6.4, 7.4, 2.4, // 7
+ 6.5, 7.5, 2.5, // 8
+ 6.6, 7.6, 2.6,
+ 6.7, 7.7, 2.7, // 10
+ 6.9, 7.9, 2.9, // 11
+ 5.1, 8.1, 1.1, // 12
+ 5.3, 8.3, 1.3, // 13
+ 4.8, 8.8, 2.8, // 14
+ 4.0, 8.0, 2.0, // 15
+ 5.2, 8.2, 1.2, // 16
+ 5.4, 8.4, 1.4, // 17
+};
+const double pylith::faults::CohesiveKinDataTet4e::_jacobianLumped[] = {
+ 4.1, 6.1, 8.1,
+ 4.2, 6.2, 8.2, // 5
+ 4.3, 6.3, 8.3, // 6
+ 4.4, 6.4, 8.4, // 7
+ 4.5, 6.5, 8.5, // 8
+ 4.6, 6.6, 8.6,
+ 4.7, 6.7, 8.7, // 10
+ 4.9, 6.9, 8.9, // 11
+ 3.1, 5.1, 7.1, // 12
+ 3.3, 5.3, 7.3, // 13
+ 2.0/3.0, 2.0/3.0, 2.0/3.0, // 14
+ 1.0/3.0, 1.0/3.0, 1.0/3.0, // 15
+ 2.0/3.0, 2.0/3.0, 2.0/3.0, // 16
+ 1.0/3.0, 1.0/3.0, 1.0/3.0, // 17
+};
+
+
const double pylith::faults::CohesiveKinDataTet4e::_orientation[] = {
0.0, +1.0, 0.0, 0.0, 0.0, +1.0, +1.0, 0.0, 0.0,
0.0, +1.0, 0.0, 0.0, 0.0, +1.0, +1.0, 0.0, 0.0,
@@ -872,6 +906,8 @@
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
riseTimeFilename = const_cast<char*>(_riseTimeFilename);
fieldT = const_cast<double*>(_fieldT);
+ fieldIncr = const_cast<double*>(_fieldIncr);
+ jacobianLumped = const_cast<double*>(_jacobianLumped);
orientation = const_cast<double*>(_orientation);
area = const_cast<double*>(_area);
residual = const_cast<double*>(_residual);
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh 2011-09-23 17:26:45 UTC (rev 18965)
@@ -64,6 +64,8 @@
//@}
static const double _fieldT[]; ///< Solution field at time t.
+ static const double _fieldIncr[]; ///< Solution increment field over domain at time t.
+ static const double _jacobianLumped[]; ///< Lumped Jacobian.
static const double _orientation[]; ///< Expected values for fault orientation.
static const double _area[]; ///< Expected values for fault area.
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -98,6 +98,34 @@
};
+const double pylith::faults::CohesiveKinDataTet4f::_fieldIncr[] = {
+ 3.1, 4.1, 5.1,
+ 3.2, 4.2, 5.2, // 3
+ 3.3, 4.3, 5.3, // 4
+ 3.4, 4.4, 5.4, // 5
+ 3.5, 4.5, 5.5,
+ 3.6, 4.6, 5.6, // 7
+ 3.8, 4.8, 5.8, // 8
+ 3.0, 4.0, 5.0, // 9
+ 3.7, 4.7, 5.7, // 10
+ 3.9, 4.9, 5.9, // 11
+ 3.1, 4.1, 5.1, // 12
+};
+
+const double pylith::faults::CohesiveKinDataTet4f::_jacobianLumped[] = {
+ 1.1, 1.1, 1.1,
+ 1.2, 1.2, 1.2, // 3
+ 1.3, 1.3, 1.3, // 4
+ 1.4, 1.4, 1.4, // 5
+ 1.5, 1.5, 1.5,
+ 1.6, 1.6, 1.6, // 7
+ 1.8, 1.8, 1.8, // 8
+ 1.0, 1.0, 1.0, // 9
+ 1.0/3.0, 1.0/3.0, 1.0/3.0, // 10
+ 1.0/3.0, 1.0/3.0, 1.0/3.0, // 11
+ 1.0/3.0, 1.0/3.0, 1.0/3.0, // 12
+};
+
const double pylith::faults::CohesiveKinDataTet4f::_orientation[] = {
0.0, -1.0, 0.0, 0.0, 0.0, +1.0, -1.0, 0.0, 0.0,
0.0, -1.0, 0.0, 0.0, 0.0, +1.0, -1.0, 0.0, 0.0,
@@ -575,6 +603,8 @@
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
riseTimeFilename = const_cast<char*>(_riseTimeFilename);
fieldT = const_cast<double*>(_fieldT);
+ fieldIncr = const_cast<double*>(_fieldIncr);
+ jacobianLumped = const_cast<double*>(_jacobianLumped);
orientation = const_cast<double*>(_orientation);
area = const_cast<double*>(_area);
residual = const_cast<double*>(_residual);
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh 2011-09-23 17:26:45 UTC (rev 18965)
@@ -64,6 +64,8 @@
//@}
static const double _fieldT[]; ///< Solution field at time t.
+ static const double _fieldIncr[]; ///< Solution increment field over domain at time t.
+ static const double _jacobianLumped[]; ///< Lumped Jacobian.
static const double _orientation[]; ///< Expected values for fault orientation.
static const double _area[]; ///< Expected values for fault area.
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -127,8 +127,8 @@
1.4, 1.4,
1.5, 1.5, // 6
1.7, 1.7, // 7
- 1.6, 1.6, // 8
- 1.8, 1.8, // 9
+ 1.0, 1.0, // 8
+ 1.0, 1.0, // 9
};
const int pylith::faults::CohesiveKinDataTri3::_numFaultVertices = 2;
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2011-09-23 17:26:45 UTC (rev 18965)
@@ -128,7 +128,37 @@
7.2, 9.2, // 15
};
+const double pylith::faults::CohesiveKinDataTri3d::_fieldIncr[] = {
+ 3.1, 7.1,
+ 3.2, 7.2, // 5
+ 3.3, 7.3, // 6
+ 3.4, 7.4,
+ 3.5, 7.5, // 8
+ 3.6, 7.6,
+ 3.7, 7.7, // 10
+ 3.9, 7.9, // 11
+ 3.1, 7.1, // 12
+ 3.8, 7.8, // 13
+ 3.0, 7.0, // 14
+ 2.2, 5.2, // 15
+};
+const double pylith::faults::CohesiveKinDataTri3d::_jacobianLumped[] = {
+ 6.1, 8.1,
+ 6.2, 8.2, // 5
+ 6.3, 8.3, // 6
+ 6.4, 8.4,
+ 6.5, 8.5, // 8
+ 6.6, 8.6,
+ 6.7, 8.7, // 10
+ 6.9, 8.9, // 11
+ 7.1, 9.1, // 12
+ 2.0, 2.0, // 13
+ 1.0, 1.0, // 14
+ 1.0, 1.0, // 15
+};
+
+
const double pylith::faults::CohesiveKinDataTri3d::_orientation[] = {
+0.70710678118654757, -0.70710678118654757,
-0.70710678118654757, -0.70710678118654757,
@@ -503,6 +533,8 @@
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
riseTimeFilename = const_cast<char*>(_riseTimeFilename);
fieldT = const_cast<double*>(_fieldT);
+ fieldIncr = const_cast<double*>(_fieldIncr);
+ jacobianLumped = const_cast<double*>(_jacobianLumped);
orientation = const_cast<double*>(_orientation);
area = const_cast<double*>(_area);
residual = const_cast<double*>(_residual);
Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh 2011-09-23 00:11:07 UTC (rev 18964)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh 2011-09-23 17:26:45 UTC (rev 18965)
@@ -64,6 +64,8 @@
//@}
static const double _fieldT[]; ///< Solution field at time t.
+ static const double _fieldIncr[]; ///< Solution increment field over domain at time t.
+ static const double _jacobianLumped[]; ///< Lumped Jacobian.
static const double _orientation[]; ///< Expected values for fault orientation.
static const double _area[]; ///< Expected values for fault area.
More information about the CIG-COMMITS
mailing list