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

[walter at geodynamics.org]

Author: walter
Date: 2008-05-14 23:00:17 -0700 (Wed, 14 May 2008)
New Revision: 11972

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
Log:
 r2146 at earth:  boo | 2008-05-14 23:00:11 -0700
 Make kinetic friction reduce the force by 10^20 rather than 100, effectively making it zero.  This seems a little less robust, but does not introduce magic numbers



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

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c	2008-05-15 06:00:09 UTC (rev 11971)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c	2008-05-15 06:00:17 UTC (rev 11972)
@@ -520,7 +520,7 @@
               
               if(force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]*old_force<0)
                 {
-                  force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]/=100.0;
+                  force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]*=1.0e-20;
                   printf("kinetic reduced\n");
                 }
 /*               force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]= */