[cig-commits] r19084 - short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data

brad at geodynamics.org brad at geodynamics.org
Mon Oct 17 12:45:54 PDT 2011


Author: brad
Date: 2011-10-17 12:45:54 -0700 (Mon, 17 Oct 2011)
New Revision: 19084

Modified:
   short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataHex8.cc
   short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataQuad4.cc
   short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTet4.cc
   short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTri3.cc
   short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTri3d.cc
   short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/cohesivedyn.py
Log:
Updated test data for revised implementation of setting fault slip (compute slip using current relative displacement and computed increment).

Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataHex8.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataHex8.cc	2011-10-17 17:54:06 UTC (rev 19083)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataHex8.cc	2011-10-17 19:45:54 UTC (rev 19084)
@@ -115,10 +115,10 @@
   4.0, 2.0, 3.0,
   4.1, 2.1, 3.1,
   4.2, 2.2, 3.2,
-  4.3, 2.3, 3.3, // 14
-  4.5, 2.5, 3.5, // 15
+  4.5, 2.5, 3.5, // 14
+  4.6, 2.6, 3.6, // 15
   4.7, 2.7, 3.7, // 16
-  4.9, 2.9, 3.9, // 17
+  4.8, 2.8, 3.8, // 17
   4.4, 2.4, 3.4, // 18
   4.6, 2.6, 3.6, // 19
   4.8, 2.8, 3.8, // 20
@@ -1158,10 +1158,10 @@
   1.0, 2.0, 0.0,
   1.1, 2.1, 0.1,
   1.2, 2.2, 0.2,
-  1.3, 2.3, 0.3, // 14
-  1.5, 2.5, 0.5, // 15
+  1.5, 2.5, 0.5, // 14
+  1.6, 2.6, 0.6, // 15
   1.7, 2.7, 0.7, // 16
-  1.9, 2.9, 0.9, // 17
+  1.8, 2.8, 0.8, // 17
   1.4, 2.4, 0.4, // 18
   1.6, 2.6, 0.6, // 19
   1.8, 2.8, 0.8, // 20
@@ -1182,10 +1182,10 @@
    1.000000000000,   2.000000000000,   0.000000000000,
    1.100000000000,   2.100000000000,   0.100000000000,
    1.200000000000,   2.200000000000,   0.200000000000,
-   1.300000000000,   1.054706496734,  -0.512227205500,
-   1.500000000000,   1.805019605425,  -0.286664200491,
+   1.500000000000,   1.254706496734,  -0.312227205500,
+   1.600000000000,   1.905019605425,  -0.186664200491,
    1.700000000000,   1.808236734045,  -0.182543631245,
-   1.900000000000,   1.996892226197,   0.028643336400,
+   1.800000000000,   1.896892226197,  -0.071356663600,
    1.400000000000,   0.328479469127,  -1.239953753608,
    1.600000000000,   0.293941190358,  -1.262585961634,
    1.800000000000,   0.259995967920,  -1.286431883494,
@@ -1216,10 +1216,10 @@
   1.0, 2.0, 0.0,
   1.1, 2.1, 0.1,
   1.2, 2.2, 0.2,
-  1.3, 2.3, 0.3, // 14
-  1.5, 2.5, 0.5, // 15
+  1.5, 2.5, 0.5, // 14
+  1.6, 2.6, 0.6, // 15
   1.7, 2.7, 0.7, // 16
-  1.9, 2.9, 0.9, // 17
+  1.8, 2.8, 0.8, // 17
  -10.4, 2.4, 0.4, // 18
  -10.6, 2.6, 0.6, // 19
  -10.8, 2.8, 0.8, // 20
@@ -1240,10 +1240,10 @@
    1.000000000000,   2.000000000000,   0.000000000000,
    1.100000000000,   2.100000000000,   0.100000000000,
    1.200000000000,   2.200000000000,   0.200000000000,
-  -0.673386524898,   1.349541226243,  -0.261077907335,
-  -0.202801176428,   2.133500407753,   0.002240648660,
+  -0.473386524898,   1.549541226243,  -0.061077907335,
+  -0.102801176428,   2.233500407753,   0.102240648660,
   -0.227558189277,   2.147031139416,   0.135118655740,
