yade-dev team mailing list archive

Thread
Date

[Branch ~yade-dev/yade/trunk] Rev 2089: fix typo

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 18 Mar 2010 16:40:37 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2089
committer: Sergei D <sega@sega>
branch nick: trunk
timestamp: Thu 2010-03-18 19:37:53 +0300
message:
  fix typo
modified:
  pkg/dem/meta/ViscoelasticPM.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.

=== modified file 'pkg/dem/meta/ViscoelasticPM.cpp'
--- pkg/dem/meta/ViscoelasticPM.cpp	2010-03-17 19:04:09 +0000
+++ pkg/dem/meta/ViscoelasticPM.cpp	2010-03-18 16:37:53 +0000
@@ -74,7 +74,7 @@
 	Vector3r relativeVelocity = (de1.vel+de1.angVel.Cross(c1x)) - (de2.vel+de2.angVel.Cross(c2x)) ;
 	Real normalVelocity	= geom.normal.Dot(relativeVelocity);
 	Vector3r shearVelocity	= relativeVelocity-normalVelocity*geom.normal;
-	shearForce = (phys.ks*dt+phys.cs)*shearVelocity;
+	shearForce += (phys.ks*dt+phys.cs)*shearVelocity;
 
 	phys.normalForce = ( phys.kn * geom.penetrationDepth + phys.cn * normalVelocity ) * geom.normal;
 	phys.prevNormal = geom.normal;