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

[brad at geodynamics.org]

Author: brad
Date: 2010-01-20 17:19:42 -0800 (Wed, 20 Jan 2010)
New Revision: 16152

Modified:
   short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc
Log:
Fixed some small errors in static friction model.

Modified: short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc	2010-01-21 01:12:42 UTC (rev 16151)
+++ short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc	2010-01-21 01:19:42 UTC (rev 16152)
@@ -138,9 +138,11 @@
   assert(0 == numStateVars);
 
   const double friction = (normalTraction < 0) ?
-    properties[p_coef] * normalTraction : 0.0;
+    -properties[p_coef] * normalTraction : 0.0;
 
   PetscLogFlops(1);
+
+  return friction;
 } // _calcFriction