-   0.224301331419,   2.458394183029,   0.466855048560,
+   0.124301331419,   2.358394183029,   0.366855048560,
   -4.400000000000,  -2.400000000000,  -3.400000000000,
   -4.600000000000,  -2.600000000000,  -3.600000000000,
   -4.800000000000,  -2.800000000000,  -3.800000000000,

Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataQuad4.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataQuad4.cc	2011-10-17 17:54:06 UTC (rev 19083)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataQuad4.cc	2011-10-17 19:45:54 UTC (rev 19084)
@@ -97,8 +97,8 @@
   8.4, 9.4, // 5
   8.5, 9.5,
   8.6, 9.6,
-  8.7, 9.7, // 8
-  8.9, 9.9, // 9
+  8.3, 9.3, // 8
+  8.4, 9.4, // 9
   8.8, 9.8, // 10
   8.0, 9.0, // 11
 };
@@ -322,8 +322,8 @@
   1.4, 2.4, // 5
   1.5, 2.5,
   1.6, 2.6,
-  1.7, 2.7, // 8
-  1.9, 2.9, // 9
+  1.3, 2.3, // 8
+  1.4, 2.4, // 9
   1.8, 2.8, // 10
   1.0, 2.0, // 11
 };
@@ -336,8 +336,8 @@
    1.400000000000,   3.369389712309,
    1.500000000000,   2.500000000000,
    1.600000000000,   2.600000000000,
-   1.700000000000,   2.593029702389,
-   1.900000000000,   1.930610287691,
+   1.300000000000,   2.193029702389,
+   1.400000000000,   1.430610287691,
    1.800000000000,  -3.440000000000,
    1.000000000000,  -3.600000000000,
 };
@@ -358,8 +358,8 @@
   1.4, 2.4, // 5
   1.5, 2.5,
   1.6, 2.6,
-  1.7, 2.7, // 8
-  1.9, 2.9, // 9
+  1.3, 2.3, // 8
+  1.4, 2.4, // 9
   -10.8, 2.8, // 10
   -10.0, 2.0, // 11
 };
@@ -372,8 +372,8 @@
    4.287400342924,   3.820863468454,
    1.500000000000,   2.500000000000,
    1.600000000000,   2.600000000000,
-  -0.815834136232,   2.960595843157,
-  -0.987400342924,   1.479136531546,
+  -1.215834136232,   2.560595843157,
+  -1.487400342924,   0.979136531546,
   -8.800000000000,  -9.800000000000,
   -8.000000000000,  -9.000000000000,
 };

Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTet4.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTet4.cc	2011-10-17 17:54:06 UTC (rev 19083)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTet4.cc	2011-10-17 19:45:54 UTC (rev 19084)
@@ -94,9 +94,9 @@
   7.3, 8.3, 9.3, // 4
   7.4, 8.4, 9.4, // 5
   7.5, 8.5, 9.5,
-  7.6, 8.6, 9.6, // 7
-  7.8, 8.8, 9.8, // 8
-  7.0, 8.0, 9.0, // 9
+  7.2, 8.2, 9.2, // 7
+  7.3, 8.3, 9.3, // 8
+  7.4, 8.4, 9.4, // 9
   7.7, 8.7, 9.7, // 10
   7.9, 8.9, 9.9, // 11
   7.1, 8.1, 9.1, // 12
@@ -527,9 +527,9 @@
   1.3, 2.3, 3.3, // 4
   1.4, 2.4, 3.4, // 5
   1.5, 2.5, 3.5,
-  1.6, 2.6, 3.6, // 7
-  1.8, 2.8, 3.8, // 8
-  1.0, 2.0, 3.0, // 9
+  1.2, 2.2, 3.2, // 7
+  1.3, 2.3, 3.3, // 8
+  1.4, 2.4, 3.4, // 9
   9.7, 2.7, 3.7, // 10
   9.9, 2.9, 3.9, // 11
   9.1, 2.1, 3.1, // 12
@@ -542,9 +542,9 @@
    1.300000000000,   2.281534813168,   3.292288303722,
    1.400000000000,   2.543753403100,   3.499170314087,
    1.500000000000,   2.500000000000,   3.500000000000,
