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

[walter at geodynamics.org]

Author: walter
Date: 2008-05-22 11:16:20 -0700 (Thu, 22 May 2008)
New Revision: 11998

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
Log:
 r2168 at earth:  boo | 2008-05-22 11:13:12 -0700
 Make kinetic friction reduce by 10^20, not 100.  Also use 10^-20 as when a node is not really slipping



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

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c	2008-05-22 18:16:17 UTC (rev 11997)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c	2008-05-22 18:16:20 UTC (rev 11998)
@@ -503,7 +503,8 @@
 /*         if(!(friction_force<0 || v_norm==0)) */
         if(friction_force>0
 /*            && friction_coefficient*normal_stress<tangential_norm */
-           && v_norm>1.0e-11)
+           && v_norm>1.0e-20)
+/*            && v_norm>1.0e-11) */
           {
           for(d=0;d<dim;++d)
             {
@@ -520,7 +521,7 @@
               
               if(force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]*old_force<0)
                 {
-                  force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]*=1.0e-20;
+                  force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]*=0.01;
                   printf("kinetic reduced\n");
                 }
 /*               force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]= */