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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
Log:
 r2169 at earth:  boo | 2008-05-22 11:16:34 -0700
 Cleanup



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

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:20 UTC (rev 11998)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c	2008-05-22 18:16:23 UTC (rev 11999)
@@ -382,8 +382,6 @@
           tangential_stress[3], tangential_norm, friction_coefficient;
         Bool include_boundary[3];
 
-        double p;
-
         double *force_vector=StaticFrictionVC_get_force_vector();
 
         Stream* errorStr = Journal_Register( Error_Type, self->type );
@@ -445,7 +443,7 @@
            include_boundary,&normal_stress,tangential_stress,&tangential_norm,n);
 
         {
-/*           double p; */
+          double p;
           FeVariable_GetValueAtNode(pressure,lElement_I,&p);
           normal_stress+=p;
         }
@@ -478,33 +476,9 @@
 
         StaticFrictionVC_get_force_vector(force_vector);
 
-/*         if(force_vector[elementNodes[eNode_I]]>0 */
-/*            && v_norm>1.0e-11) */
-/*           { */
-/*             for(d=0;d<dim;++d) */
-/*               { */
-/*                 elForceVec[ eNode_I*nodeDofCount + d]+=force_vector[elementNodes[eNode_I]]*(v_surface_diff[d]/v_norm)*area/overcount; */
-/*               } */
-/*             printf("kinetic slip %d %d %d %g %g %g %g\n", */
-/*                    lElement_I,eNode_I,elementNodes[eNode_I], */
-/*                    force_vector[elementNodes[eNode_I]]*area/overcount, */
-/*                    v_norm,v_surface_diff[0],v_surface_diff[1]); */
-/*           } */
-/*         else */
-/*           { */
-/*             printf("kinetic stick %d %d %d %g %g %g %g\n", */
-/*                    lElement_I,eNode_I,elementNodes[eNode_I], */
-/*                    force_vector[elementNodes[eNode_I]]*area/overcount, */
-/*                    v_norm,v_surface_diff[0],v_surface_diff[1]); */
-/*           } */
-
         friction_force=friction_coefficient*normal_stress*area/overcount;
 
-/*         if(!(friction_force<0 || v_norm==0)) */
-        if(friction_force>0
-/*            && friction_coefficient*normal_stress<tangential_norm */
-           && v_norm>1.0e-20)
-/*            && v_norm>1.0e-11) */
+        if(friction_force>0 && v_norm>1.0e-20)
           {
           for(d=0;d<dim;++d)
             {
@@ -522,51 +496,16 @@
               if(force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]*old_force<0)
                 {
                   force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]*=0.01;
-                  printf("kinetic reduced\n");
                 }
-/*               force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]= */
-/*                 (friction_force*v_surface_diff[d]/v_norm-old_force) */
-/*                 - tangential_stress[d]*area/overcount; */
 
               elForceVec[ eNode_I*nodeDofCount + d]+=
                 force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d];
-
-/*               elForceVec[ eNode_I*nodeDofCount + d]+=friction_force*v_surface_diff[d]/v_norm; */
-/*             elForceVec[ eNode_I*nodeDofCount + d]+=friction_force*v_surface_diff[d]/v_norm - tangential_stress[d]*area/overcount; */
-/*             node_force[ eNode_I*nodeDofCount + d]+=friction_force*v_surface_diff[d]/v_norm; */
-/*             node_force[ eNode_I*nodeDofCount + d]+=friction_force*v_surface_diff[d]/v_norm - tangential_stress[d]*area/overcount; */
-/*           for(d=0;d<dim;++d) */
-
-          printf("kinetic slip %d %d %d %d %g %g %g %g %g %g %g %g %d %g %g\n",
-                 (lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d,
-                 lElement_I,eNode_I,d,friction_force,old_force,
-                 force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d],
-                 v_norm,v_surface_diff[0],v_surface_diff[1],
-                 normal_stress,p,overcount,tangential_stress[0],
-                 tangential_stress[1]);
             }
           }
         else
           {
           for(d=0;d<dim;++d)
-            {
-              double old_force=
-                force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d];
-              force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]=0;
-
-/*               force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]= */
-/*                 - (tangential_stress[d]*area/overcount-old_force); */
-/*               elForceVec[ eNode_I*nodeDofCount + d]+= */
-/*                 force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]; */
-
-          printf("kinetic stick %d %d %d %d %g %g %g %g %g %g %g %g %d %g %g\n",
-                 (lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d,
-                 lElement_I,eNode_I,d,friction_force,old_force,
-                 force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d],
-                 v_norm,v_surface_diff[0],v_surface_diff[1],
-                 normal_stress,p,overcount,tangential_stress[0],
-                 tangential_stress[1]);
-            }
+            force_vector[(lElement_I*elementNodeCount+eNode_I)*nodeDofCount+d]=0;
           }
       }
   }