[cig-commits] r19553 - short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction

[brad at geodynamics.org]

Author: brad
Date: 2012-02-01 10:57:02 -0800 (Wed, 01 Feb 2012)
New Revision: 19553

Modified:
   short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc
Log:
Fixed bug in updating state variables for slip weakening with time weakening. Bad previous merge from trunk.

Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc	2012-02-01 17:01:03 UTC (rev 19552)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc	2012-02-01 18:57:02 UTC (rev 19553)
@@ -330,8 +330,8 @@
 
   // Don't reset state variables when sliding stops
   // (SCEC dynamic rupture branch only).
-  const double slipPrev = slip;
-  stateVars[s_slipPrev] = stateVars[s_slipCum];
+  const PylithScalar slipPrev = stateVars[s_slipPrev];
+  stateVars[s_slipPrev] = slip;
   stateVars[s_slipCum] += fabs(slip - slipPrev);
 } // _updateStateVars