------------------------------------------------------------
revno: 2258
fixes bug(s): https://launchpad.net/bugs/585898
committer: Anton Gladky <[email protected]>
branch nick: trunk
timestamp: Fri 2010-05-28 00:07:26 +0200
message:
Blocking the crashing string in ElasticContactLaw
modified:
pkg/dem/Engine/GlobalEngine/ElasticContactLaw.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/ElasticContactLaw.cpp'
--- pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp 2010-05-26 14:44:07 +0000
+++ pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp 2010-05-27 22:07:26 +0000
@@ -127,7 +127,9 @@
Real trialFsSq = trialFs.squaredNorm();
if(trialFsSq>maxFsSq){
Real multiplier=sqrt(maxFsSq/trialFsSq);
- geom->scaleDisplacementT(multiplier); trialFs*=multiplier;}
+ //geom->scaleDisplacementT(multiplier);
+ trialFs*=multiplier;
+ }
phys->shearForce=trialFs;
applyForceAtContactPoint(phys->normalForce+trialFs,geom->contactPoint,contact->getId1(),geom->se31.position,contact->getId2(),geom->se32.position,scene);
}
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
