[cig-commits] [commit] knepley/upgrade-petsc-interface: Enabled prescribed slip quad4 embedded fault unit tests. (deb61c5)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Mar 5 17:03:29 PST 2014
Repository : ssh://geoshell/pylith
On branch : knepley/upgrade-petsc-interface
Link : https://github.com/geodynamics/pylith/compare/37e2098396275cfd63fcf1498024739b6fac6398...687c383d3af9cc4c33c72ebdfe5dc3c70ec327a8
>---------------------------------------------------------------
commit deb61c5fdebce5318f69afa2a9e61bd91607d99e
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Wed Mar 5 12:13:40 2014 -0800
Enabled prescribed slip quad4 embedded fault unit tests.
>---------------------------------------------------------------
deb61c5fdebce5318f69afa2a9e61bd91607d99e
.../libtests/faults/TestFaultCohesiveKinCases.hh | 2 -
.../libtests/faults/data/CohesiveKinDataQuad4i.cc | 84 +++++++++++-----------
.../faults/data/quad4i_finalslip.spatialdb | 2 +-
.../libtests/faults/data/quad4i_risetime.spatialdb | 2 +-
.../libtests/faults/data/quad4i_sliptime.spatialdb | 2 +-
5 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/unittests/libtests/faults/TestFaultCohesiveKinCases.hh b/unittests/libtests/faults/TestFaultCohesiveKinCases.hh
index 3fff4b2..a8377f7 100644
--- a/unittests/libtests/faults/TestFaultCohesiveKinCases.hh
+++ b/unittests/libtests/faults/TestFaultCohesiveKinCases.hh
@@ -177,13 +177,11 @@ class pylith::faults::TestFaultCohesiveKinQuad4i : public TestFaultCohesiveKin
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUITE( TestFaultCohesiveKinQuad4i );
-#if 0
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
CPPUNIT_TEST( testIntegrateJacobianLumped );
CPPUNIT_TEST( testCalcTractionsChange );
-#endif
CPPUNIT_TEST_SUITE_END();
diff --git a/unittests/libtests/faults/data/CohesiveKinDataQuad4i.cc b/unittests/libtests/faults/data/CohesiveKinDataQuad4i.cc
index bfa18d4..8558582 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataQuad4i.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataQuad4i.cc
@@ -56,7 +56,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_verticesRef[2] = {
-1.0, 1.0
};
-const int pylith::faults::CohesiveKinDataQuad4i::_id = 10;
+const int pylith::faults::CohesiveKinDataQuad4i::_id = 100;
const char* pylith::faults::CohesiveKinDataQuad4i::_label = "fault";
@@ -144,9 +144,9 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_orientation[3*2*2] =
};
const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_area[3] = {
- 1.0,
- 2.0,
- 1.0,
+ 5.0,
+ 10.0,
+ 5.0,
};
const int pylith::faults::CohesiveKinDataQuad4i::_numFaultVertices = 3;
@@ -165,10 +165,10 @@ const int pylith::faults::CohesiveKinDataQuad4i::_verticesPositive[3] = {
const int pylith::faults::CohesiveKinDataQuad4i::_numCohesiveCells = 2;
const int pylith::faults::CohesiveKinDataQuad4i::_cellMappingFault[2] = {
- 7, 8
+ 7, 8,
};
const int pylith::faults::CohesiveKinDataQuad4i::_cellMappingCohesive[2] = {
- 4, 5
+ 7, 8,
};
@@ -177,23 +177,23 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_residual[(15+3)*2] =
0.0, 0.0, // 10
0.0, 0.0, // 11
0.0, 0.0, // 12
- 0.0, 0.0, // 13
+ +5.0*4.7, +5.0*6.6, // 13
0.0, 0.0, // 14
0.0, 0.0, // 15
- 0.0, 0.0, // 16
+ +10.0*4.9, +10.0*6.7, // 16
0.0, 0.0, // 17
0.0, 0.0, // 18
- 0.0, 0.0, // 19
+ +5.0*4.6, +5.0*6.8, // 19
0.0, 0.0, // 20
- 0.0, 0.0, // 21
- 0.0, 0.0, // 22
- 0.0, 0.0, // 23
- -1.0*(3.0-3.3 - 0.14794836271),
- -1.0*(5.0-5.3 - 1.77538035254), // 44
- -2.0*(4.2-3.4 - 0.08241148423),
- -2.0*(6.2-5.4 - 1.89546413727), // 45
- -1.0*(4.4-3.8 - 0.19186497837),
- -1.0*(6.4-5.8 - 1.59887481971), // 46
+ -5.0*4.7, -5.0*6.6, // 21
+ -10.0*4.9, -10.0*6.7, // 22
+ -5.0*4.6, -5.0*6.8, // 23
+ -5.0*(4.1-3.5 - 0.08241148423),
+ -5.0*(6.1-5.5 - 1.89546413727), // 44
+ -10.0*(4.3-3.8 - 0.14794836271),
+ -10.0*(6.3-5.8 - 1.77538035254), // 45
+ -5.0*(4.5-4.2 - 0.19186497837),
+ -5.0*(6.5-6.2 - 1.59887481971), // 46
};
const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15+3)*2] = {
@@ -356,7 +356,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ -5.0, 0.0, // 44
0.0, 0.0,
0.0, 0.0,
0.0, 0.0, // 13y
@@ -374,7 +374,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ 0.0,-5.0, // 44
0.0, 0.0,
0.0, 0.0,
0.0, 0.0, // 14x
@@ -465,7 +465,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+-10.0, 0.0, // 45
0.0, 0.0,
0.0, 0.0, // 16y
0.0, 0.0,
@@ -483,7 +483,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ 0.0,-10.0, // 45
0.0, 0.0,
0.0, 0.0, // 17x
0.0, 0.0,
@@ -574,7 +574,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ -5.0, 0.0, // 46
0.0, 0.0, // 19y
0.0, 0.0,
0.0, 0.0,
@@ -592,7 +592,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ 0.0,-5.0, // 46
0.0, 0.0, // 20x
0.0, 0.0,
0.0, 0.0,
@@ -644,7 +644,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ +5.0, 0.0, // 44
0.0, 0.0,
0.0, 0.0,
0.0, 0.0, // 21y
@@ -662,7 +662,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ 0.0,+5.0, // 44
0.0, 0.0,
0.0, 0.0,
0.0, 0.0, // 22x
@@ -681,7 +681,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
++10.0, 0.0, // 45
0.0, 0.0,
0.0, 0.0, // 22y
0.0, 0.0,
@@ -699,7 +699,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ 0.0,+10.0, // 45
0.0, 0.0,
0.0, 0.0, // 23x
0.0, 0.0,
@@ -718,7 +718,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ +5.0, 0.0, // 46
0.0, 0.0, // 23y
0.0, 0.0,
0.0, 0.0,
@@ -736,11 +736,12 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
+ 0.0,+5.0, // 46
0.0, 0.0, // 44x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ -5.0, 0.0, // 13
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -748,8 +749,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
+ +5.0, 0.0, // 21
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -759,6 +759,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0,-5.0, // 13
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -766,8 +767,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
+ 0.0,+5.0, // 21
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -780,13 +780,13 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+-10.0, 0.0, // 16
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,
+ +10.0, 0.0, // 22
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -798,13 +798,13 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0,-10.0, // 16
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,+10.0, // 22
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -819,11 +819,11 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ -5.0, 0.0, // 19
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
+ +5.0, 0.0, // 23
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -837,11 +837,11 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0,-5.0, // 19
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
+ 0.0,+5.0, // 23
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
diff --git a/unittests/libtests/faults/data/quad4i_finalslip.spatialdb b/unittests/libtests/faults/data/quad4i_finalslip.spatialdb
index 02ce72e..d9e47f3 100644
--- a/unittests/libtests/faults/data/quad4i_finalslip.spatialdb
+++ b/unittests/libtests/faults/data/quad4i_finalslip.spatialdb
@@ -3,7 +3,7 @@ SimpleDB {
num-values = 2
value-names = left-lateral-slip fault-opening
value-units = m m
- num-locs = 2
+ num-locs = 3
data-dim = 1
space-dim = 2
cs-data = cartesian {
diff --git a/unittests/libtests/faults/data/quad4i_risetime.spatialdb b/unittests/libtests/faults/data/quad4i_risetime.spatialdb
index ed29240..b2ebc74 100644
--- a/unittests/libtests/faults/data/quad4i_risetime.spatialdb
+++ b/unittests/libtests/faults/data/quad4i_risetime.spatialdb
@@ -3,7 +3,7 @@ SimpleDB {
num-values = 1
value-names = rise-time
value-units = s
- num-locs = 2
+ num-locs = 3
data-dim = 1
space-dim = 2
cs-data = cartesian {
diff --git a/unittests/libtests/faults/data/quad4i_sliptime.spatialdb b/unittests/libtests/faults/data/quad4i_sliptime.spatialdb
index 8b5d048..5dd022f 100644
--- a/unittests/libtests/faults/data/quad4i_sliptime.spatialdb
+++ b/unittests/libtests/faults/data/quad4i_sliptime.spatialdb
@@ -3,7 +3,7 @@ SimpleDB {
num-values = 1
value-names = slip-time
value-units = s
- num-locs = 2
+ num-locs = 3
data-dim = 1
space-dim = 2
cs-data = cartesian {
More information about the CIG-COMMITS
mailing list