[cig-commits] r19055 - in short/3D/PyLith/branches/v1.6-revisedfault: libsrc/pylith/faults unittests/libtests/faults/data

[brad at geodynamics.org]

Author: brad
Date: 2011-10-11 12:43:59 -0700 (Tue, 11 Oct 2011)
New Revision: 19055

Modified:
   short/3D/PyLith/branches/v1.6-revisedfault/libsrc/pylith/faults/FaultCohesiveDyn.cc
   short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataHex8.cc
   short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTet4.cc
Log:
Fixed bug in orienting initial tractions.

Modified: short/3D/PyLith/branches/v1.6-revisedfault/libsrc/pylith/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-revisedfault/libsrc/pylith/faults/FaultCohesiveDyn.cc	2011-10-09 19:04:07 UTC (rev 19054)
+++ short/3D/PyLith/branches/v1.6-revisedfault/libsrc/pylith/faults/FaultCohesiveDyn.cc	2011-10-11 19:43:59 UTC (rev 19055)
@@ -573,7 +573,7 @@
       } // for
     } // for
 
-#if 0 // debugging
+#if 1 // debugging
     std::cout << "slipVertex: ";
     for (int iDim=0; iDim < spaceDim; ++iDim)
       std::cout << "  " << slipVertex[iDim];
@@ -693,7 +693,7 @@
     // Do not allow fault interpenetration and set fault opening to
     // zero if fault is under compression.
     if (tractionNormal < -_zeroTolerance || 
-	slipVertex[indexN] + dSlipVertex[indexN] < 0.0) {
+	slipVertex[indexN] + dSlipVertex[indexN] < -_zeroTolerance) {
       dSlipVertex[indexN] = -slipVertex[indexN];
     } // if
 
@@ -1330,7 +1330,7 @@
     for (int iDim=0; iDim < spaceDim; ++iDim) {
       for (int jDim=0; jDim < spaceDim; ++jDim) {
 	initialTractionsVertexGlobal[iDim] += 
-	  orientationVertex[iDim*spaceDim+jDim] *
+	  orientationVertex[jDim*spaceDim+iDim] *
 	  initialTractionsVertex[jDim];
       } // for
     } // for

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-09 19:04:07 UTC (rev 19054)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataHex8.cc	2011-10-11 19:43:59 UTC (rev 19055)
@@ -1100,10 +1100,10 @@
 };
 
 const double pylith::faults::CohesiveDynDataHex8::_initialTractions[] = {
-  -2.0, -3.0, -1.0,
-  -2.1, -3.1, -1.1,
-  -2.2, -3.2, -1.2,
-  -2.3, -3.3, -1.3,
+  +3.0, -1.0, +2.0,
+  +3.1, -1.1, +2.1,
+  +3.2, -1.2, +2.2,
+  +3.3, -1.3, +2.3,
 };
 
 

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-09 19:04:07 UTC (rev 19054)
+++ short/3D/PyLith/branches/v1.6-revisedfault/unittests/libtests/faults/data/CohesiveDynDataTet4.cc	2011-10-11 19:43:59 UTC (rev 19055)
@@ -485,9 +485,9 @@
 };
 
 const double pylith::faults::CohesiveDynDataTet4::_initialTractions[] = {
-  -2.0, -3.0, -1.0,
-  -2.1, -3.1, -1.1,
-  -2.2, -3.2, -1.2,
+  +3.0, -1.0, +2.0, 
+  +3.1, -1.1, +2.1, 
+  +3.2, -1.2, +2.2, 
 };