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

[surendra at geodynamics.org]

Author: surendra
Date: 2010-03-15 17:28:24 -0700 (Mon, 15 Mar 2010)
New Revision: 16428

Modified:
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynDataHex8.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynDataQuad4.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/cohesivedyn.py
Log:
Modified FaultCohesiveDyn unittests for quad4 and hex8 to use right-lateral slip

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynDataHex8.cc	2010-03-16 00:08:01 UTC (rev 16427)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynDataHex8.cc	2010-03-16 00:28:24 UTC (rev 16428)
@@ -1402,10 +1402,10 @@
   6.5, 8.5, 10.5, // 15
   6.7, 8.7, 10.7, // 16
   6.9, 8.9, 10.9, // 17
-  6.4, 8.4, -10.4, // 18
-  6.6, 8.6, -10.6, // 19
-  6.8, 8.8, -10.8, // 20
-  6.0, 8.0, -10.0, // 21
+  -6.4, -8.4, -10.4, // 18
+  -6.6, -8.6, -10.6, // 19
+  -6.8, -8.8, -10.8, // 20
+  -6.0, -8.0, -10.0, // 21
 };
 
 // Output
@@ -1426,17 +1426,17 @@
   6.5, 8.5, 10.5, // 15
   6.7, 8.7, 10.7, // 16
   6.9, 8.9, 10.9, // 17
-  -5.04097437, -6.91927077,  -10.4, // 18
-  -5.23905396, -7.12071099,  -10.6, // 19
-  -5.4372421, -7.32208086,   -10.8, // 20 
-  -4.6451818,  -6.516157,    -10.0, // 21
+  -5.82426407, -7.82426407,  -10.4, // 18
+  -6.02426407, -8.02426407,  -10.6, // 19
+  -6.22426407, -8.22426407,  -10.8, // 20
+  -5.42426407, -7.42426407,  -10.0, // 21
 };
 
 const double pylith::faults::CohesiveDynDataHex8::_slipSlipE[] = {
-  22.88194874,  30.63854153,  0.0,
-  23.67810791,  31.44142198,  0.0,
-  24.4744842,   32.24416172,  0.0,
-  21.2903636,   29.032314,    0.0,
+  -1.15147186,  -1.15147186,  0.0,
+  -1.15147186,  -1.15147186,  0.0,
+  -1.15147186,  -1.15147186,  0.0,
+  -1.15147186,  -1.15147186,  0.0,
 };
 
 // ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynDataQuad4.cc	2010-03-16 00:08:01 UTC (rev 16427)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynDataQuad4.cc	2010-03-16 00:28:24 UTC (rev 16428)
@@ -360,8 +360,8 @@
   9.6, 10.6,
   9.7, 10.7, // 8
   9.9, 10.9, // 9
-  9.8, -10.8, // 10
-  9.0, -10.0, // 11
+  -9.8, -10.8, // 10
+  -9.0, -10.0, // 11
 };
 
 // Output
@@ -375,14 +375,14 @@
   9.6, 10.6,
   9.7, 10.7, // 8
   9.9, 10.9, // 9
-  -8.8+1.0*0.6, -10.8, // 10
-  -8.0+1.0*0.6, -10.0, // 11
+  -9.4, -10.8, // 10
+  -8.6, -10.0, // 11
 };
 
 // :TODO: Update slip values based on changes in Lagrange multiplier values
 const double pylith::faults::CohesiveDynDataQuad4::_slipSlipE[] = {
-  36.0, 0.0,
-  32.8, 0.0,
+  -0.8, 0.0,
+  -0.8, 0.0,
 };
 
 // ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/cohesivedyn.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/cohesivedyn.py	2010-03-16 00:08:01 UTC (rev 16427)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/cohesivedyn.py	2010-03-16 00:28:24 UTC (rev 16428)
@@ -17,15 +17,15 @@
     elif cell == "quad4":
         fieldT = numpy.array([[8.8, 9.8],
                               [8.0, 9.0]])
-        fieldIncr = numpy.array([[9.8, -10.8],
-                                 [9.0, -10.0]])
+        fieldIncr = numpy.array([[-9.8, -10.8],
+                                 [-9.0, -10.0]])
         area = numpy.array([1.0, 1.0])
     
 
     # ------------------------------------------------------------------
     fieldTpdt = fieldT + fieldIncr
 
-    tractionShear = fieldTpdt[:,0] / area
+    tractionShear = abs(fieldTpdt[:,0]) / area
     tractionNormal = fieldTpdt[:,1] / area
 
     print "tractionShear",tractionShear
@@ -70,10 +70,10 @@
                               [5.6, 7.6, 9.6],
                               [5.8, 7.8, 9.8],
                               [5.0, 7.0, 9.0]])
-        fieldIncr = numpy.array([[6.4, 8.4, -10.4],
-                                 [6.6, 8.6, -10.6],
-                                 [6.8, 8.8, -10.8],
-                                 [6.0, 8.0, -10.0]])
+        fieldIncr = numpy.array([[-6.4, -8.4, -10.4],
+                                 [-6.6, -8.6, -10.6],
+                                 [-6.8, -8.8, -10.8],
+                                 [-6.0, -8.0, -10.0]])
         area = numpy.array([1.0, 1.0, 1.0, 1.0])