[cig-commits] r9099 - short/3D/PyLith/trunk/unittests/libtests/faults/data

brad at geodynamics.org brad at geodynamics.org
Sun Jan 20 13:04:37 PST 2008


Author: brad
Date: 2008-01-20 13:04:37 -0800 (Sun, 20 Jan 2008)
New Revision: 9099

Modified:
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataHex8Lagrange.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataQuad4Lagrange.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataTet4Lagrange.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataTri3Lagrange.cc
Log:
Updated to reflect moving Lagrange vertices to end of list of vertices.

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataHex8Lagrange.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataHex8Lagrange.cc	2008-01-20 17:49:59 UTC (rev 9098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataHex8Lagrange.cc	2008-01-20 21:04:37 UTC (rev 9099)
@@ -22,8 +22,8 @@
  *
  * Cells are 0-1,16 and vertices are 4-15.
  *
- *       2,3,4,5 -------- 6,7,8,9 -- 14,16,18,20 -------- 10,11,12,13
- *                                    15,17,19,21
+ *       2,3,4,5 -------- 6,7,8,9 -- 14,15,16,17 -------- 10,11,12,13
+ *                                    18,19,20,21
  *                        ^^^^^^^^^^^^^^^^^^^^^^ Cohesive element
  *
  */
@@ -52,12 +52,12 @@
    2.0, -1.0,  1.0,
    2.0,  1.0,  1.0,
    0.0, -1.0, -1.0,
+   0.0,  1.0, -1.0,
+   0.0, -1.0,  1.0,
+   0.0,  1.0,  1.0,
    0.0, -1.0, -1.0,
    0.0,  1.0, -1.0,
-   0.0,  1.0, -1.0,
    0.0, -1.0,  1.0,
-   0.0, -1.0,  1.0,
-   0.0,  1.0,  1.0,
    0.0,  1.0,  1.0
 };
 