-   1.600000000000,   2.372979810217,   3.573195170082,
-   1.800000000000,   2.818465186832,   3.807711696278,
-   1.000000000000,   1.856246596900,   2.900829685913,
+   1.200000000000,   1.972979810217,   3.173195170082,
+   1.300000000000,   2.318465186832,   3.307711696278,
+   1.400000000000,   2.256246596900,   3.300829685913,
    9.700000000000,  -1.935106067360,  -1.748282570405,
    9.900000000000,  -1.959241090539,  -1.782841275376,
    9.100000000000,  -1.865391385620,  -1.642919108291,
@@ -566,9 +566,9 @@
   1.3, 2.3, 3.3, // 4
   1.4, 2.4, 3.4, // 5
   1.5, 2.5, 3.5,
-  1.6, 2.6, 3.6, // 7
-  1.8, 2.8, 3.8, // 8
-  1.0, 2.0, 3.0, // 9
+  1.2, 2.2, 3.2, // 7
+  1.3, 2.3, 3.3, // 8
+  1.4, 2.4, 3.4, // 9
  -20.7, 2.7, 3.7, // 10
  -20.9, 2.9, 3.9, // 11
  -20.1, 2.1, 3.1, // 12
@@ -581,9 +581,9 @@
    2.514833997358,   1.906576121577,   2.868854721277,
    2.460386652668,   2.373508489140,   3.258697327233,
    1.500000000000,   2.500000000000,   3.500000000000,
-   0.321064323726,   2.599331165712,   3.933502870554,
-   0.585166002642,   3.193423878423,   4.231145278723,
-  -0.060386652668,   2.026491510860,   3.141302672767,
+  -0.078935676274,   2.199331165712,   3.533502870554,
+   0.085166002642,   2.693423878423,   3.731145278723,
+   0.339613347332,   2.426491510860,   3.541302672767,
   -7.700000000000,  -8.700000000000,  -9.700000000000,
   -7.900000000000,  -8.900000000000,  -9.900000000000,
   -7.100000000000,  -8.100000000000,  -9.100000000000,

Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTri3.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTri3.cc	2011-10-17 17:54:06 UTC (rev 19083)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTri3.cc	2011-10-17 19:45:54 UTC (rev 19084)
@@ -97,8 +97,8 @@
   8.2, 9.2, // 3
   8.3, 9.3, // 4
   8.4, 9.4,
-  8.5, 9.5, // 6
-  8.7, 9.7, // 7
+  8.2, 9.2, // 6
+  8.3, 9.3, // 7
   8.6, 9.6, // 8
   8.8, 9.8, // 9
 };
@@ -270,8 +270,8 @@
   1.2, 2.2, // 3
   1.3, 2.3, // 4
   1.4, 2.4,
-  1.5, 2.5, // 6
-  1.7, 2.7, // 7
+  1.2, 2.2, // 6
+  1.3, 2.3, // 7
   21.6, 2.6, // 8
   21.8, 2.8, // 9
 };
@@ -288,8 +288,8 @@
   9.2, 7.2, // 3
   9.3, 7.3, // 4
   9.4, 7.4,
-  9.5, 7.5, // 6
-  9.7, 7.7, // 7
+  9.2, 7.2, // 6
+  9.3, 7.3, // 7
   1.6, 2.6, // 8
   1.8, 2.8, // 9
 };
@@ -300,8 +300,8 @@
    9.200000000000,   7.390546440275,
    9.300000000000,   8.283993111958,
    9.400000000000,   7.400000000000,
-   9.500000000000,   7.309453559725,
-   9.700000000000,   6.716006888042,
+   9.200000000000,   7.009453559725,
+   9.300000000000,   6.316006888042,
    1.600000000000,  -3.480000000000,
    1.800000000000,  -3.440000000000,
 };
@@ -320,8 +320,8 @@
   9.2, 7.2, // 3
   9.3, 7.3, // 4
   9.4, 7.4,
-  9.5, 7.5, // 6
-  9.7, 7.7, // 7
+  9.2, 7.2, // 6
+  9.3, 7.3, // 7
   -10.6, 2.6, // 8
   -10.8, 2.8, // 9
 };
@@ -332,8 +332,8 @@
   11.874337677762,   7.148344513504,
   12.357207850137,   8.757371967576,
    9.400000000000,   7.400000000000,
