------------------------------------------------------------ revno: 2183 committer: Bruno Chareyre <bchare...@r1arduina> branch nick: trunk timestamp: Mon 2010-04-26 11:16:20 +0200 message: - Put back Vector3r::Zero() modified: pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.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/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp' --- pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp 2010-04-26 09:02:51 +0000 +++ pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp 2010-04-26 09:16:20 +0000 @@ -69,7 +69,7 @@ Vector3r& shearForce = currentContactPhysics->shearForce; - if (contact->isFresh(ncb)) shearForce = Vector3r::ZERO; + if (contact->isFresh(ncb)) shearForce = Vector3r::Zero(); Real un = currentContactGeometry->penetrationDepth; Real Fn = currentContactPhysics->kn*un; currentContactPhysics->normalForce = Fn*currentContactGeometry->normal; @@ -102,7 +102,7 @@ maxFs = maxFs / Fs; if (maxFs>1) cerr << "maxFs>1!!" << endl; shearForce *= maxFs; - if (Fn<0) currentContactPhysics->normalForce = Vector3r::ZERO;//Vector3r::Zero() + if (Fn<0) currentContactPhysics->normalForce = Vector3r::Zero();//Vector3r::Zero() } applyForceAtContactPoint(-currentContactPhysics->normalForce-shearForce, currentContactGeometry->contactPoint, id1, de1->se3.position, id2, de2->se3.position, ncb);
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
