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

[walter at geodynamics.org]

Author: walter
Date: 2008-03-28 10:17:20 -0700 (Fri, 28 Mar 2008)
New Revision: 11620

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
Log:
 r2077 at earth:  boo | 2008-03-28 10:17:49 -0700
 Minor code cleanup



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

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c	2008-03-28 07:46:34 UTC (rev 11619)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c	2008-03-28 17:17:20 UTC (rev 11620)
@@ -395,13 +395,13 @@
             switch(self->v_entry[d].type)
               {
               case StressBC_Double:
-                v[d]=self->v_entry[d].DoubleValue;
+                v_boundary[d]=self->v_entry[d].DoubleValue;
                 break;
               case StressBC_ConditionFunction:
                 cf=self->conFunc_Register
                   ->_cf[self->v_entry[d].CFIndex];
                 ConditionFunction_Apply(cf,elementNodes[eNode_I],
-                                        0,self->context,v+d);
+                                        0,self->context,v_boundary+d);
                 break;
               }
           }
@@ -436,7 +436,7 @@
         Journal_Firewall( ( velocity!=NULL ), errorStr,
                           "Error: In KineticFriction, the name provided for the velocity field \"%s\" does not exist\n",
                           self->velocity_name);
-        FeVariable_GetValueAtNode(velocity,eNode_I,v_boundary);
+        FeVariable_GetValueAtNode(velocity,eNode_I,v);
         
         /* Get the magnitude of the velocity parallel to the surface. */
         if(dim==2)