-   6.825662322238,   7.551655486496,
-   6.642792149863,   6.242628032424,
+   6.525662322238,   7.251655486496,
+   6.242792149863,   5.842628032424,
   -8.600000000000,  -9.600000000000,
   -8.800000000000,  -9.800000000000,
 };

Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTri3d.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTri3d.cc	2011-10-17 17:54:06 UTC (rev 19083)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTri3d.cc	2011-10-17 19:45:54 UTC (rev 19084)
@@ -114,9 +114,9 @@
   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.2, 8.2, // 10
+  6.3, 8.3, // 11
+  6.5, 8.5, // 12
  -3.8, 4.8, // 13
   3.0, 4.0, // 14
   3.2, 4.2, // 15
@@ -476,9 +476,9 @@
   1.4, 2.4,
   1.5, 2.5, // 8
   1.6, 2.6,
-  1.7, 2.7, // 10
-  1.9, 2.9, // 11
-  1.1, 2.1, // 12
+  1.2, 2.2, // 10
+  1.3, 2.3, // 11
+  1.5, 2.5, // 12
   1.8, 0.8, // 13
   1.0, 0.1, // 14
   1.2, 0.2, // 15
@@ -492,9 +492,9 @@
    1.400000000000,   2.400000000000,
    1.216364402612,   2.500000000000,
    1.600000000000,   2.600000000000,
-   0.894238990536,   3.505761009464,
-   1.900000000000,   3.271643661765,
-   1.383635597388,   2.100000000000,
+   0.394238990536,   3.005761009464,
+   1.300000000000,   2.671643661765,
+   1.783635597388,   2.500000000000,
    4.520000000000,  -1.920000000000,
    1.000000000000,  -1.600000000000,
   -0.560000000000,   0.200000000000,
@@ -517,9 +517,9 @@
   1.4, 2.4,
   1.5, 2.5, // 8
   1.6, 2.6,
-  1.7, 2.7, // 10
-  1.9, 2.9, // 11
-  1.1, 2.1, // 12
+  1.2, 2.2, // 10
+  1.3, 2.3, // 11
+  1.5, 2.5, // 12
 -10.8, 0.8, // 13
 -10.0, 0.1, // 14
   1.2,-10.2, // 15
@@ -533,9 +533,9 @@
    1.400000000000,   2.400000000000,
    3.622067204316,   6.167076609904,
    1.600000000000,   2.600000000000,
-  -7.040107961522,   1.237879651082,
-  -2.488525058023,  -0.114075601410,
-  -1.022067204316,  -1.567076609904,
+  -7.540107961522,   0.737879651082,
+  -3.088525058023,  -0.714075601410,
+  -0.622067204316,  -1.167076609904,
    3.800000000000,  -4.800000000000,
   -3.000000000000,  -4.000000000000,
   -3.200000000000,  -4.200000000000,

Modified: short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/cohesivedyn.py
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/cohesivedyn.py	2011-10-17 17:54:06 UTC (rev 19083)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/cohesivedyn.py	2011-10-17 19:45:54 UTC (rev 19084)
@@ -83,8 +83,8 @@
                             [ 8.2, 9.2,],
                             [ 8.3, 9.3,],
                             [ 8.4, 9.4,],
-                            [ 8.5, 9.5,],
-                            [ 8.7, 9.7,],
+                            [ 8.2, 9.2,],
+                            [ 8.3, 9.3,],
                             [ 8.6, 9.6,],
                             [ 8.8, 9.8,],])
 
@@ -93,8 +93,8 @@
                                     [ 9.2, 7.2,],
                                     [ 9.3, 7.3,],
                                     [ 9.4, 7.4,],
-                                    [ 9.5, 7.5,],
-                                    [ 9.7, 7.7,],
+                                    [ 9.2, 7.2,],
+                                    [ 9.3, 7.3,],
                                     [ 1.6, 2.6,],
                                     [ 1.8, 2.8,],])            
         elif testCase == "open":
@@ -102,8 +102,8 @@
                                     [ 9.2, 7.2,],
                                     [ 9.3, 7.3,],
                                     [ 9.4, 7.4,],
-                                    [ 9.5, 7.5,],
-                                    [ 9.7, 7.7,],
+                                    [ 9.2, 7.2,],
+                                    [ 9.3, 7.3,],
                                     [ -10.6, 2.6,],
                                     [ -10.8, 2.8,],])            
 
