[cig-commits] [commit] knepley/upgrade-petsc-interface: Setup some prescribed slip unit tests with embedded faults (currently disabled). (69d1381)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Mar 4 16:29:01 PST 2014
Repository : ssh://geoshell/pylith
On branch : knepley/upgrade-petsc-interface
Link : https://github.com/geodynamics/pylith/compare/21f83b235d676ea8662af1e55fe0e6b61a97064f...69d1381cfee5ae37c85808aee9eaaeeab995e8e7
>---------------------------------------------------------------
commit 69d1381cfee5ae37c85808aee9eaaeeab995e8e7
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Tue Mar 4 16:28:49 2014 -0800
Setup some prescribed slip unit tests with embedded faults (currently disabled).
>---------------------------------------------------------------
69d1381cfee5ae37c85808aee9eaaeeab995e8e7
unittests/libtests/faults/Makefile.am | 4 +
.../libtests/faults/TestFaultCohesiveKinCases.cc | 42 ++
.../libtests/faults/TestFaultCohesiveKinCases.hh | 55 ++
...veKinDataQuad4e.cc => CohesiveKinDataQuad4i.cc} | 573 +++++++++++++--------
...veKinDataQuad4e.hh => CohesiveKinDataQuad4i.hh} | 14 +-
...siveKinDataTri3d.cc => CohesiveKinDataTri3g.cc} | 320 ++++--------
...siveKinDataTet4e.hh => CohesiveKinDataTri3g.hh} | 14 +-
unittests/libtests/faults/data/Makefile.am | 6 +
...alslip.spatialdb => quad4i_finalslip.spatialdb} | 5 +-
...isetime.spatialdb => quad4i_risetime.spatialdb} | 5 +-
.../faults/data/quad4i_sliptime.spatialdb} | 5 +-
...nalslip.spatialdb => tri3g_finalslip.spatialdb} | 4 +-
...risetime.spatialdb => tri3g_risetime.spatialdb} | 4 +-
.../faults/data/tri3g_sliptime.spatialdb} | 4 +-
14 files changed, 616 insertions(+), 439 deletions(-)
diff --git a/unittests/libtests/faults/Makefile.am b/unittests/libtests/faults/Makefile.am
index bacb340..db560d7 100644
--- a/unittests/libtests/faults/Makefile.am
+++ b/unittests/libtests/faults/Makefile.am
@@ -115,8 +115,10 @@ testfaults_SOURCES += \
data/CohesiveKinData.cc \
data/CohesiveKinDataTri3.cc \
data/CohesiveKinDataTri3d.cc \
+ data/CohesiveKinDataTri3g.cc \
data/CohesiveKinDataQuad4.cc \
data/CohesiveKinDataQuad4e.cc \
+ data/CohesiveKinDataQuad4i.cc \
data/CohesiveKinDataTet4.cc \
data/CohesiveKinDataTet4e.cc \
data/CohesiveKinDataTet4f.cc \
@@ -181,8 +183,10 @@ noinst_HEADERS += \
data/CohesiveKinData.hh \
data/CohesiveKinDataTri3.hh \
data/CohesiveKinDataTri3d.hh \
+ data/CohesiveKinDataTri3g.hh \
data/CohesiveKinDataQuad4.hh \
data/CohesiveKinDataQuad4e.hh \
+ data/CohesiveKinDataQuad4i.hh \
data/CohesiveKinDataTet4.hh \
data/CohesiveKinDataTet4e.hh \
data/CohesiveKinDataTet4f.hh \
diff --git a/unittests/libtests/faults/TestFaultCohesiveKinCases.cc b/unittests/libtests/faults/TestFaultCohesiveKinCases.cc
index c9b0dfd..d981859 100644
--- a/unittests/libtests/faults/TestFaultCohesiveKinCases.cc
+++ b/unittests/libtests/faults/TestFaultCohesiveKinCases.cc
@@ -70,6 +70,27 @@ pylith::faults::TestFaultCohesiveKinTri3d::setUp(void)
// ----------------------------------------------------------------------
+#include "data/CohesiveKinDataTri3g.hh" // USES CohesiveKinDataTri3g
+CPPUNIT_TEST_SUITE_REGISTRATION( pylith::faults::TestFaultCohesiveKinTri3g );
+
+// Setup testing data.
+void
+pylith::faults::TestFaultCohesiveKinTri3g::setUp(void)
+{ // setUp
+ PYLITH_METHOD_BEGIN;
+
+ TestFaultCohesiveKin::setUp();
+ _data = new CohesiveKinDataTri3g();
+
+ CPPUNIT_ASSERT(_quadrature);
+ feassemble::GeometryLine2D geometry;
+ _quadrature->refGeometry(&geometry);
+
+ PYLITH_METHOD_END;
+} // setUp
+
+
+// ----------------------------------------------------------------------
#include "data/CohesiveKinDataQuad4.hh" // USES CohesiveKinDataQuad4
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::faults::TestFaultCohesiveKinQuad4 );
@@ -112,6 +133,27 @@ pylith::faults::TestFaultCohesiveKinQuad4e::setUp(void)
// ----------------------------------------------------------------------
+#include "data/CohesiveKinDataQuad4i.hh" // USES CohesiveKinDataQuad4i
+CPPUNIT_TEST_SUITE_REGISTRATION( pylith::faults::TestFaultCohesiveKinQuad4i );
+
+// Setup testing data.
+void
+pylith::faults::TestFaultCohesiveKinQuad4i::setUp(void)
+{ // setUp
+ PYLITH_METHOD_BEGIN;
+
+ TestFaultCohesiveKin::setUp();
+ _data = new CohesiveKinDataQuad4i();
+
+ CPPUNIT_ASSERT(_quadrature);
+ feassemble::GeometryLine2D geometry;
+ _quadrature->refGeometry(&geometry);
+
+ PYLITH_METHOD_END;
+} // setUp
+
+
+// ----------------------------------------------------------------------
#include "data/CohesiveKinDataTet4.hh" // USES CohesiveKinDataTet4
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::faults::TestFaultCohesiveKinTet4 );
diff --git a/unittests/libtests/faults/TestFaultCohesiveKinCases.hh b/unittests/libtests/faults/TestFaultCohesiveKinCases.hh
index 92d39ab..40ecc47 100644
--- a/unittests/libtests/faults/TestFaultCohesiveKinCases.hh
+++ b/unittests/libtests/faults/TestFaultCohesiveKinCases.hh
@@ -32,8 +32,10 @@ namespace pylith {
namespace faults {
class TestFaultCohesiveKinTri3;
class TestFaultCohesiveKinTri3d;
+ class TestFaultCohesiveKinTri3g;
class TestFaultCohesiveKinQuad4;
class TestFaultCohesiveKinQuad4e;
+ class TestFaultCohesiveKinQuad4i;
class TestFaultCohesiveKinTet4;
class TestFaultCohesiveKinTet4e;
class TestFaultCohesiveKinTet4f;
@@ -93,6 +95,33 @@ public :
// ----------------------------------------------------------------------
+/// C++ unit testing for FaultCohesiveKin for mesh with 2-D triangular cells.
+class pylith::faults::TestFaultCohesiveKinTri3g : public TestFaultCohesiveKin
+{ // class TestFaultCohesiveKinTri3g
+
+ // CPPUNIT TEST SUITE /////////////////////////////////////////////////
+ CPPUNIT_TEST_SUITE( TestFaultCohesiveKinTri3g );
+
+#if 0
+ CPPUNIT_TEST( testInitialize );
+ CPPUNIT_TEST( testIntegrateResidual );
+ CPPUNIT_TEST( testIntegrateJacobian );
+ CPPUNIT_TEST( testIntegrateJacobianLumped );
+ CPPUNIT_TEST( testCalcTractionsChange );
+#endif
+
+ CPPUNIT_TEST_SUITE_END();
+
+ // PUBLIC METHODS /////////////////////////////////////////////////////
+public :
+
+ /// Setup testing data.
+ void setUp(void);
+
+}; // class TestFaultCohesiveKinTri3g
+
+
+// ----------------------------------------------------------------------
/// C++ unit testing for FaultCohesiveKin for mesh with 2-D quadrilateral cells.
class pylith::faults::TestFaultCohesiveKinQuad4 : public TestFaultCohesiveKin
{ // class TestFaultCohesiveKinQuad4
@@ -142,6 +171,32 @@ public :
}; // class TestFaultCohesiveKinQuad4e
+// ----------------------------------------------------------------------
+/// C++ unit testing for FaultCohesiveKin for mesh with 2-D quadrilateral cells.
+class pylith::faults::TestFaultCohesiveKinQuad4i : public TestFaultCohesiveKin
+{ // class TestFaultCohesiveKinQuad4i
+
+ // 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();
+
+ // PUBLIC METHODS /////////////////////////////////////////////////////
+public :
+
+ /// Setup testing data.
+ void setUp(void);
+
+}; // class TestFaultCohesiveKinQuad4i
+
// ----------------------------------------------------------------------
/// C++ unit testing for FaultCohesiveKin for mesh with 3-D tetrahedral cells.
diff --git a/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc b/unittests/libtests/faults/data/CohesiveKinDataQuad4i.cc
similarity index 52%
copy from unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
copy to unittests/libtests/faults/data/CohesiveKinDataQuad4i.cc
index 6669342..bfa18d4 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataQuad4i.cc
@@ -18,219 +18,186 @@
/* Original mesh
*
- * Cells are 0-3, vertices are 4-12.
- *
- * 10 --------11 --------12
- * | | |
- * | | |
- * | | |
- * | | |
- * | | |
- * | | |
- * | | |
- * | | |
- * 5 -------- 7 -------- 9
- * | | |
- * | | |
- * | | |
- * | | |
- * | | |
- * | | |
- * | | |
- * | | |
- * 4 -------- 6 -------- 8
- *
- * After adding cohesive elements
- *
- * Cells are 0-3,4-5 vertices are 6-20.
- *
- * 12 --------13-34-17 --------14
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * 7 -------- 9-33-16 --------11
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * | | | |
- * 6 -------- 8-32-15 --------10
*/
-#include "CohesiveKinDataQuad4e.hh"
+#include "CohesiveKinDataQuad4i.hh"
-const char* pylith::faults::CohesiveKinDataQuad4e::_meshFilename =
- "data/quad4e.mesh";
+const char* pylith::faults::CohesiveKinDataQuad4i::_meshFilename =
+ "data/quad4i.mesh";
-const int pylith::faults::CohesiveKinDataQuad4e::_spaceDim = 2;
+const int pylith::faults::CohesiveKinDataQuad4i::_spaceDim = 2;
-const int pylith::faults::CohesiveKinDataQuad4e::_cellDim = 1;
+const int pylith::faults::CohesiveKinDataQuad4i::_cellDim = 1;
-const int pylith::faults::CohesiveKinDataQuad4e::_numBasis = 2;
+const int pylith::faults::CohesiveKinDataQuad4i::_numBasis = 2;
-const int pylith::faults::CohesiveKinDataQuad4e::_numQuadPts = 2;
+const int pylith::faults::CohesiveKinDataQuad4i::_numQuadPts = 2;
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_quadPts[] = {
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_quadPts[2] = {
-1.0, 1.0,
};
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_quadWts[] = {
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_quadWts[2] = {
1.0, 1.0,
};
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_basis[] = {
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_basis[2*2] = {
1.0, 0.0,
0.0, 1.0,
};
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_basisDeriv[] = {
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_basisDeriv[2*2] = {
-0.5, 0.5,
-0.5, 0.5,
};
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_verticesRef[] = {
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_verticesRef[2] = {
-1.0, 1.0
};
-const int pylith::faults::CohesiveKinDataQuad4e::_id = 10;
-
-const char* pylith::faults::CohesiveKinDataQuad4e::_label = "fault";
-
-const char* pylith::faults::CohesiveKinDataQuad4e::_finalSlipFilename =
- "data/quad4e_finalslip.spatialdb";
-
-const char* pylith::faults::CohesiveKinDataQuad4e::_slipTimeFilename =
- "data/quad4e_sliptime.spatialdb";
-
-const char* pylith::faults::CohesiveKinDataQuad4e::_riseTimeFilename =
- "data/quad4e_risetime.spatialdb";
-
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_fieldT[] = {
- 3.1, 5.1,
- 3.2, 5.2,
- 3.3, 5.3, // 6
- 3.4, 5.4, // 7
- 3.5, 5.5,
- 3.6, 5.6,
- 3.7, 5.7,
- 3.8, 5.8, // 11
- 3.9, 5.9,
- 3.0, 5.0, // 13
- 4.2, 6.2, // 14
- 4.4, 6.4, // 15
- 4.1, 6.1, // 32
- 4.3, 6.3, // 33
- 4.5, 6.5, // 34
+const int pylith::faults::CohesiveKinDataQuad4i::_id = 10;
+
+const char* pylith::faults::CohesiveKinDataQuad4i::_label = "fault";
+
+const char* pylith::faults::CohesiveKinDataQuad4i::_finalSlipFilename =
+ "data/quad4i_finalslip.spatialdb";
+
+const char* pylith::faults::CohesiveKinDataQuad4i::_slipTimeFilename =
+ "data/quad4i_sliptime.spatialdb";
+
+const char* pylith::faults::CohesiveKinDataQuad4i::_riseTimeFilename =
+ "data/quad4i_risetime.spatialdb";
+
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_fieldT[(15+3)*2] = {
+ 3.1, 5.1, // 9
+ 3.2, 5.2, // 10
+ 3.3, 5.3, // 11
+ 3.4, 5.4, // 12
+ 3.5, 5.5, // 13
+ 3.6, 5.6, // 14
+ 3.7, 5.7, // 15
+ 3.8, 5.8, // 16
+ 3.9, 5.9, // 17
+ 3.0, 5.0, // 18
+ 4.2, 6.2, // 19
+ 4.4, 6.4, // 20
+ 4.1, 6.1, // 21
+ 4.3, 6.3, // 22
+ 4.5, 6.5, // 23
+ 4.7, 6.6, // 44
+ 4.9, 6.7, // 45
+ 4.6, 6.8, // 46
};
-const PylithScalar 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, // 32
- 5.3, 3.3, // 33
- 5.5, 3.5, // 34
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_fieldIncr[(15+3)*2] = {
+ 6.1, 4.1, // 9
+ 6.2, 4.2, // 10
+ 6.3, 4.3, // 11
+ 6.4, 4.4, // 12
+ 6.5, 4.5, // 13
+ 6.6, 4.6, // 14
+ 6.7, 4.7, // 15
+ 6.8, 4.8, // 16
+ 6.9, 4.9, // 17
+ 6.0, 4.0, // 18
+ 5.2, 3.2, // 19
+ 5.4, 3.4, // 20
+ 5.1, 3.1, // 21
+ 5.3, 3.3, // 22
+ 5.5, 3.5, // 23
+ 5.7, 3.7, // 44
+ 5.9, 3.9, // 45
+ 5.6, 3.2, // 46
};
-const PylithScalar 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, // 32
- 1.0, 1.0, // 33
- 1.0, 1.0, // 34
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobianLumped[(15+3)*2] = {
+ 1.1, 7.1, // 9
+ 1.2, 7.2, // 10
+ 1.3, 7.3, // 11
+ 1.4, 7.4, // 12
+ 1.5, 7.5, // 13
+ 1.6, 7.6, // 14
+ 1.7, 7.7, // 15
+ 1.8, 7.8, // 16
+ 1.9, 7.9, // 17
+ 1.0, 7.0, // 18
+ 2.2, 3.2, // 19
+ 2.4, 3.4, // 20
+ 2.6, 3.5, // 21
+ 2.8, 3.6, // 22
+ 3.0, 3.7, // 23
+ 1.0, 1.0, // 44
+ 1.0, 1.0, // 45
+ 1.0, 1.0, // 46
};
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_orientation[] = {
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_orientation[3*2*2] = {
0.0, +1.0, 1.0, 0.0,
0.0, +1.0, 1.0, 0.0,
0.0, +1.0, 1.0, 0.0,
};
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_area[] = {
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_area[3] = {
1.0,
2.0,
1.0,
};
-const int pylith::faults::CohesiveKinDataQuad4e::_numFaultVertices = 3;
-const int pylith::faults::CohesiveKinDataQuad4e::_verticesFault[] = {
+const int pylith::faults::CohesiveKinDataQuad4i::_numFaultVertices = 3;
+const int pylith::faults::CohesiveKinDataQuad4i::_verticesFault[3] = {
4, 5, 6
};
-const int pylith::faults::CohesiveKinDataQuad4e::_edgesLagrange[] = {
- 32, 33, 34
+const int pylith::faults::CohesiveKinDataQuad4i::_edgesLagrange[3] = {
+ 44, 45, 46
};
-const int pylith::faults::CohesiveKinDataQuad4e::_verticesNegative[] = {
- 8, 9, 13
+const int pylith::faults::CohesiveKinDataQuad4i::_verticesNegative[3] = {
+ 13, 16, 19
};
-const int pylith::faults::CohesiveKinDataQuad4e::_verticesPositive[] = {
- 15, 16, 17
+const int pylith::faults::CohesiveKinDataQuad4i::_verticesPositive[3] = {
+ 21, 22, 23
};
-const int pylith::faults::CohesiveKinDataQuad4e::_numCohesiveCells = 2;
-const int pylith::faults::CohesiveKinDataQuad4e::_cellMappingFault[] = {
+const int pylith::faults::CohesiveKinDataQuad4i::_numCohesiveCells = 2;
+const int pylith::faults::CohesiveKinDataQuad4i::_cellMappingFault[2] = {
7, 8
};
-const int pylith::faults::CohesiveKinDataQuad4e::_cellMappingCohesive[] = {
+const int pylith::faults::CohesiveKinDataQuad4i::_cellMappingCohesive[2] = {
4, 5
};
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_residual[] = {
- 0.0, 0.0,
- 0.0, 0.0,
- +1.0*4.1, +1.0*6.1, // 6
- +2.0*4.3, +2.0*6.3, // 7
- 0.0, 0.0,
- 0.0, 0.0,
- 0.0, 0.0,
- +1.0*4.5, +1.0*6.5, // 11
- 0.0, 0.0,
- -1.0*4.1, -1.0*6.1, // 13
- -2.0*4.3, -2.0*6.3, // 14
- -1.0*4.5, -1.0*6.5, // 15
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_residual[(15+3)*2] = {
+ 0.0, 0.0, // 9
+ 0.0, 0.0, // 10
+ 0.0, 0.0, // 11
+ 0.0, 0.0, // 12
+ 0.0, 0.0, // 13
+ 0.0, 0.0, // 14
+ 0.0, 0.0, // 15
+ 0.0, 0.0, // 16
+ 0.0, 0.0, // 17
+ 0.0, 0.0, // 18
+ 0.0, 0.0, // 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), // 32
+ -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), // 33
+ -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), // 34
+ -1.0*(6.4-5.8 - 1.59887481971), // 46
};
-const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
- 0.0, 0.0, // 4x
+const PylithScalar pylith::faults::CohesiveKinDataQuad4i::_jacobian[(15+3)*2*(15+3)*2] = {
+ 0.0, 0.0, // 9x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -245,10 +212,10 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 4y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 9y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -260,13 +227,13 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 5x
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, // 10x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -275,7 +242,6 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 5y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -285,12 +251,12 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 10y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 6x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -302,10 +268,9 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- -1.0, 0.0, // 16
0.0, 0.0,
+ 0.0, 0.0, // 11x
0.0, 0.0,
- 0.0, 0.0, // 6y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -317,13 +282,12 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,-1.0, // 16
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 7x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 11y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -333,9 +297,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- -2.0, 0.0, // 17
0.0, 0.0,
- 0.0, 0.0, // 7y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -343,14 +305,13 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 12x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,-2.0, // 17
0.0, 0.0,
- 0.0, 0.0, // 8x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -362,10 +323,10 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 12y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 8y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -380,7 +341,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 9x
+ 0.0, 0.0, // 13x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -395,10 +356,10 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 9y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 13y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -410,13 +371,13 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 10x
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, // 14x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -425,7 +386,6 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 10y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -435,12 +395,12 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 14y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 11x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -453,9 +413,8 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 15x
0.0, 0.0,
- -1.0, 0.0, // 18
- 0.0, 0.0, // 11y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -469,11 +428,10 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,-1.0, // 18
- 0.0, 0.0, // 12x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 15y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -485,13 +443,13 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 12y
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, // 16x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -500,7 +458,6 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 13x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -510,12 +467,11 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 16y
0.0, 0.0,
0.0, 0.0,
- +1.0, 0.0, // 16
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 13y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -527,10 +483,9 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,+1.0, // 16
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 14x
+ 0.0, 0.0, // 17x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -543,13 +498,12 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +2.0, 0.0, // 17
0.0, 0.0,
- 0.0, 0.0, // 14y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 17y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -558,9 +512,7 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,+2.0, // 17
0.0, 0.0,
- 0.0, 0.0, // 15x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -569,13 +521,12 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 18x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +1.0, 0.0, // 18
- 0.0, 0.0, // 15y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -588,101 +539,315 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 18y
0.0, 0.0,
- 0.0,+1.0, // 18
- 0.0, 0.0, // 16x
0.0, 0.0,
- -1.0, 0.0, // 6
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.0, 0.0, // 13
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 16y
0.0, 0.0,
- 0.0,-1.0, // 6
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 19x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,+1.0, // 13
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 17x
0.0, 0.0,
0.0, 0.0,
- -2.0, 0.0, // 7
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +2.0, 0.0, // 14
0.0, 0.0,
+ 0.0, 0.0, // 19y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 17y
0.0, 0.0,
0.0, 0.0,
- 0.0,-2.0, // 7
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,+2.0, // 14
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 18x
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 20x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- -1.0, 0.0, // 11
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +1.0, 0.0, // 15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 18y
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.0, // 11
+ 0.0, 0.0,
+ 0.0, 0.0, // 20y
+ 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, // 21x
+ 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, // 21y
+ 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, // 22x
+ 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, // 22y
+ 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, // 23x
+ 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, // 23y
+ 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, // 44x
+ 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, // 44y
+ 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, // 45x
+ 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, // 45y
+ 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, // 46x
+ 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, // 46y
+ 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.0, // 15
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
};
-pylith::faults::CohesiveKinDataQuad4e::CohesiveKinDataQuad4e(void)
+pylith::faults::CohesiveKinDataQuad4i::CohesiveKinDataQuad4i(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
spaceDim = _spaceDim;
@@ -716,7 +881,7 @@ pylith::faults::CohesiveKinDataQuad4e::CohesiveKinDataQuad4e(void)
numCohesiveCells = _numCohesiveCells;
} // constructor
-pylith::faults::CohesiveKinDataQuad4e::~CohesiveKinDataQuad4e(void)
+pylith::faults::CohesiveKinDataQuad4i::~CohesiveKinDataQuad4i(void)
{}
diff --git a/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh b/unittests/libtests/faults/data/CohesiveKinDataQuad4i.hh
similarity index 91%
copy from unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
copy to unittests/libtests/faults/data/CohesiveKinDataQuad4i.hh
index fe98465..7616712 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
+++ b/unittests/libtests/faults/data/CohesiveKinDataQuad4i.hh
@@ -16,28 +16,28 @@
// ======================================================================
//
-#if !defined(pylith_faults_cohesivekindataquad4e_hh)
-#define pylith_faults_cohesivekindataquad4e_hh
+#if !defined(pylith_faults_cohesivekindataquad4i_hh)
+#define pylith_faults_cohesivekindataquad4i_hh
#include "CohesiveKinData.hh"
namespace pylith {
namespace faults {
- class CohesiveKinDataQuad4e;
+ class CohesiveKinDataQuad4i;
} // pylith
} // faults
-class pylith::faults::CohesiveKinDataQuad4e : public CohesiveKinData
+class pylith::faults::CohesiveKinDataQuad4i : public CohesiveKinData
{
// PUBLIC METHODS ///////////////////////////////////////////////////////
public:
/// Constructor
- CohesiveKinDataQuad4e(void);
+ CohesiveKinDataQuad4i(void);
/// Destructor
- ~CohesiveKinDataQuad4e(void);
+ ~CohesiveKinDataQuad4i(void);
// PRIVATE MEMBERS //////////////////////////////////////////////////////
private:
@@ -84,7 +84,7 @@ private:
};
-#endif // pylith_faults_cohesivekindataquad4e_hh
+#endif // pylith_faults_cohesivekindataquad4i_hh
// End of file
diff --git a/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc b/unittests/libtests/faults/data/CohesiveKinDataTri3g.cc
similarity index 50%
copy from unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
copy to unittests/libtests/faults/data/CohesiveKinDataTri3g.cc
index 2abbc18..9182db6 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataTri3g.cc
@@ -18,226 +18,152 @@
/* Original mesh
*
- * Cells are 0-3, vertices are 4-9.
- *
- *
- * 9
- * / \
- * / \
- * / \
- * / \
- * 8---------5
- * \ /|\
- * \ / | \
- * \ / | \
- * \ / | \
- * 4 | 7
- * \ | /
- * \ | /
- * \ | /
- * \|/
- * 6
- *
- *
- * After adding cohesive elements
- *
- * Cells are 0-3, 4-5, vertices are 6-14,15-17.
- *
- * 11
- * / \
- * / \
- * / \
- * / \
- * 10--------- 7
- * 28 | 26/|
- * 14--------12 |
- * \ /| |\
- * \ / | | \
- * \ / | | \
- * \ / | | \
- * 6 | | 9
- * \ | | /
- * \ | | /
- * \ | | /
- * \| |/
- * 13-8
- * 27
*/
-#include "CohesiveKinDataTri3d.hh"
+#include "CohesiveKinDataTri3g.hh"
-const char* pylith::faults::CohesiveKinDataTri3d::_meshFilename =
- "data/tri3d.mesh";
+const char* pylith::faults::CohesiveKinDataTri3g::_meshFilename =
+ "data/tri3g.mesh";
-const int pylith::faults::CohesiveKinDataTri3d::_spaceDim = 2;
+const int pylith::faults::CohesiveKinDataTri3g::_spaceDim = 2;
-const int pylith::faults::CohesiveKinDataTri3d::_cellDim = 1;
+const int pylith::faults::CohesiveKinDataTri3g::_cellDim = 1;
-const int pylith::faults::CohesiveKinDataTri3d::_numBasis = 2;
+const int pylith::faults::CohesiveKinDataTri3g::_numBasis = 2;
-const int pylith::faults::CohesiveKinDataTri3d::_numQuadPts = 2;
+const int pylith::faults::CohesiveKinDataTri3g::_numQuadPts = 2;
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_quadPts[] = {
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_quadPts[2] = {
-1.0, 1.0,
};
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_quadWts[] = {
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_quadWts[2] = {
1.0, 1.0
};
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_basis[] = {
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_basis[2*2] = {
1.0, 0.0,
0.0, 1.0,
};
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_basisDeriv[] = {
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_basisDeriv[2*2] = {
-0.5, 0.5,
-0.5, 0.5,
};
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_verticesRef[] = {
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_verticesRef[2] = {
-1.0, 1.0
};
-const int pylith::faults::CohesiveKinDataTri3d::_id = 10;
+const int pylith::faults::CohesiveKinDataTri3g::_id = 10;
-const char* pylith::faults::CohesiveKinDataTri3d::_label = "fault";
+const char* pylith::faults::CohesiveKinDataTri3g::_label = "fault";
-const char* pylith::faults::CohesiveKinDataTri3d::_finalSlipFilename =
- "data/tri3d_finalslip.spatialdb";
+const char* pylith::faults::CohesiveKinDataTri3g::_finalSlipFilename =
+ "data/tri3g_finalslip.spatialdb";
-const char* pylith::faults::CohesiveKinDataTri3d::_slipTimeFilename =
- "data/tri3d_sliptime.spatialdb";
+const char* pylith::faults::CohesiveKinDataTri3g::_slipTimeFilename =
+ "data/tri3g_sliptime.spatialdb";
-const char* pylith::faults::CohesiveKinDataTri3d::_riseTimeFilename =
- "data/tri3d_risetime.spatialdb";
+const char* pylith::faults::CohesiveKinDataTri3g::_riseTimeFilename =
+ "data/tri3g_risetime.spatialdb";
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_fieldT[] = {
- 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
- 6.8, 8.8, // 26
- 6.0, 8.0, // 27
- 7.2, 9.2, // 28
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_fieldT[(9+2)*2] = {
+ 6.1, 8.1, // 8
+ 6.2, 8.2, // 9
+ 6.3, 8.3, // 10
+ 6.4, 8.4, // 11
+ 6.5, 8.5, // 12
+ 6.6, 8.6, // 13
+ 6.7, 8.7, // 14
+ 6.9, 8.9, // 15
+ 7.1, 9.1, // 16
+ 6.8, 8.8, // 31
+ 6.0, 8.0, // 32
};
-const PylithScalar 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, // 26
- 3.0, 7.0, // 27
- 2.2, 5.2, // 28
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_fieldIncr[(9+2)*2] = {
+ 3.1, 7.1, // 8
+ 3.2, 7.2, // 9
+ 3.3, 7.3, // 10
+ 3.4, 7.4, // 11
+ 3.5, 7.5, // 12
+ 3.6, 7.6, // 13
+ 3.7, 7.7, // 14
+ 3.9, 7.9, // 15
+ 3.1, 7.1, // 16
+ 3.8, 7.8, // 31
+ 3.0, 7.0, // 32
};
-const PylithScalar 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
- 1.0, 1.0, // 26
- 1.0, 1.0, // 27
- 1.0, 1.0, // 28
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_jacobianLumped[(9+2)*2] = {
+ 6.1, 8.1, // 8
+ 6.2, 8.2, // 9
+ 6.3, 8.3, // 10
+ 6.4, 8.4, // 11
+ 6.5, 8.5, // 12
+ 6.6, 8.6, // 13
+ 6.7, 8.7, // 14
+ 6.9, 8.9, // 15
+ 7.1, 9.1, // 16
+ 1.0, 1.0, // 31
+ 1.0, 1.0, // 32
};
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_orientation[] = {
- -0.70710678118654757, +0.70710678118654757,
- +0.70710678118654757, +0.70710678118654757,
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_orientation[2*2*2] = {
+ 0.0, +1.0, +1.0, 0.0,
0.0, +1.0, +1.0, 0.0,
- -1.0, 0.0, 0.0, +1.0
};
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_area[] = {
- 2.0,
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_area[2] = {
1.0,
1.0,
};
-const int pylith::faults::CohesiveKinDataTri3d::_numFaultVertices = 3;
-const int pylith::faults::CohesiveKinDataTri3d::_verticesFault[] = {
- 4, 5, 6
+const int pylith::faults::CohesiveKinDataTri3g::_numFaultVertices = 2;
+const int pylith::faults::CohesiveKinDataTri3g::_verticesFault[2] = {
+ 4, 5,
};
-const int pylith::faults::CohesiveKinDataTri3d::_edgesLagrange[] = {
- 26, 27, 28
+const int pylith::faults::CohesiveKinDataTri3g::_edgesLagrange[2] = {
+ 31, 32,
};
-const int pylith::faults::CohesiveKinDataTri3d::_verticesNegative[] = {
- 7, 8, 10
+const int pylith::faults::CohesiveKinDataTri3g::_verticesNegative[2] = {
+ 10, 13,
};
-const int pylith::faults::CohesiveKinDataTri3d::_verticesPositive[] = {
- 12, 13, 14
+const int pylith::faults::CohesiveKinDataTri3g::_verticesPositive[2] = {
+ 15, 16,
};
-const int pylith::faults::CohesiveKinDataTri3d::_numCohesiveCells = 2;
-const int pylith::faults::CohesiveKinDataTri3d::_cellMappingFault[] = {
- 7, 8
+const int pylith::faults::CohesiveKinDataTri3g::_numCohesiveCells = 1;
+const int pylith::faults::CohesiveKinDataTri3g::_cellMappingFault[1] = {
+ 0,
};
-const int pylith::faults::CohesiveKinDataTri3d::_cellMappingCohesive[] = {
- 4, 5
+const int pylith::faults::CohesiveKinDataTri3g::_cellMappingCohesive[1] = {
+ 7,
};
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_residual[] = {
- 0.0, 0.0,
- +2.0*6.8, +2.0*8.8, // 5
- +1.0*6.0, +1.0*8.0, // 6
- 0.0, 0.0,
- +1.0*7.2, +1.0*9.2, // 8
- 0.0, 0.0,
- -2.0*6.8, -2.0*8.8, // 10
- -1.0*6.0, -1.0*8.0, // 6
- -1.0*7.2, -1.0*9.2, // 8
- -2.0*(6.7-6.2 +0.70710678118654757*(1.89546413727-0.08241148423)),
- -2.0*(8.7-8.2 +0.70710678118654757*(-1.89546413727-0.08241148423)), // 26
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_residual[(9+2)*2] = {
+ 0.0, 0.0, // 8
+ 0.0, 0.0, // 9
+ +1.0*6.0, +1.0*8.0, // 10
+ 0.0, 0.0, // 11
+ 0.0, 0.0, // 12
+ -2.0*6.8, -2.0*8.8, // 13
+ -1.0*6.0, -1.0*8.0, // 15
+ 0.0, 0.0, // 14
+ -1.0*7.2, -1.0*9.2, // 16
+ -2.0*(6.7-6.2 +1.89546413727),
+ -2.0*(8.7-8.2 -1.89546413727), // 31
-1.0*(6.9-6.3 -0.14794836271),
- -1.0*(8.9-8.3 -1.77538035254), // 27
- -1.0*(7.1-6.5 +1.59887481971),
- -1.0*(9.1-8.5 -0.19186497837), // 28
+ -1.0*(8.9-8.3 -1.77538035254), // 32
};
-const PylithScalar pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
- 0.0, 0.0, // 4x
- 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, // 4y
- 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,
+const PylithScalar pylith::faults::CohesiveKinDataTri3g::_jacobian[(9+2)*2*(9+2)*2] = {
+ 0.0, 0.0, // 8x
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 5x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -246,10 +172,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- -2.0, 0.0, // 13
+ 0.0, 0.0, // 8y
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 5y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -258,10 +183,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,-2.0, // 13
+ 0.0, 0.0, // 9x
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 6x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -270,10 +194,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 9y
0.0, 0.0,
- -1.0, 0.0, // 14
0.0, 0.0,
- 0.0, 0.0, // 6y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -282,10 +205,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 10x
0.0, 0.0,
- 0.0,-1.0, // 14
0.0, 0.0,
- 0.0, 0.0, // 7x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -294,10 +216,10 @@ const PylithScalar pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 10y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 7y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
@@ -305,205 +227,185 @@ const PylithScalar pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 11x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 8x
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, // 11y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- -1.0, 0.0, // 15
- 0.0, 0.0, // 8y
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, // 12x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,-1.0, // 15
- 0.0, 0.0, // 9x
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, // 12y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 9y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 13x
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, // 10x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 13y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +2.0, 0.0, // 13
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 10y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 14x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,+2.0, // 13
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 11x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 14y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +1.0, 0.0, // 14
0.0, 0.0,
- 0.0, 0.0, // 11y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 15x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,+1.0, // 14
0.0, 0.0,
- 0.0, 0.0, // 12x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 15y
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.0, 0.0, // 15
- 0.0, 0.0, // 12y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 16x
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.0, // 15
- 0.0, 0.0, // 13x
- -2.0, 0.0, // 5
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +2.0, 0.0, // 10
+ 0.0, 0.0, // 16y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 13y
- 0.0,-2.0, // 5
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,+2.0, // 10
0.0, 0.0,
+ 0.0, 0.0, // 31x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 14x
0.0, 0.0,
- -1.0, 0.0, // 6
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +1.0, 0.0, // 11
0.0, 0.0,
+ 0.0, 0.0, // 31y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 14y
0.0, 0.0,
- 0.0,-1.0, // 6
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,+1.0, // 11
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 32x
0.0, 0.0,
0.0, 0.0,
- 0.0, 0.0, // 15x
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- -1.0, 0.0, // 8
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- +1.0, 0.0, // 12
0.0, 0.0,
0.0, 0.0,
+ 0.0, 0.0, // 32y
0.0, 0.0,
- 0.0, 0.0, // 15y
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,-1.0, // 8
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
- 0.0,+1.0, // 12
0.0, 0.0,
0.0, 0.0,
0.0, 0.0,
};
-pylith::faults::CohesiveKinDataTri3d::CohesiveKinDataTri3d(void)
+pylith::faults::CohesiveKinDataTri3g::CohesiveKinDataTri3g(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
spaceDim = _spaceDim;
@@ -537,7 +439,7 @@ pylith::faults::CohesiveKinDataTri3d::CohesiveKinDataTri3d(void)
numCohesiveCells = _numCohesiveCells;
} // constructor
-pylith::faults::CohesiveKinDataTri3d::~CohesiveKinDataTri3d(void)
+pylith::faults::CohesiveKinDataTri3g::~CohesiveKinDataTri3g(void)
{}
diff --git a/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh b/unittests/libtests/faults/data/CohesiveKinDataTri3g.hh
similarity index 91%
copy from unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
copy to unittests/libtests/faults/data/CohesiveKinDataTri3g.hh
index 47377c8..9a79976 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
+++ b/unittests/libtests/faults/data/CohesiveKinDataTri3g.hh
@@ -16,28 +16,28 @@
// ======================================================================
//
-#if !defined(pylith_faults_cohesivekindatatet4e_hh)
-#define pylith_faults_cohesivekindatatet4e_hh
+#if !defined(pylith_faults_cohesivekindatatri3g_hh)
+#define pylith_faults_cohesivekindatatri3g_hh
#include "CohesiveKinData.hh"
namespace pylith {
namespace faults {
- class CohesiveKinDataTet4e;
+ class CohesiveKinDataTri3g;
} // pylith
} // faults
-class pylith::faults::CohesiveKinDataTet4e : public CohesiveKinData
+class pylith::faults::CohesiveKinDataTri3g : public CohesiveKinData
{
// PUBLIC METHODS ///////////////////////////////////////////////////////
public:
/// Constructor
- CohesiveKinDataTet4e(void);
+ CohesiveKinDataTri3g(void);
/// Destructor
- ~CohesiveKinDataTet4e(void);
+ ~CohesiveKinDataTri3g(void);
// PRIVATE MEMBERS //////////////////////////////////////////////////////
private:
@@ -84,7 +84,7 @@ private:
};
-#endif // pylith_faults_cohesivekindatatet4e_hh
+#endif // pylith_faults_cohesivekindatatri3g_hh
// End of file
diff --git a/unittests/libtests/faults/data/Makefile.am b/unittests/libtests/faults/data/Makefile.am
index f5e16be..a1edf9a 100644
--- a/unittests/libtests/faults/data/Makefile.am
+++ b/unittests/libtests/faults/data/Makefile.am
@@ -36,6 +36,9 @@ dist_noinst_DATA = \
tri3d_finalslip.spatialdb \
tri3d_sliptime.spatialdb \
tri3d_risetime.spatialdb \
+ tri3g_finalslip.spatialdb \
+ tri3g_sliptime.spatialdb \
+ tri3g_risetime.spatialdb \
tri3_initialtract.spatialdb \
tri3_changetract.spatialdb \
tri3d_initialtract.spatialdb \
@@ -55,6 +58,9 @@ dist_noinst_DATA = \
quad4e_finalslip.spatialdb \
quad4e_sliptime.spatialdb \
quad4e_risetime.spatialdb \
+ quad4i_finalslip.spatialdb \
+ quad4i_sliptime.spatialdb \
+ quad4i_risetime.spatialdb \
quad4_initialtract.spatialdb \
quad4_impulses.spatialdb \
tet4.mesh \
diff --git a/unittests/libtests/faults/data/quad4_finalslip.spatialdb b/unittests/libtests/faults/data/quad4i_finalslip.spatialdb
similarity index 77%
copy from unittests/libtests/faults/data/quad4_finalslip.spatialdb
copy to unittests/libtests/faults/data/quad4i_finalslip.spatialdb
index 8ec12eb..02ce72e 100644
--- a/unittests/libtests/faults/data/quad4_finalslip.spatialdb
+++ b/unittests/libtests/faults/data/quad4i_finalslip.spatialdb
@@ -11,5 +11,6 @@ SimpleDB {
space-dim = 2
}
}
-0.0 +1.0 2.3 0.1
-0.0 -1.0 2.4 0.2
+0.0 0.0 2.3 0.1
+0.0 -10.0 2.4 0.2
+0.0 -20.0 2.5 0.3
diff --git a/unittests/libtests/faults/data/quad4_risetime.spatialdb b/unittests/libtests/faults/data/quad4i_risetime.spatialdb
similarity index 80%
copy from unittests/libtests/faults/data/quad4_risetime.spatialdb
copy to unittests/libtests/faults/data/quad4i_risetime.spatialdb
index 8722df3..ed29240 100644
--- a/unittests/libtests/faults/data/quad4_risetime.spatialdb
+++ b/unittests/libtests/faults/data/quad4i_risetime.spatialdb
@@ -11,5 +11,6 @@ SimpleDB {
space-dim = 2
}
}
-0.0 +1.0 1.4
-0.0 -1.0 1.5
+0.0 0.0 1.4
+0.0 -10.0 1.5
+0.0 -20.0 1.6
diff --git a/unittests/pytests/faults/data/tri3_sliptime.spatialdb b/unittests/libtests/faults/data/quad4i_sliptime.spatialdb
similarity index 79%
copy from unittests/pytests/faults/data/tri3_sliptime.spatialdb
copy to unittests/libtests/faults/data/quad4i_sliptime.spatialdb
index 259672b..8b5d048 100644
--- a/unittests/pytests/faults/data/tri3_sliptime.spatialdb
+++ b/unittests/libtests/faults/data/quad4i_sliptime.spatialdb
@@ -11,5 +11,6 @@ SimpleDB {
space-dim = 2
}
}
-0.0 +1.0 1.2
-0.0 -1.0 1.3
+0.0 0.0 1.2
+0.0 -10.0 1.3
+0.0 -20.0 1.4
diff --git a/unittests/libtests/faults/data/quad4_finalslip.spatialdb b/unittests/libtests/faults/data/tri3g_finalslip.spatialdb
similarity index 83%
copy from unittests/libtests/faults/data/quad4_finalslip.spatialdb
copy to unittests/libtests/faults/data/tri3g_finalslip.spatialdb
index 8ec12eb..17b925a 100644
--- a/unittests/libtests/faults/data/quad4_finalslip.spatialdb
+++ b/unittests/libtests/faults/data/tri3g_finalslip.spatialdb
@@ -11,5 +11,5 @@ SimpleDB {
space-dim = 2
}
}
-0.0 +1.0 2.3 0.1
-0.0 -1.0 2.4 0.2
+ 0.0 0.0 2.3 0.1
+ 0.0 -2.0 2.4 0.2
diff --git a/unittests/libtests/faults/data/tri3_risetime.spatialdb b/unittests/libtests/faults/data/tri3g_risetime.spatialdb
similarity index 85%
copy from unittests/libtests/faults/data/tri3_risetime.spatialdb
copy to unittests/libtests/faults/data/tri3g_risetime.spatialdb
index aa31e81..b8e5001 100644
--- a/unittests/libtests/faults/data/tri3_risetime.spatialdb
+++ b/unittests/libtests/faults/data/tri3g_risetime.spatialdb
@@ -11,5 +11,5 @@ SimpleDB {
space-dim = 2
}
}
-0.0 +1.0 1.4
-0.0 -1.0 1.5
+ 0.0 0.0 1.4
+ 0.0 -2.0 1.5
diff --git a/unittests/pytests/faults/data/tri3_sliptime.spatialdb b/unittests/libtests/faults/data/tri3g_sliptime.spatialdb
similarity index 85%
copy from unittests/pytests/faults/data/tri3_sliptime.spatialdb
copy to unittests/libtests/faults/data/tri3g_sliptime.spatialdb
index 259672b..72751e4 100644
--- a/unittests/pytests/faults/data/tri3_sliptime.spatialdb
+++ b/unittests/libtests/faults/data/tri3g_sliptime.spatialdb
@@ -11,5 +11,5 @@ SimpleDB {
space-dim = 2
}
}
-0.0 +1.0 1.2
-0.0 -1.0 1.3
+ 0.0 0.0 1.2
+ 0.0 -2.0 1.3
More information about the CIG-COMMITS
mailing list