[cig-commits] r11598 - in long/3D/Gale/trunk: . src/Gale/Utils/src

[walter at geodynamics.org]

Author: walter
Date: 2008-03-26 13:58:08 -0700 (Wed, 26 Mar 2008)
New Revision: 11598

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c
Log:
 r2051 at earth:  boo | 2008-03-26 13:27:45 -0700
 Make StaticFriction work when normal stress=0



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2050
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2051

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c	2008-03-26 20:58:02 UTC (rev 11597)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c	2008-03-26 20:58:08 UTC (rev 11598)
@@ -660,7 +660,8 @@
                       self->include_lower_boundary,
                       self->include_upper_boundary,
                       &normal_stress,&tangential_norm,n)
-                     && self->friction*normal_stress>=tangential_norm)
+                     && (self->friction*normal_stress>=tangential_norm
+                         || normal_stress==0))
                     {
                       IndexSet_Add(set,n_i);
                     }