@@ -160,9 +160,9 @@
                             [ 6.4, 8.4,],
                             [ 6.5, 8.5,],
                             [ 6.6, 8.6,],
-                            [ 6.7, 8.7,],
-                            [ 6.9, 8.9,],
-                            [ 7.1, 9.1,],
+                            [ 6.2, 8.2,],
+                            [ 6.3, 8.3,],
+                            [ 6.5, 8.5,],
                             [-3.8, 4.8,],
                             [ 3.0, 4.0,],
                             [ 3.2, 4.2,],])
@@ -174,9 +174,9 @@
                                     [ 1.4, 2.4,],
                                     [ 1.5, 2.5,],
                                     [ 1.6, 2.6,],
-                                    [ 1.7, 2.7,],
-                                    [ 1.9, 2.9,],
-                                    [ 1.1, 2.1,],
+                                    [ 1.2, 2.2,],
+                                    [ 1.3, 2.3,],
+                                    [ 1.5, 2.5,],
                                     [ 1.8, 0.8,],
                                     [ 1.0, 0.1,],
                                     [ 1.2, 0.2,],])            
@@ -187,9 +187,9 @@
                                     [ 1.4, 2.4,],
                                     [ 1.5, 2.5,],
                                     [ 1.6, 2.6,],
-                                    [ 1.7, 2.7,],
-                                    [ 1.9, 2.9,],
-                                    [ 1.1, 2.1,],
+                                    [ 1.2, 2.2,],
+                                    [ 1.3, 2.3,],
+                                    [ 1.5, 2.5,],
                                     [-10.8, 0.8,],
                                     [-10.0, 0.1,],
                                     [ 1.2, -10.2,],])            
@@ -235,8 +235,8 @@
                             [ 8.4, 9.4,],
                             [ 8.5, 9.5,],
                             [ 8.6, 9.6,],
-                            [ 8.9, 9.9,],
-                            [ 8.7, 9.7,],
+                            [ 8.3, 9.3,],
+                            [ 8.4, 9.4,],
                             [ 8.8, 9.8,],
                             [ 8.0, 9.0,],])
 
@@ -247,8 +247,8 @@
                                     [ 1.4, 2.4,],
                                     [ 1.5, 2.5,],
                                     [ 1.6, 2.6,],
-                                    [ 1.7, 2.7,],
-                                    [ 1.9, 2.9,],
+                                    [ 1.3, 2.3,],
+                                    [ 1.4, 2.4,],
                                     [ 1.8, 2.8,],
                                     [ 1.0, 2.0,],])            
         elif testCase == "open":
@@ -258,8 +258,8 @@
                                     [ 1.4, 2.4,],
                                     [ 1.5, 2.5,],
                                     [ 1.6, 2.6,],
-                                    [ 1.7, 2.7,],
-                                    [ 1.9, 2.9,],
+                                    [ 1.3, 2.3,],
+                                    [ 1.4, 2.4,],
                                     [ -10.8, 2.8,],
                                     [ -10.0, 2.0,],])            
 
@@ -300,7 +300,10 @@
     
     dispRel = duP - duN
 
-    slipVertex = dispRel
+    dispTpdt = disp + dispIncr
+    dispTpdt = numpy.reshape(dispTpdt, n)
+
+    slipVertex = dispRel + dispTpdt[indexP]-dispTpdt[indexN]
     slipVertex = numpy.reshape(slipVertex, (m/DOF,DOF))
     slipVertex = globalToFault(slipVertex, C)
     if testCase == "slip":
@@ -315,7 +318,6 @@
 
     dispIncrE = dispIncr
     dispIncrE = numpy.reshape(dispIncrE, n)
-
     dispIncrE[indexL] = dispIncrE[indexL] + dLagrange
     dispIncrE[indexN] = dispIncrE[indexN] - 0.5*slipVertex
     dispIncrE[indexP] = dispIncrE[indexP] + 0.5*slipVertex
@@ -392,9 +394,9 @@
                             [ 7.3, 8.3, 9.3,],
                             [ 7.4, 8.4, 9.4,],
                             [ 7.5, 8.5, 9.5,],
-                            [ 7.6, 8.6, 9.6,],
-                            [ 7.8, 8.8, 9.8,],
-                            [ 7.0, 8.0, 9.0,],
+                            [ 7.2, 8.2, 9.2,],
+                            [ 7.3, 8.3, 9.3,],
+                            [ 7.4, 8.4, 9.4,],
                             [ 7.7, 8.7, 9.7,],
                             [ 7.9, 8.9, 9.9,],
                             [ 7.1, 8.1, 9.1,],])
