[cig-commits] [commit] knepley/upgrade-petsc-interface: Updated fault test data for interpolated meshes. (4fd816f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Nov 1 09:48:59 PDT 2013
Repository : ssh://geoshell/pylith
On branch : knepley/upgrade-petsc-interface
Link : https://github.com/geodynamics/pylith/compare/52536faa2c7b081390b2a5999b2d2ed824e13d82...4fd816f765cf48e0d10c86110d8fa9fcba507d4e
>---------------------------------------------------------------
commit 4fd816f765cf48e0d10c86110d8fa9fcba507d4e
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Fri Nov 1 09:51:18 2013 -0700
Updated fault test data for interpolated meshes.
>---------------------------------------------------------------
4fd816f765cf48e0d10c86110d8fa9fcba507d4e
.../libtests/faults/data/CohesiveKinDataHex8.cc | 82 +++++++++++-----------
.../libtests/faults/data/CohesiveKinDataQuad4.cc | 26 +++----
.../libtests/faults/data/CohesiveKinDataQuad4e.cc | 50 ++++++-------
.../libtests/faults/data/CohesiveKinDataTet4.cc | 42 +++++------
.../libtests/faults/data/CohesiveKinDataTet4e.cc | 25 ++-----
.../libtests/faults/data/CohesiveKinDataTet4f.cc | 34 ++++-----
.../faults/data/CohesiveKinSrcsDataHex8.cc | 50 ++++++-------
.../faults/data/CohesiveKinSrcsDataQuad4.cc | 22 +++---
.../faults/data/CohesiveKinSrcsDataTet4.cc | 34 ++++-----
.../faults/data/CohesiveKinSrcsDataTri3.cc | 22 +++---
unittests/libtests/faults/data/adjustsoln.py | 20 +++---
11 files changed, 195 insertions(+), 212 deletions(-)
diff --git a/unittests/libtests/faults/data/CohesiveKinDataHex8.cc b/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
index a949482..a8ded8c 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
@@ -29,7 +29,7 @@
* Cells are 0-1,16 and vertices are 4-15.
*
* 2,3,4,5 -------- 6,7,8,9 -- 14,15,16,17 -------- 10,11,12,13
- * 18,19,20,21
+ * 59,60,61,62
* ^^^^^^^^^^^^^^^^^^^^^^ Cohesive element
*
*/
@@ -124,10 +124,10 @@ const PylithScalar pylith::faults::CohesiveKinDataHex8::_fieldT[] = {
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.4, 7.4, 9.4, // 59
+ 5.6, 7.6, 9.6, // 60
+ 5.8, 7.8, 9.8, // 61
+ 5.0, 7.0, 9.0, // 62
};
const PylithScalar pylith::faults::CohesiveKinDataHex8::_fieldIncr[] = {
@@ -147,10 +147,10 @@ const PylithScalar pylith::faults::CohesiveKinDataHex8::_fieldIncr[] = {
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.4, 4.4, 5.4, // 59
+ 3.6, 4.6, 5.6, // 60
+ 3.8, 4.8, 5.8, // 61
+ 3.0, 4.0, 5.0, // 62
};
const PylithScalar pylith::faults::CohesiveKinDataHex8::_jacobianLumped[] = {
@@ -170,24 +170,24 @@ const PylithScalar pylith::faults::CohesiveKinDataHex8::_jacobianLumped[] = {
1.5, 1.5, 1.5, // 15
1.7, 1.7, 1.7, // 16
1.9, 1.9, 1.9, // 17
- 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
+ 1.0, 1.0, 1.0, // 59
+ 1.0, 1.0, 1.0, // 60
+ 1.0, 1.0, 1.0, // 61
+ 1.0, 1.0, 1.0, // 62
};
const int pylith::faults::CohesiveKinDataHex8::_numFaultVertices = 4;
const int pylith::faults::CohesiveKinDataHex8::_verticesFault[] = {
- 2, 4, 5, 3
+ 2, 3, 4, 5,
};
const int pylith::faults::CohesiveKinDataHex8::_edgesLagrange[] = {
- 19, 21, 22, 20
+ 59, 60, 61, 62
};
const int pylith::faults::CohesiveKinDataHex8::_verticesNegative[] = {
- 7, 9, 10, 8
+ 7, 8, 9, 10
};
const int pylith::faults::CohesiveKinDataHex8::_verticesPositive[] = {
- 15, 17, 18, 16
+ 15, 16, 17, 18
};
const int pylith::faults::CohesiveKinDataHex8::_numCohesiveCells = 1;
@@ -200,10 +200,10 @@ const int pylith::faults::CohesiveKinDataHex8::_cellMappingCohesive[] = {
const PylithScalar pylith::faults::CohesiveKinDataHex8::_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,
- 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,
+ 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,
+ 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,
};
const PylithScalar pylith::faults::CohesiveKinDataHex8::_area[] = {
@@ -228,17 +228,17 @@ const PylithScalar pylith::faults::CohesiveKinDataHex8::_residual[] = {
-5.8, -7.8, -9.8, // 16
-5.0, -7.0, -9.0, // 17
- // 18 (constraint)
- -(5.3-4.5+0.07938069066), -(7.3-6.5+1.82575588523), -(9.3-8.5+0.55566483464),
+ // 59 (constraint)
+ -(5.3-4.5-0.07938069066), -(7.3-6.5-1.82575588523), -(9.3-8.5+0.55566483464),
- // 19 (constraint)
- -(5.5-4.6+0.14140241667), -(7.5-6.6+1.69682900001), -(9.5-8.6+0.56560966667),
+ // 60 (constraint)
+ -(5.5-4.6-0.14140241667), -(7.5-6.6-1.69682900001), -(9.5-8.6+0.56560966667),
- // 20 (constraint)
- -(5.7-4.7+0.18205179147), -(7.7-6.7+1.51709826228), -(9.7-8.7+0.54615537442),
+ // 61 (constraint)
+ -(5.7-4.7-0.18205179147), -(7.7-6.7-1.51709826228), -(9.7-8.7+0.54615537442),
- // 21 (constraint)
- -(5.9-4.8+0.19904410828), -(7.9-6.8+1.29378670385), -(9.9-8.8+0.49761027071),
+ // 62 (constraint)
+ -(5.9-4.8-0.19904410828), -(7.9-6.8-1.29378670385), -(9.9-8.8+0.49761027071),
};
const PylithScalar pylith::faults::CohesiveKinDataHex8::_jacobian[] = {
@@ -1449,22 +1449,22 @@ const PylithScalar pylith::faults::CohesiveKinDataHex8::_fieldIncrAdjusted[] = {
3.2, 4.2, 5.2,
3.3, 4.3, 5.3,
3.4, 4.4, 5.4,
- 3.81542674923, 5.62624380386, 6.03655867323, // 6
- 4.05551729839, 5.80814306452, 6.26077887097, // 7
- 4.29102589574, 5.95854913114, 6.47307768721, // 8
- 4.5184280556, 6.08059317225, 6.67174581469, // 9
+ 3.74171610791, 3.93089905329, 6.03655867323, // 6
+ 3.91867625, 4.16605048387, 6.26077887097, // 7
+ 4.10897410427, 4.44145086886, 6.47307768721, // 8
+ 4.31400437683, 4.75183926019, 6.67174581469, // 9
3.9, 4.9, 5.9,
3.0, 4.0, 5.0,
3.1, 4.1, 5.1,
3.2, 4.2, 5.2,
- 2.93604605858, 3.00048791863, 4.68089383859, // 14
- 3.01411488172, 3.21131406451, 4.7951692043, // 15
- 3.10897410427, 3.44145086886, 4.92692231279, // 16
- 3.21938394732, 3.6868064684, 5.07413554398, // 17
- 0.473140123852, 1.68936570579, 0.804838009839, // 18
- 0.728827677422, 1.93302890323, 1.05724619355, // 19
- 1.00474402275, 2.13953352294, 1.31423206826, // 20
- 1.29317050009, 2.30506771005, 1.56914246644, // 21
+ 3.02109679857, 4.95665493852, 4.68089383859, // 14
+ 3.16007866667, 4.96287948388, 4.7951692043, // 15
+ 3.29102589574, 4.95854913114, 4.92692231279, // 16
+ 3.41304848511, 4.94562596404, 5.07413554398, // 17
+ 0.362574161862, -0.853651420071, 0.804838009839, // 59
+ 0.509881999997, -0.694319225814, 1.05724619355, // 60
+ 0.695255977251, -0.439533522938, 1.31423206826, // 61
+ 0.925207878293, -0.0866893316668, 1.56914246644, // 62
};
pylith::faults::CohesiveKinDataHex8::CohesiveKinDataHex8(void)
diff --git a/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc b/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
index 5e9d24d..ac32982 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
@@ -35,7 +35,7 @@
*
* Cells are 0-1,2 vertices are 3-8,9-12.
*
- * 4 -------- 6 -12--10 -------- 8
+ * 4 -------- 6 -20--10 -------- 8
* | | | |
* | | | |
* | | | |
@@ -44,7 +44,7 @@
* | | | |
* | | | |
* | | | |
- * 3 -------- 5 -11-- 9 -------- 7
+ * 3 -------- 5 -19-- 9 -------- 7
*/
#include "CohesiveKinDataQuad4.hh"
@@ -104,8 +104,8 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4::_fieldT[] = {
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.8, 9.8, // 19
+ 8.0, 9.0, // 20
};
const PylithScalar pylith::faults::CohesiveKinDataQuad4::_fieldIncr[] = {
@@ -117,8 +117,8 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4::_fieldIncr[] = {
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.8, 4.8, // 19
+ 3.0, 4.0, // 20
};
const PylithScalar pylith::faults::CohesiveKinDataQuad4::_jacobianLumped[] = {
@@ -130,8 +130,8 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4::_jacobianLumped[] = {
1.6, 1.6,
1.7, 1.7, // 8
1.9, 1.9, // 9
- 1.0, 1.0, // 10
- 1.0, 1.0, // 11
+ 1.0, 1.0, // 19
+ 1.0, 1.0, // 20
};
@@ -140,7 +140,7 @@ const int pylith::faults::CohesiveKinDataQuad4::_verticesFault[] = {
2, 3
};
const int pylith::faults::CohesiveKinDataQuad4::_edgesLagrange[] = {
- 11, 12
+ 19, 20
};
const int pylith::faults::CohesiveKinDataQuad4::_verticesNegative[] = {
5, 6
@@ -178,9 +178,9 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4::_residual[] = {
-8.8, -9.8, // 8
-8.0, -9.0, // 9
-(8.7-8.3) + 0.14794836271,
- -(9.7-9.3) + 1.77538035254, // 10
+ -(9.7-9.3) + 1.77538035254, // 19
-(8.9-8.4) + 0.08241148423,
- -(9.9-9.4) + 1.89546413727, // 11
+ -(9.9-9.4) + 1.89546413727, // 20
};
const PylithScalar pylith::faults::CohesiveKinDataQuad4::_jacobian[] = {
@@ -395,8 +395,8 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4::_fieldIncrAdjusted[] =
3.6, 4.6,
3.41744429051, 5.12266481943, // 8
3.51072002361, 5.27989387642, // 9
- 0.480344706137, -0.718530193038, // 10
- 0.739631955136, -0.721798365193, // 11
+ 0.480344706137, -0.718530193038, // 19
+ 0.739631955136, -0.721798365193, // 20
};
pylith::faults::CohesiveKinDataQuad4::CohesiveKinDataQuad4(void)
diff --git a/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc b/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
index db26023..171e615 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
@@ -44,7 +44,7 @@
*
* Cells are 0-3,4-5 vertices are 6-20.
*
- * 12 --------13-20-17 --------14
+ * 12 --------13-34-17 --------14
* | | | |
* | | | |
* | | | |
@@ -53,7 +53,7 @@
* | | | |
* | | | |
* | | | |
- * 7 -------- 9-19-16 --------11
+ * 7 -------- 9-33-16 --------11
* | | | |
* | | | |
* | | | |
@@ -62,7 +62,7 @@
* | | | |
* | | | |
* | | | |
- * 6 -------- 8-18-15 --------10
+ * 6 -------- 8-32-15 --------10
*/
@@ -127,9 +127,9 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_fieldT[] = {
3.0, 5.0, // 13
4.2, 6.2, // 14
4.4, 6.4, // 15
- 4.1, 6.1, // 16
- 4.3, 6.3, // 17
- 4.5, 6.5, // 18
+ 4.1, 6.1, // 32
+ 4.3, 6.3, // 33
+ 4.5, 6.5, // 34
};
@@ -147,9 +147,9 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_fieldIncr[] = {
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
+ 5.1, 3.1, // 32
+ 5.3, 3.3, // 33
+ 5.5, 3.5, // 34
};
@@ -166,17 +166,17 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobianLumped[] = {
1.0, 7.0, // 13
2.2, 3.2, // 14
2.4, 3.4, // 15
- 1.0, 1.0, // 16
- 1.0, 1.0, // 17
- 1.0, 1.0, // 18
+ 1.0, 1.0, // 32
+ 1.0, 1.0, // 33
+ 1.0, 1.0, // 34
};
const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_orientation[] = {
- 0.0, -1.0, -1.0, 0.0,
- 0.0, -1.0, -1.0, 0.0,
- 0.0, -1.0, -1.0, 0.0,
+ 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[] = {
@@ -187,16 +187,16 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_area[] = {
const int pylith::faults::CohesiveKinDataQuad4e::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinDataQuad4e::_verticesFault[] = {
- 5, 4, 6
+ 4, 5, 6
};
const int pylith::faults::CohesiveKinDataQuad4e::_edgesLagrange[] = {
- 19, 18, 20
+ 32, 33, 34
};
const int pylith::faults::CohesiveKinDataQuad4e::_verticesNegative[] = {
- 9, 8, 13
+ 8, 9, 13
};
const int pylith::faults::CohesiveKinDataQuad4e::_verticesPositive[] = {
- 16, 15, 17
+ 15, 16, 17
};
const int pylith::faults::CohesiveKinDataQuad4e::_numCohesiveCells = 2;
@@ -221,12 +221,12 @@ const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_residual[] = {
-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
- -1.0*(3.0-3.3 + 0.14794836271),
- -1.0*(5.0-5.3 + 1.77538035254), // 16
- -2.0*(4.2-3.4 + 0.08241148423),
- -2.0*(6.2-5.4 + 1.89546413727), // 17
- -1.0*(4.4-3.8 + 0.19186497837),
- -1.0*(6.4-5.8 + 1.59887481971), // 18
+ -1.0*(3.0-3.3 - 0.14794836271),
+ -1.0*(5.0-5.3 - 1.77538035254), // 32
+ -2.0*(4.2-3.4 - 0.08241148423),
+ -2.0*(6.2-5.4 - 1.89546413727), // 33
+ -1.0*(4.4-3.8 - 0.19186497837),
+ -1.0*(6.4-5.8 - 1.59887481971), // 34
};
const PylithScalar pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
diff --git a/unittests/libtests/faults/data/CohesiveKinDataTet4.cc b/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
index 109fb70..be9ed2e 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
@@ -26,10 +26,10 @@
*
* After adding cohesive elements
*
- * Cells are 0-1,2, vertices are 3-13.
+ * Cells are 0-1,2, vertices are 3-10.
*
* 3 4,5,6 8,9,10 7
- * 11,12,13
+ * 34,35,36
* ^^^^^^^^^^^^ Cohesive element in x-y plane.
*/
@@ -102,9 +102,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4::_fieldT[] = {
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.7, 8.7, 9.7, // 34
+ 7.9, 8.9, 9.9, // 35
+ 7.1, 8.1, 9.1, // 36
};
const PylithScalar pylith::faults::CohesiveKinDataTet4::_fieldIncr[] = {
@@ -116,9 +116,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4::_fieldIncr[] = {
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.7, 4.7, 5.7, // 34
+ 3.9, 4.9, 5.9, // 35
+ 3.1, 4.1, 5.1, // 36
};
const PylithScalar pylith::faults::CohesiveKinDataTet4::_jacobianLumped[] = {
@@ -130,23 +130,23 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4::_jacobianLumped[] = {
1.6, 1.6, 1.6, // 7
1.8, 1.8, 1.8, // 8
1.0, 1.0, 1.0, // 9
- 1.0, 1.0, 1.0, // 10
- 1.0, 1.0, 1.0, // 11
- 1.0, 1.0, 1.0, // 12
+ 1.0, 1.0, 1.0, // 34
+ 1.0, 1.0, 1.0, // 35
+ 1.0, 1.0, 1.0, // 36
};
const int pylith::faults::CohesiveKinDataTet4::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinDataTet4::_verticesFault[] = {
- 3, 2, 4
+ 2, 3, 4
};
const int pylith::faults::CohesiveKinDataTet4::_edgesLagrange[] = {
- 12, 11, 13
+ 34, 35, 36
};
const int pylith::faults::CohesiveKinDataTet4::_verticesNegative[] = {
- 5, 4, 6
+ 4, 5, 6
};
const int pylith::faults::CohesiveKinDataTet4::_verticesPositive[] = {
- 9, 8, 10
+ 8, 9, 10
};
const int pylith::faults::CohesiveKinDataTet4::_numCohesiveCells = 1;
@@ -182,13 +182,13 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4::_residual[] = {
-7.1/3.0, -8.1/3.0, -9.1/3.0, // 9
-1.0/3.0*(7.6-7.2 + -0.07938069066),
-1.0/3.0*(8.6-8.2 + -1.82575588523),
- -1.0/3.0*(9.6-9.2 + 0.55566483464), // 10
+ -1.0/3.0*(9.6-9.2 + 0.55566483464), // 34
-1.0/3.0*(7.8-7.3 + -0.14140241667),
-1.0/3.0*(8.8-8.3 + -1.69682900001),
- -1.0/3.0*(9.8-9.3 + 0.56560966667), // 11
+ -1.0/3.0*(9.8-9.3 + 0.56560966667), // 35
-1.0/3.0*(7.0-7.4 + -0.18205179147),
-1.0/3.0*(8.0-8.4 + -1.51709826228),
- -1.0/3.0*(9.0-9.4 + 0.54615537442), // 12
+ -1.0/3.0*(9.0-9.4 + 0.54615537442), // 36
};
const PylithScalar pylith::faults::CohesiveKinDataTet4::_jacobian[] = {
@@ -566,9 +566,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4::_fieldIncrAdjusted[] = {
3.29116315314, 5.0396096651, 5.01900078515, // 7
3.43994294893, 5.09221861291, 5.14345401075, // 8
3.57286354502, 5.351640653, 5.14807603159, // 9
- 1.48241686493, -2.11012639247, 2.78879623126, // 10
- 1.9443080758, -1.5779805097, 3.54534834194, // 11
- -1.71859063507, -4.05492195899, -0.444228094765, // 12
+ 1.48241686493, -2.11012639247, 2.78879623126, // 34
+ 1.9443080758, -1.5779805097, 3.54534834194, // 35
+ -1.71859063507, -4.05492195899, -0.444228094765, // 36
};
pylith::faults::CohesiveKinDataTet4::CohesiveKinDataTet4(void)
diff --git a/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc b/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
index d153fbb..68ec156 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
@@ -16,23 +16,6 @@
// ======================================================================
//
-/* Original mesh
- *
- * Cells are 0-3, vertices are 4-8.
- *
- * 4 5,6,7 8
- *
- * ^^^^^ Face in x-y plane
- *
- * After adding cohesive elements
- *
- * Cells are 0-3,18,19, vertices are 4-17.
- *
- * 4 5,6,7 10,11,12 8
- * 13,14,15
- * ^^^^^^^^^^^^ Cohesive element in x-y plane.
- */
-
#include "CohesiveKinDataTet4e.hh"
const char* pylith::faults::CohesiveKinDataTet4e::_meshFilename =
@@ -161,16 +144,16 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4e::_area[] = {
const int pylith::faults::CohesiveKinDataTet4e::_numFaultVertices = 4;
const int pylith::faults::CohesiveKinDataTet4e::_verticesFault[] = {
- 5, 4, 6, 7
+ 4, 5, 6, 7
};
const int pylith::faults::CohesiveKinDataTet4e::_edgesLagrange[] = {
- 17, 16, 18, 19
+ 53, 54, 55, 56
};
const int pylith::faults::CohesiveKinDataTet4e::_verticesNegative[] = {
- 8, 7, 9, 10
+ 7, 8, 9, 10
};
const int pylith::faults::CohesiveKinDataTet4e::_verticesPositive[] = {
- 13, 12, 14, 15
+ 12, 13, 14, 15
};
const int pylith::faults::CohesiveKinDataTet4e::_numCohesiveCells = 2;
diff --git a/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc b/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
index e9ff2f2..f582ddd 100644
--- a/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
+++ b/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
@@ -29,7 +29,7 @@
* Cells are 0-1,10, vertices are 2-9.
*
* 2 7,9,11 3,4,5 6
- * 8,10,12
+ * 34,35,36
* ^^^^^^^^^^^^ Cohesive element in x-y plane.
*/
@@ -102,9 +102,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4f::_fieldT[] = {
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.7, 8.7, 9.7, // 34
+ 7.9, 8.9, 9.9, // 35
+ 7.1, 8.1, 9.1, // 36
};
@@ -117,9 +117,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4f::_fieldIncr[] = {
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.7, 4.7, 5.7, // 34
+ 3.9, 4.9, 5.9, // 35
+ 3.1, 4.1, 5.1, // 36
};
const PylithScalar pylith::faults::CohesiveKinDataTet4f::_jacobianLumped[] = {
@@ -131,9 +131,9 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4f::_jacobianLumped[] = {
1.6, 1.6, 1.6, // 7
1.8, 1.8, 1.8, // 8
1.0, 1.0, 1.0, // 9
- 1.0, 1.0, 1.0, // 10
- 1.0, 1.0, 1.0, // 11
- 1.0, 1.0, 1.0, // 12
+ 1.0, 1.0, 1.0, // 34
+ 1.0, 1.0, 1.0, // 35
+ 1.0, 1.0, 1.0, // 36
};
const PylithScalar pylith::faults::CohesiveKinDataTet4f::_orientation[] = {
@@ -150,16 +150,16 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4f::_area[] = {
const int pylith::faults::CohesiveKinDataTet4f::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinDataTet4f::_verticesFault[] = {
- 4, 2, 3
+ 2, 3, 4
};
const int pylith::faults::CohesiveKinDataTet4f::_edgesLagrange[] = {
- 13, 11, 12
+ 34, 35, 36
};
const int pylith::faults::CohesiveKinDataTet4f::_verticesNegative[] = {
- 6, 4, 5
+ 4, 5, 6
};
const int pylith::faults::CohesiveKinDataTet4f::_verticesPositive[] = {
- 10, 8, 9
+ 8, 9, 10
};
const int pylith::faults::CohesiveKinDataTet4f::_numCohesiveCells = 1;
@@ -182,13 +182,13 @@ const PylithScalar pylith::faults::CohesiveKinDataTet4f::_residual[] = {
-7.1/3.0, -8.1/3.0, -9.1/3.0, // 9
-1.0/3.0*(7.6-7.2 + 0.07938069066),
-1.0/3.0*(8.6-8.2 + 1.82575588523),
- -1.0/3.0*(9.6-9.2 + 0.55566483464), // 10
+ -1.0/3.0*(9.6-9.2 + 0.55566483464), // 34
-1.0/3.0*(7.8-7.3 + 0.14140241667),
-1.0/3.0*(8.8-8.3 + 1.69682900001),
- -1.0/3.0*(9.8-9.3 + 0.56560966667), // 11
+ -1.0/3.0*(9.8-9.3 + 0.56560966667), // 35
-1.0/3.0*(7.0-7.4 + 0.18205179147),
-1.0/3.0*(8.0-8.4 + 1.51709826228),
- -1.0/3.0*(9.0-9.4 + 0.54615537442), // 12
+ -1.0/3.0*(9.0-9.4 + 0.54615537442), // 36
};
const PylithScalar pylith::faults::CohesiveKinDataTet4f::_jacobian[] = {
diff --git a/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc b/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
index 13250b8..f36e3f0 100644
--- a/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
+++ b/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
@@ -29,7 +29,7 @@
* Cells are 0-1,2 and vertices are 3-15.
*
* 2,3,4,5 -------- 6,7,8,9 -- 14,15,16,17 -------- 10,11,12,13
- * 18,19,20,21
+ * 59,60,61,62
* ^^^^^^^^^^^^^^^^^^^^^^ Cohesive element
*
*/
@@ -178,10 +178,10 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataHex8::_jacobianLumped[] =
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataHex8::_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,
- 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,
+ 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,
+ 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,
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataHex8::_area[] = {
@@ -190,16 +190,16 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataHex8::_area[] = {
const int pylith::faults::CohesiveKinSrcsDataHex8::_numFaultVertices = 4;
const int pylith::faults::CohesiveKinSrcsDataHex8::_verticesFault[] = {
- 2, 4, 5, 3
+ 2, 3, 4, 5
};
const int pylith::faults::CohesiveKinSrcsDataHex8::_edgesLagrange[] = {
- 19, 21, 22, 20
+ 59, 60, 61, 62
};
const int pylith::faults::CohesiveKinSrcsDataHex8::_verticesNegative[] = {
- 7, 9, 10, 8
+ 7, 8, 9, 10
};
const int pylith::faults::CohesiveKinSrcsDataHex8::_verticesPositive[] = {
- 15, 17, 18, 16
+ 15, 16, 17, 18
};
const int pylith::faults::CohesiveKinSrcsDataHex8::_numCohesiveCells = 1;
@@ -229,25 +229,25 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataHex8::_residual[] = {
-5.8, -7.8, -9.8, // 16
-5.0, -7.0, -9.0, // 17
- // 18 (constraint)
- -(5.3-4.5 + 0.07938069066+0.03986101755),
- -(7.3-6.5 + 1.82575588523+0.91680340354),
- -(9.3-8.5 + 0.55566483464+0.27902712282),
+ // 59 (constraint)
+ -(5.3-4.5 - 0.07938069066 - 0.03986101755),
+ -(7.3-6.5 - 1.82575588523 - 0.91680340354),
+ -(9.3-8.5 + 0.55566483464 + 0.27902712282),
- // 19 (constraint)
- -(5.5-4.6 + 0.14140241667+0.05212609695),
- -(7.5-6.6 + 1.69682900001+0.62551316338),
- -(9.5-8.6 + 0.56560966667+0.20850438779),
+ // 60 (constraint)
+ -(5.5-4.6 - 0.14140241667 - 0.05212609695),
+ -(7.5-6.6 - 1.69682900001 - 0.62551316338),
+ -(9.5-8.6 + 0.56560966667 + 0.20850438779),
- // 20 (constraint)
- -(5.7-4.7 + 0.18205179147+0.04188434752),
- -(7.7-6.7 + 1.51709826228+0.34903622931),
- -(9.7-8.7 + 0.54615537442+0.12565304255),
+ // 61 (constraint)
+ -(5.7-4.7 - 0.18205179147 - 0.04188434752),
+ -(7.7-6.7 - 1.51709826228 - 0.34903622931),
+ -(9.7-8.7 + 0.54615537442 + 0.12565304255),
- // 21 (constraint)
- -(5.9-4.8 + 0.19904410828+0.01977711990),
- -(7.9-6.8 + 1.29378670385+0.12855127934),
- -(9.9-8.8 + 0.49761027071+0.04944279975),
+ // 62 (constraint)
+ -(5.9-4.8 - 0.19904410828 - 0.01977711990),
+ -(7.9-6.8 - 1.29378670385 - 0.12855127934),
+ -(9.9-8.8 + 0.49761027071 + 0.04944279975),
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataHex8::_jacobian[] = {
diff --git a/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc b/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
index 965b1ed..feab26b 100644
--- a/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
+++ b/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
@@ -35,7 +35,7 @@
*
* Cells are 0-1,2 vertices are 3-10.
*
- * 4 -------- 6 -12-- 10 -------- 8
+ * 4 -------- 6 -20-- 10 -------- 8
* | | | |
* | | | |
* | | | |
@@ -44,7 +44,7 @@
* | | | |
* | | | |
* | | | |
- * 3 -------- 5 -11-- 9 -------- 7
+ * 3 -------- 5 -19-- 9 -------- 7
*/
#include "CohesiveKinSrcsDataQuad4.hh"
@@ -104,8 +104,8 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_fieldT[] = {
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.8, 9.8, // 19
+ 8.0, 9.0, // 20
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_fieldIncr[] = {
@@ -117,8 +117,8 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_fieldIncr[] = {
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.8, 4.8, // 19
+ 3.0, 4.0, // 20
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_jacobianLumped[] = {
@@ -130,8 +130,8 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_jacobianLumped[] =
1.6, 1.6,
1.7, 1.7, // 8
1.9, 1.9, // 9
- 1.0, 1.0, // 10
- 1.0, 1.0, // 11
+ 1.0, 1.0, // 19
+ 1.0, 1.0, // 20
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_orientation[] = {
@@ -148,7 +148,7 @@ const int pylith::faults::CohesiveKinSrcsDataQuad4::_verticesFault[] = {
2, 3
};
const int pylith::faults::CohesiveKinSrcsDataQuad4::_edgesLagrange[] = {
- 11, 12
+ 19, 20
};
const int pylith::faults::CohesiveKinSrcsDataQuad4::_verticesNegative[] = {
5, 6
@@ -176,9 +176,9 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_residual[] = {
-8.8, -9.8, // 8
-8.0, -9.0, // 9
-(8.7-8.3 + -0.14794836271 + -0.05698088572),
- -(9.7-9.3 + -1.77538035254 + -0.68377062865), // 10
+ -(9.7-9.3 + -1.77538035254 + -0.68377062865), // 19
-(8.9-8.4 + -0.08241148423 + -0.04322376757),
- -(9.9-9.4 + -1.89546413727 + -0.99414665414), // 11
+ -(9.9-9.4 + -1.89546413727 + -0.99414665414), // 20
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_jacobian[] = {
diff --git a/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc b/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
index 37dab81..fe11cb3 100644
--- a/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
+++ b/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
@@ -29,7 +29,7 @@
* Cells are 0-1,10, vertices are 2-9.
*
* 2 3,4,5 7,8,19 6
- * 10,11,12
+ * 34,35,36
* ^^^^^^^^^^^^ Cohesive element in x-y plane.
*/
@@ -102,9 +102,9 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_fieldT[] = {
7.6, 8.6, 9.6,
7.8, 8.8, 9.8,
7.0, 8.0, 9.0,
- 7.7, 8.7, 9.7, // 10
- 7.9, 8.9, 9.9, // 11
- 7.1, 8.1, 9.1, // 12
+ 7.7, 8.7, 9.7, // 34
+ 7.9, 8.9, 9.9, // 35
+ 7.1, 8.1, 9.1, // 36
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_fieldIncr[] = {
@@ -116,9 +116,9 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_fieldIncr[] = {
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.7, 4.7, 5.7, // 34
+ 3.9, 4.9, 5.9, // 35
+ 3.1, 4.1, 5.1, // 36
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_jacobianLumped[] = {
@@ -130,9 +130,9 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_jacobianLumped[] =
1.6, 1.6, 1.6, // 7
1.8, 1.8, 1.8, // 8
1.0, 1.0, 1.0, // 9
- 1.0, 1.0, 1.0, // 10
- 1.0, 1.0, 1.0, // 11
- 1.0, 1.0, 1.0, // 12
+ 1.0, 1.0, 1.0, // 34
+ 1.0, 1.0, 1.0, // 35
+ 1.0, 1.0, 1.0, // 36
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_orientation[] = {
@@ -149,16 +149,16 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_area[] = {
const int pylith::faults::CohesiveKinSrcsDataTet4::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinSrcsDataTet4::_verticesFault[] = {
- 3, 2, 4
+ 2, 3, 4
};
const int pylith::faults::CohesiveKinSrcsDataTet4::_edgesLagrange[] = {
- 12, 11, 13
+ 34, 35, 36
};
const int pylith::faults::CohesiveKinSrcsDataTet4::_verticesNegative[] = {
- 5, 4, 6
+ 4, 5, 6
};
const int pylith::faults::CohesiveKinSrcsDataTet4::_verticesPositive[] = {
- 9, 8, 10
+ 8, 9, 10
};
const int pylith::faults::CohesiveKinSrcsDataTet4::_numCohesiveCells = 1;
@@ -181,13 +181,13 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_residual[] = {
-7.1/3.0, -8.1/3.0, -9.1/3.0, // 9
-1.0/3.0*(7.6-7.2 + -0.07938069066-0.03986101755),
-1.0/3.0*(8.6-8.2 + -1.82575588523-0.91680340354),
- -1.0/3.0*(9.6-9.2 + 0.55566483464+0.27902712282), // 10
+ -1.0/3.0*(9.6-9.2 + 0.55566483464+0.27902712282), // 34
-1.0/3.0*(7.8-7.3 + -0.14140241667-0.05212609695),
-1.0/3.0*(8.8-8.3 + -1.69682900001-0.62551316338),
- -1.0/3.0*(9.8-9.3 + 0.56560966667+0.20850438779), // 11
+ -1.0/3.0*(9.8-9.3 + 0.56560966667+0.20850438779), // 35
-1.0/3.0*(7.0-7.4 + -0.18205179147-0.04188434752),
-1.0/3.0*(8.0-8.4 + -1.51709826228-0.34903622931),
- -1.0/3.0*(9.0-9.4 + 0.54615537442+0.12565304255), // 12
+ -1.0/3.0*(9.0-9.4 + 0.54615537442+0.12565304255), // 36
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_jacobian[] = {
diff --git a/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc b/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
index 4c03b5f..56950f1 100644
--- a/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
+++ b/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
@@ -116,8 +116,8 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataTri3::_fieldIncr[] = {
3.4, 4.4,
3.5, 4.5, // 6
3.7, 4.7, // 7
- 3.6, 4.6, // 8
- 3.8, 4.8, // 9
+ 3.6, 4.6, // 15
+ 3.8, 4.8, // 16
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataTri3::_jacobianLumped[] = {
@@ -127,13 +127,13 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataTri3::_jacobianLumped[] =
1.4, 1.4,
1.5, 1.5, // 6
1.7, 1.7, // 7
- 1.0, 1.0, // 8
- 1.0, 1.0, // 9
+ 1.0, 1.0, // 15
+ 1.0, 1.0, // 16
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataTri3::_orientation[] = {
- 0.0, -1.0, -1.0, 0.0,
- 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::CohesiveKinSrcsDataTri3::_area[] = {
@@ -146,7 +146,7 @@ const int pylith::faults::CohesiveKinSrcsDataTri3::_verticesFault[] = {
2, 3
};
const int pylith::faults::CohesiveKinSrcsDataTri3::_edgesLagrange[] = {
- 9, 10
+ 15, 16
};
const int pylith::faults::CohesiveKinSrcsDataTri3::_verticesNegative[] = {
4, 5
@@ -171,10 +171,10 @@ const PylithScalar pylith::faults::CohesiveKinSrcsDataTri3::_residual[] = {
0.0, 0.0,
-8.6, -9.6, // 6
-8.8, -9.8, // 7
- -(8.5-8.2 + 0.08241148423 + 0.04322376757),
- -(9.5-9.2 + 1.89546413727 + 0.99414665414), // 8
- -(8.7-8.3 + 0.14794836271 + 0.05698088572),
- -(9.7-9.3 + 1.77538035254 + 0.68377062865), // 9
+ -(8.5-8.2 - 0.08241148423 - 0.04322376757),
+ -(9.5-9.2 - 1.89546413727 - 0.99414665414), // 15
+ -(8.7-8.3 - 0.14794836271 - 0.05698088572),
+ -(9.7-9.3 - 1.77538035254 - 0.68377062865), // 16
};
const PylithScalar pylith::faults::CohesiveKinSrcsDataTri3::_jacobian[] = {
diff --git a/unittests/libtests/faults/data/adjustsoln.py b/unittests/libtests/faults/data/adjustsoln.py
index bb05890..9c81d33 100644
--- a/unittests/libtests/faults/data/adjustsoln.py
+++ b/unittests/libtests/faults/data/adjustsoln.py
@@ -1,5 +1,5 @@
-test = "tri3"
-vertex = 1
+test = "hex8"
+vertex = 3
# ----------------------------------------------------------------------
if test == "tri3" or test == "quad4":
@@ -91,8 +91,8 @@ elif test == "tet4" or test == "hex8":
if vertex == 0:
# Lagrange vertex 18, vertex N: 6, vertex P: 14
jL = 1.0
- rLx = -(5.3-4.5+0.07938069066)
- rLy = -(7.3-6.5+1.82575588523)
+ rLx = -(5.3-4.5-0.07938069066)
+ rLy = -(7.3-6.5-1.82575588523)
rLz = -(9.3-8.5+0.55566483464)
jN = 1.5; duNx = 3.5; duNy = 4.5; duNz = 5.5;
jP = 1.3; duPx = 3.3; duPy = 4.3; duPz = 5.3;
@@ -100,8 +100,8 @@ elif test == "tet4" or test == "hex8":
elif vertex == 1:
# Lagrange vertex 19, vertex N: 7, vertex P: 15
jL = 1.0
- rLx = -(5.5-4.6+0.14140241667)
- rLy = -(7.5-6.6+1.69682900001)
+ rLx = -(5.5-4.6-0.14140241667)
+ rLy = -(7.5-6.6-1.69682900001)
rLz = -(9.5-8.6+0.56560966667)
jN = 1.6; duNx = 3.6; duNy = 4.6; duNz = 5.6;
jP = 1.5; duPx = 3.5; duPy = 4.5; duPz = 5.5;
@@ -109,8 +109,8 @@ elif test == "tet4" or test == "hex8":
elif vertex == 2:
# Lagrange vertex 20, vertex N: 8, vertex P: 16
jL = 1.0
- rLx = -(5.7-4.7+0.18205179147)
- rLy = -(7.7-6.7+1.51709826228)
+ rLx = -(5.7-4.7-0.18205179147)
+ rLy = -(7.7-6.7-1.51709826228)
rLz = -(9.7-8.7+0.54615537442)
jN = 1.7; duNx = 3.7; duNy = 4.7; duNz = 5.7;
jP = 1.7; duPx = 3.7; duPy = 4.7; duPz = 5.7;
@@ -118,8 +118,8 @@ elif test == "tet4" or test == "hex8":
elif vertex == 3:
# Lagrange vertex 21, vertex N: 9, vertex P: 17
jL = 1.0
- rLx = -(5.9-4.8+0.19904410828)
- rLy = -(7.9-6.8+1.29378670385)
+ rLx = -(5.9-4.8-0.19904410828)
+ rLy = -(7.9-6.8-1.29378670385)
rLz = -(9.9-8.8+0.49761027071)
jN = 1.8; duNx = 3.8; duNy = 4.8; duNz = 5.8;
jP = 1.9; duPx = 3.9; duPy = 4.9; duPz = 5.9;
More information about the CIG-COMMITS
mailing list