[cig-commits] r12906 - in long/3D/Gale/trunk: . src/StgFEM/plugins/StandardConditionFunctions

[walter at geodynamics.org]

Author: walter
Date: 2008-09-17 06:52:09 -0700 (Wed, 17 Sep 2008)
New Revision: 12906

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
Log:
 r2346 at earth:  boo | 2008-09-01 02:02:16 -0700
 Make friction slip correctly when it is already slipping



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

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2008-09-17 09:55:36 UTC (rev 12905)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2008-09-17 13:52:09 UTC (rev 12906)
@@ -1605,8 +1605,8 @@
     {
       *result=boundary_v;
     }      
-  else if(fabs(tangent_stress)<yield_stress)
-/*   else if(fabs(tangent_stress)<yield_stress && v[tangent_dim]==boundary_v) */
+/*   else if(fabs(tangent_stress)<yield_stress) */
+  else if(fabs(tangent_stress)<yield_stress && v[tangent_dim]==boundary_v)
     {
       *result=v[tangent_dim];
     }
@@ -1643,6 +1643,10 @@
       
       if((*result-boundary_v)*(v_off[tangent_dim]-boundary_v)<0)
         *result=boundary_v;
+
+      /* Finally, average the results so that we don't oscillate a
+         lot, looking for a solution. */
+      *result=(*result+v[tangent_dim])/2;
     }
 }