@@ -405,9 +407,9 @@
                                     [ 1.3, 2.3, 3.3,],
                                     [ 1.4, 2.4, 3.4,],
                                     [ 1.5, 2.5, 3.5,],
-                                    [ 1.6, 2.6, 3.6,],
-                                    [ 1.8, 2.8, 3.8,],
-                                    [ 1.0, 2.0, 3.0,],
+                                    [ 1.2, 2.2, 3.2,],
+                                    [ 1.3, 2.3, 3.3,],
+                                    [ 1.4, 2.4, 3.4,],
                                     [ 9.7, 2.7, 3.7,],
                                     [ 9.9, 2.9, 3.9,],
                                     [ 9.1, 2.1, 3.1,],])            
@@ -417,9 +419,9 @@
                                     [ 1.3, 2.3, 3.3,],
                                     [ 1.4, 2.4, 3.4,],
                                     [ 1.5, 2.5, 3.5,],
-                                    [ 1.6, 2.6, 3.6,],
-                                    [ 1.8, 2.8, 3.8,],
-                                    [ 1.0, 2.0, 3.0,],
+                                    [ 1.2, 2.2, 3.2,],
+                                    [ 1.3, 2.3, 3.3,],
+                                    [ 1.4, 2.4, 3.4,],
                                     [-20.7,  2.7, 3.7,],
                                     [-20.9,  2.9, 3.9,],
                                     [-20.1,  2.1, 3.1,],])            
@@ -509,10 +511,10 @@
                             [ 4.0, 2.0, 3.0,],
                             [ 4.1, 2.1, 3.1,],
                             [ 4.2, 2.2, 3.2,],
-                            [ 4.3, 2.3, 3.3,],
                             [ 4.5, 2.5, 3.5,],
+                            [ 4.6, 2.6, 3.6,],
                             [ 4.7, 2.7, 3.7,],
-                            [ 4.9, 2.9, 3.9,],
+                            [ 4.8, 2.8, 3.8,],
                             [ 4.4, 2.4, 3.4,],
                             [ 4.6, 2.6, 3.6,],
                             [ 4.8, 2.8, 3.8,],
@@ -531,10 +533,10 @@
                                     [ 1.0, 2.0, 0.0,],
                                     [ 1.1, 2.1, 0.1,],
                                     [ 1.2, 2.2, 0.2,],
-                                    [ 1.3, 2.3, 0.3,],
                                     [ 1.5, 2.5, 0.5,],
+                                    [ 1.6, 2.6, 0.6,],
                                     [ 1.7, 2.7, 0.7,],
-                                    [ 1.9, 2.9, 0.9,],
+                                    [ 1.8, 2.8, 0.8,],
                                     [ 1.4, 2.4, 0.4,],
                                     [ 1.6, 2.6, 0.6,],
                                     [ 1.8, 2.8, 0.8,],
@@ -552,10 +554,10 @@
                                     [ 1.0, 2.0, 0.0,],
                                     [ 1.1, 2.1, 0.1,],
                                     [ 1.2, 2.2, 0.2,],
-                                    [ 1.3, 2.3, 0.3,],
                                     [ 1.5, 2.5, 0.5,],
+                                    [ 1.6, 2.6, 0.6,],
                                     [ 1.7, 2.7, 0.7,],
-                                    [ 1.9, 2.9, 0.9,],
+                                    [ 1.8, 2.8, 0.8,],
                                     [-10.4, 2.4, 0.4,],
                                     [-10.6, 2.6, 0.6,],
                                     [-10.8, 2.8, 0.8,],
@@ -599,7 +601,10 @@
     
     dispRel = duP - duN
 
-    slipVertex = dispRel
+    dispTpdt = disp + dispIncr
+    dispTpdt = numpy.reshape(dispTpdt, n)
+
+    slipVertex = dispRel + dispTpdt[indexP]-dispTpdt[indexN]
     slipVertex = numpy.reshape(slipVertex, (m/DOF,DOF))
     slipVertex = globalToFault(slipVertex, C)
     if testCase == "slip":



More information about the CIG-COMMITS mailing list