[cig-commits] r14216 - in long/3D/Gale/trunk: . src/Gale/Utils/src
walter at geodynamics.org
walter at geodynamics.org
Tue Mar 3 15:02:46 PST 2009
Author: walter
Date: 2009-03-03 15:02:46 -0800 (Tue, 03 Mar 2009)
New Revision: 14216
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
Log:
r2520 at dante: boo | 2009-03-03 15:02:36 -0800
Remove overcount from KineticFriction
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2518
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2520
Modified: long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c 2009-03-03 22:57:10 UTC (rev 14215)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/KineticFriction.c 2009-03-03 23:02:46 UTC (rev 14216)
@@ -377,7 +377,6 @@
if(ijk[direction]==boundary)
{
- unsigned overcount=StressBC_get_overcount(dim,ijk,grid->sizes);
double v[3], v_surface[3], v_surface_diff[3], normal_stress,
tangential_stress[3], tangential_norm, friction_coefficient;
Bool include_boundary[3];
@@ -472,7 +471,7 @@
v_diff_norm=Vec_Mag3D(v_surface_diff);
}
- friction_force=friction_coefficient*normal_stress*area/overcount;
+ friction_force=friction_coefficient*normal_stress*area;
if(friction_force>0 && v_diff_norm!=0.0)
{
More information about the CIG-COMMITS
mailing list