[cig-commits] r22019 - in short/3D/PyLith/trunk/unittests/libtests/faults: . data
brad at geodynamics.org
brad at geodynamics.org
Thu May 9 16:24:10 PDT 2013
Author: brad
Date: 2013-05-09 16:24:10 -0700 (Thu, 09 May 2013)
New Revision: 22019
Modified:
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveImpulses.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.cc
Log:
Updated test data to account for changes in order of fault vertices.
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveImpulses.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveImpulses.cc 2013-05-09 23:08:25 UTC (rev 22018)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveImpulses.cc 2013-05-09 23:24:10 UTC (rev 22019)
@@ -287,10 +287,11 @@
for(PetscInt d = 0; d < spaceDim; ++d) {
const PylithScalar valE = valsE[iVertex*spaceDim+d];
- if (fabs(valE) > tolerance)
+ if (fabs(valE) > tolerance) {
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, residualArray[off+d]/valE*residualScale, tolerance);
- else
+ } else {
CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, residualArray[off+d]*residualScale, tolerance);
+ } // if/else
} // for
} // for
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.cc 2013-05-09 23:08:25 UTC (rev 22018)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.cc 2013-05-09 23:24:10 UTC (rev 22019)
@@ -111,22 +111,22 @@
4.2, 6.2, 8.2,
4.3, 6.3, 8.3,
4.4, 6.4, 8.4,
- 4.5, 6.5, 8.5, // 6
- 4.6, 6.6, 8.6, // 7
- 4.7, 6.7, 8.7, // 8
- 4.8, 6.8, 8.8, // 9
+ 4.5, 6.5, 8.5, // 7
+ 4.6, 6.6, 8.6, // 8
+ 4.7, 6.7, 8.7, // 9
+ 4.8, 6.8, 8.8, // 10
4.9, 6.9, 8.9,
4.0, 6.0, 8.0,
5.1, 7.1, 9.1,
5.2, 7.2, 9.2,
- 5.3, 7.3, 9.3, // 14
- 5.5, 7.5, 9.5, // 15
- 5.7, 7.7, 9.7, // 16
- 5.9, 7.9, 9.9, // 17
- 5.4, 7.4, 9.4, // 18
- 5.6, 7.6, 9.6, // 19
- 5.8, 7.8, 9.8, // 20
- 5.0, 7.0, 9.0, // 21
+ 5.3, 7.3, 9.3, // 15
+ 5.5, 7.5, 9.5, // 16
+ 5.7, 7.7, 9.7, // 17
+ 5.9, 7.9, 9.9, // 18
+ 5.4, 7.4, 9.4, // 19
+ 5.6, 7.6, 9.6, // 20
+ 5.8, 7.8, 9.8, // 21
+ 5.0, 7.0, 9.0, // 22
};
const PylithScalar pylith::faults::CohesiveImpulsesDataHex8::_fieldIncr[] = {
@@ -134,22 +134,22 @@
3.2, 4.2, 5.2,
3.3, 4.3, 5.3,
3.4, 4.4, 5.4,
- 3.5, 4.5, 5.5, // 6
- 3.6, 4.6, 5.6, // 7
- 3.7, 4.7, 5.7, // 8
- 3.8, 4.8, 5.8, // 9
+ 3.5, 4.5, 5.5, // 7
+ 3.6, 4.6, 5.6, // 8
+ 3.7, 4.7, 5.7, // 9
+ 3.8, 4.8, 5.8, // 10
3.9, 4.9, 5.9,
3.0, 4.0, 5.0,
3.1, 4.1, 5.1,
3.2, 4.2, 5.2,
- 3.3, 4.3, 5.3, // 14
- 3.5, 4.5, 5.5, // 15
- 3.7, 4.7, 5.7, // 16
- 3.9, 4.9, 5.9, // 17
- 3.4, 4.4, 5.4, // 18
- 3.6, 4.6, 5.6, // 19
- 3.8, 4.8, 5.8, // 20
- 3.0, 4.0, 5.0, // 21
+ 3.3, 4.3, 5.3, // 15
+ 3.5, 4.5, 5.5, // 16
+ 3.7, 4.7, 5.7, // 17
+ 3.9, 4.9, 5.9, // 18
+ 3.4, 4.4, 5.4, // 19
+ 3.6, 4.6, 5.6, // 20
+ 3.8, 4.8, 5.8, // 21
+ 3.0, 4.0, 5.0, // 22
};
// ----------------------------------------------------------------------
@@ -189,30 +189,30 @@
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
- +5.4, +7.4, +9.4, // 6
- +5.6, +7.6, +9.6, // 7
- +5.8, +7.8, +9.8, // 8
- +5.0, +7.0, +9.0, // 9
+ +5.4, +7.4, +9.4, // 7
+ +5.6, +7.6, +9.6, // 8
+ +5.8, +7.8, +9.8, // 9
+ +5.0, +7.0, +9.0, // 10
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
- -5.4, -7.4, -9.4, // 14
- -5.6, -7.6, -9.6, // 15
- -5.8, -7.8, -9.8, // 16
- -5.0, -7.0, -9.0, // 17
+ -5.4, -7.4, -9.4, // 15
+ -5.6, -7.6, -9.6, // 16
+ -5.8, -7.8, -9.8, // 17
+ -5.0, -7.0, -9.0, // 18
- // 18 (constraint)
+ // 19 (constraint)
-(5.3-4.5+0.0), -(7.3-6.5+0.0), -(9.3-8.5+0.0),
- // 19 (constraint)
- -(5.5-4.6+0.0), -(7.5-6.6+0.0), -(9.5-8.6-1.6),
+ // 20 (constraint)
+ -(5.5-4.6+0.0), -(7.5-6.6+0.0), -(9.5-8.6+0.0),
- // 20 (constraint)
+ // 21 (constraint)
-(5.7-4.7+0.0), -(7.7-6.7+0.0), -(9.7-8.7+0.0),
- // 21 (constraint)
- -(5.9-4.8+0.0), -(7.9-6.8+0.0), -(9.9-8.8+0.0),
+ // 22 (constraint)
+ -(5.9-4.8+0.0), -(7.9-6.8+0.0), -(9.9-8.8-1.2),
};
pylith::faults::CohesiveImpulsesDataHex8::CohesiveImpulsesDataHex8(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.cc 2013-05-09 23:08:25 UTC (rev 22018)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.cc 2013-05-09 23:24:10 UTC (rev 22019)
@@ -97,27 +97,27 @@
const PylithScalar pylith::faults::CohesiveImpulsesDataQuad4::_fieldT[] = {
8.1, 9.1,
8.2, 9.2,
- 8.3, 9.3, // 4
- 8.4, 9.4, // 5
+ 8.3, 9.3, // 5
+ 8.4, 9.4, // 6
8.5, 9.5,
8.6, 9.6,
- 8.7, 9.7, // 8
- 8.9, 9.9, // 9
- 8.8, 9.8, // 10
- 8.0, 9.0, // 11
+ 8.7, 9.7, // 9
+ 8.9, 9.9, // 10
+ 8.8, 9.8, // 11
+ 8.0, 9.0, // 12
};
const PylithScalar pylith::faults::CohesiveImpulsesDataQuad4::_fieldIncr[] = {
3.1, 4.1,
3.2, 4.2,
- 3.3, 4.3, // 4
- 3.4, 4.4, // 5
+ 3.3, 4.3, // 5
+ 3.4, 4.4, // 6
3.5, 4.5,
3.6, 4.6,
- 3.7, 4.7, // 8
- 3.9, 4.9, // 9
- 3.8, 4.8, // 10
- 3.0, 4.0, // 11
+ 3.7, 4.7, // 9
+ 3.9, 4.9, // 10
+ 3.8, 4.8, // 11
+ 3.0, 4.0, // 12
};
// ----------------------------------------------------------------------
@@ -152,16 +152,16 @@
const PylithScalar pylith::faults::CohesiveImpulsesDataQuad4::_residual[] = {
0.0, 0.0,
0.0, 0.0,
- +8.8, +9.8, // 4
- +8.0, +9.0, // 5
+ +8.8, +9.8, // 5
+ +8.0, +9.0, // 6
0.0, 0.0,
0.0, 0.0,
- -8.8, -9.8, // 8
- -8.0, -9.0, // 9
- -(8.7-8.3) + 0.0,
- -(9.7-9.3) + 0.0, // 10
- -(8.9-8.4) + 1.5,
- -(9.9-9.4) + 0.0, // 11
+ -8.8, -9.8, // 9
+ -8.0, -9.0, // 10
+ -(8.7-8.3) + 0.0, // 11
+ -(9.7-9.3) + 0.0,
+ -(8.9-8.4) + 1.5, // 12
+ -(9.9-9.4) + 0.0,
};
pylith::faults::CohesiveImpulsesDataQuad4::CohesiveImpulsesDataQuad4(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.cc 2013-05-09 23:08:25 UTC (rev 22018)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.cc 2013-05-09 23:24:10 UTC (rev 22019)
@@ -94,30 +94,30 @@
const PylithScalar pylith::faults::CohesiveImpulsesDataTet4::_fieldT[] = {
7.1, 8.1, 9.1,
- 7.2, 8.2, 9.2, // 3
- 7.3, 8.3, 9.3, // 4
- 7.4, 8.4, 9.4, // 5
+ 7.2, 8.2, 9.2, // 4
+ 7.3, 8.3, 9.3, // 5
+ 7.4, 8.4, 9.4, // 6
7.5, 8.5, 9.5,
- 7.6, 8.6, 9.6, // 7
- 7.8, 8.8, 9.8, // 8
- 7.0, 8.0, 9.0, // 9
- 7.7, 8.7, 9.7, // 10
- 7.9, 8.9, 9.9, // 11
- 7.1, 8.1, 9.1, // 12
+ 7.6, 8.6, 9.6, // 8
+ 7.8, 8.8, 9.8, // 9
+ 7.0, 8.0, 9.0, // 10
+ 7.7, 8.7, 9.7, // 11
+ 7.9, 8.9, 9.9, // 12
+ 7.1, 8.1, 9.1, // 13
};
const PylithScalar pylith::faults::CohesiveImpulsesDataTet4::_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.2, 4.2, 5.2, // 4
+ 3.3, 4.3, 5.3, // 5
+ 3.4, 4.4, 5.4, // 6
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
+ 3.6, 4.6, 5.6, // 8
+ 3.8, 4.8, 5.8, // 9
+ 3.0, 4.0, 5.0, // 10
+ 3.7, 4.7, 5.7, // 11
+ 3.9, 4.9, 5.9, // 12
+ 3.1, 4.1, 5.1, // 13
};
// ----------------------------------------------------------------------
@@ -154,20 +154,20 @@
const PylithScalar pylith::faults::CohesiveImpulsesDataTet4::_residual[] = {
0.0, 0.0, 0.0,
- +7.7/3.0, +8.7/3.0, +9.7/3.0, // 3
- +7.9/3.0, +8.9/3.0, +9.9/3.0, // 4
- +7.1/3.0, +8.1/3.0, +9.1/3.0, // 5
+ +7.7/3.0, +8.7/3.0, +9.7/3.0, // 4
+ +7.9/3.0, +8.9/3.0, +9.9/3.0, // 5
+ +7.1/3.0, +8.1/3.0, +9.1/3.0, // 6
0.0, 0.0, 0.0,
- -7.7/3.0, -8.7/3.0, -9.7/3.0, // 7
- -7.9/3.0, -8.9/3.0, -9.9/3.0, // 8
- -7.1/3.0, -8.1/3.0, -9.1/3.0, // 9
- -1.0/3.0*(7.6-7.2 - 1.2), // 10
+ -7.7/3.0, -8.7/3.0, -9.7/3.0, // 8
+ -7.9/3.0, -8.9/3.0, -9.9/3.0, // 9
+ -7.1/3.0, -8.1/3.0, -9.1/3.0, // 10
+ -1.0/3.0*(7.6-7.2 + 0.0), // 11
-1.0/3.0*(8.6-8.2 + 0.0),
-1.0/3.0*(9.6-9.2 + 0.0),
- -1.0/3.0*(7.8-7.3 + 0.0), // 11
+ -1.0/3.0*(7.8-7.3 + 0.0), // 12
-1.0/3.0*(8.8-8.3 + 0.0),
-1.0/3.0*(9.8-9.3 + 0.0),
- -1.0/3.0*(7.0-7.4 + 0.0), // 12
+ -1.0/3.0*(7.0-7.4 - 1.5), // 13
-1.0/3.0*(8.0-8.4 + 0.0),
-1.0/3.0*(9.0-9.4 + 0.0),
};
More information about the CIG-COMMITS
mailing list