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

[walter at geodynamics.org]

Author: walter
Date: 2008-05-23 14:31:51 -0700 (Fri, 23 May 2008)
New Revision: 12014

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c
Log:
 r2183 at earth:  boo | 2008-05-23 14:11:41 -0700
 Use nodal pressures for static friction



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

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c	2008-05-23 21:31:48 UTC (rev 12013)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/StaticFrictionVC.c	2008-05-23 21:31:51 UTC (rev 12014)
@@ -664,21 +664,8 @@
                   double normal_stress, tangential_stress[3],
                     tangential_norm, n[3], p, temp;
 
-                  /* Average the pressure over neighboring cells to
-                     get the pressure at the node. */
-                  unsigned nInc;
-                  unsigned *inc;
-                  unsigned nn;
+                  FeVariable_GetValueAtNode(pressure,n_i,&p);
 
-                  Mesh_GetIncidence(self->_mesh, MT_VERTEX, n_i, nDims, &nInc, &inc);
-                  p=0;
-                  for(nn=0; nn<nInc; ++nn)
-                    {
-                      FeVariable_GetValueAtNode(pressure,inc[nn],&temp);
-                      p+=temp;
-                    }
-                  p/=nInc;
-
                   /* If the pressure is zero, then we are at the first
                      time step.  So we don't compute interface
                      stresses and just use the supplied initial
@@ -1021,10 +1008,6 @@
         - n[1]*(*normal_stress);
 
       *tangential_norm=Vec_Mag2D(tangential_stress);
-
-/*       printf("interface %lf %lf %lf %lf %d\n", */
-/*              n[0],n[1],surface[0],surface[1],sign); */
-
     }
   else
     {