@@ -68,9 +68,9 @@
 };
 
 const int pylith::faults::CohesiveDataHex8Lagrange::_cells[] = {
-  2,  3,  5,  4, 14, 16, 20, 18,
+  2,  3,  5,  4, 14, 15, 17, 16,
   6,  7,  9,  8, 10, 11, 13, 12,
-  8,  9,  7,  6, 18, 20, 16, 14, 19, 21, 17, 15
+  8,  9,  7,  6, 16, 17, 15, 14, 20, 21, 19, 18
 };
 
 const int pylith::faults::CohesiveDataHex8Lagrange::_materialIds[] = {
@@ -85,7 +85,7 @@
 
 const int pylith::faults::CohesiveDataHex8Lagrange::_groups[] = {
   6, 7, 8, 9, 14, 15, 16, 17, 18, 19, 20, 21,
-  4, 5, 8, 9, 12, 13, 18, 20
+  4, 5, 8, 9, 12, 13, 16, 17
 };
 
 const char* pylith::faults::CohesiveDataHex8Lagrange::_groupNames[] = {

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataQuad4Lagrange.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataQuad4Lagrange.cc	2008-01-20 17:49:59 UTC (rev 9098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataQuad4Lagrange.cc	2008-01-20 21:04:37 UTC (rev 9099)
@@ -29,7 +29,7 @@
  *
  * Cells are 0-1,10 vertices are 2-9.
  *
- *       3 -------- 5 -11- 10 -------- 7
+ *       3 -------- 5 -11-  9 -------- 7
  *       |          |       |          |
  *       |          |       |          |
  *       |          |       |          |
@@ -38,7 +38,7 @@
  *       |          |       |          |
  *       |          |       |          |
  *       |          |       |          |
- *       2 -------- 4 --9-- 8 -------- 6
+ *       2 -------- 4 -10-- 8 -------- 6
  */
 
 #include "CohesiveDataQuad4Lagrange.hh"
@@ -59,9 +59,9 @@
    2.0, -1.0,
    2.0,  1.0,
    0.0, -1.0,
+   0.0,  1.0,
    0.0, -1.0,
    0.0,  1.0,
-   0.0,  1.0,
 };
 
 const int pylith::faults::CohesiveDataQuad4Lagrange::_numCorners[] = {
@@ -72,8 +72,8 @@
 
 const int pylith::faults::CohesiveDataQuad4Lagrange::_cells[] = {
   2,  4,  5,  3,
-  6,  7, 10,  8,
-  4,  5,  8, 10,  9, 11
+  6,  7,  9,  8,
+  4,  5,  8,  9, 10, 11
 };
 
 const int pylith::faults::CohesiveDataQuad4Lagrange::_materialIds[] = {
@@ -88,7 +88,7 @@
 
 const int pylith::faults::CohesiveDataQuad4Lagrange::_groups[] = {
   4, 5, 8, 9, 10, 11,
-  3, 5, 7, 10
+  3, 5, 7, 9
 };
 
 const char* pylith::faults::CohesiveDataQuad4Lagrange::_groupNames[] = {

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataTet4Lagrange.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataTet4Lagrange.cc	2008-01-20 17:49:59 UTC (rev 9098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataTet4Lagrange.cc	2008-01-20 21:04:37 UTC (rev 9099)
@@ -44,10 +44,10 @@
    0.0,  1.0,  0.0,
    1.0,  0.0,  0.0,
    0.0, -1.0,  0.0,
+   0.0,  0.0,  1.0,
+   0.0,  1.0,  0.0,
    0.0, -1.0,  0.0,
    0.0,  0.0,  1.0,
-   0.0,  0.0,  1.0,
-   0.0,  1.0,  0.0,
    0.0,  1.0,  0.0
 };
 
@@ -59,8 +59,8 @@
 
 const int pylith::faults::CohesiveDataTet4Lagrange::_cells[] = {
   3,  4,  5,  2,
-  7, 11,  9,  6,
-  4,  3,  5,  9,  7,  11,  10, 8,  12
+  7,  9,  8,  6,
+  4,  3,  5,  8,  7,   9,  11, 10, 12
 };
 
 const int pylith::faults::CohesiveDataTet4Lagrange::_materialIds[] = {
@@ -75,7 +75,7 @@
 
 const int pylith::faults::CohesiveDataTet4Lagrange::_groups[] = {
   3, 4, 5, 7, 8, 9, 10, 11, 12,
-  2, 4, 5, 9, 11
+  2, 4, 5, 8, 9
 };
 
 const char* pylith::faults::CohesiveDataTet4Lagrange::_groupNames[] = {

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataTri3Lagrange.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataTri3Lagrange.cc	2008-01-20 17:49:59 UTC (rev 9098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDataTri3Lagrange.cc	2008-01-20 21:04:37 UTC (rev 9099)
@@ -31,7 +31,7 @@
  *
  * Cells are 0-1, 8, vertices are 2-7.
  *
- *              6 -7- 3
+ *              6 -8- 3
  *             /|     |\
  *            / |     | \
  *           /  |     |  \
@@ -41,7 +41,7 @@
  *           \  |     |  /
  *            \ |     | /
  *             \|     |/
- *              8 -9- 4
+ *              7 -9- 4
  */
 
 #include "CohesiveDataTri3Lagrange.hh"
@@ -60,8 +60,8 @@
   0.0, -1.0,
   1.0,  0.0,
   0.0,  1.0,
+  0.0, -1.0,
   0.0,  1.0,
-  0.0, -1.0,
   0.0, -1.0
 };
 
@@ -72,9 +72,9 @@
 };
 
 const int pylith::faults::CohesiveDataTri3Lagrange::_cells[] = {
-  2,  8,  6,
+  2,  7,  6,
   3,  4,  5,
-  3,  4,  6,  8,  7,  9
+  3,  4,  6,  7,  8,  9
 };
 
 const int pylith::faults::CohesiveDataTri3Lagrange::_materialIds[] = {
@@ -89,7 +89,7 @@
 
 const int pylith::faults::CohesiveDataTri3Lagrange::_groups[] = {
   3, 4, 6, 7, 8, 9,
-  3, 4, 5, 6, 8
+  3, 4, 5, 6, 7
 };
 
 const char* pylith::faults::CohesiveDataTri3Lagrange::_groupNames[] = {



More information about the cig-commits mailing list