[cig-commits] r17038 - short/3D/PyLith/trunk/libsrc/friction

[brad at geodynamics.org]

Author: brad
Date: 2010-07-12 15:45:22 -0700 (Mon, 12 Jul 2010)
New Revision: 17038

Modified:
   short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
Log:
Merge from stable.

Modified: short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-07-12 22:41:30 UTC (rev 17037)
+++ short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-07-12 22:45:22 UTC (rev 17038)
@@ -298,11 +298,16 @@
   assert(0 != numStateVars);
   assert(0 != numProperties);
 
-  const double slipPrev = stateVars[s_slipPrev];
- 
-  stateVars[s_slipPrev] = stateVars[s_slipCum];
-  stateVars[s_slipCum] += fabs(slip - slipPrev);
- 
+  if (slipRate != 0.0) {
+    const double slipPrev = stateVars[s_slipPrev];
+
+    stateVars[s_slipPrev] = stateVars[s_slipCum];
+    stateVars[s_slipCum] += fabs(slip - slipPrev);
+  } else {
+    // Sliding has stopped, so reset state variables.
+    stateVars[s_slipPrev] = slip;
+    stateVars[s_slipCum] = 0.0;
+  } // else
 } // _updateStateVars