------------------------------------------------------------
revno: 4092
committer: Bruno Chareyre <[email protected]>
timestamp: Sat 2014-07-19 16:26:26 +0200
message:
add missing 'return bool' in some Law2's
modified:
pkg/dem/ElasticContactLaw.cpp
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to
https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'pkg/dem/ElasticContactLaw.cpp'
--- pkg/dem/ElasticContactLaw.cpp 2014-07-18 18:18:50 +0000
+++ pkg/dem/ElasticContactLaw.cpp 2014-07-19 14:26:26 +0000
@@ -96,6 +96,7 @@
scene->forces.addTorque(id1,(geom->radius1-0.5*geom->penetrationDepth)* geom->normal.cross(force));
scene->forces.addTorque(id2,(geom->radius2-0.5*geom->penetrationDepth)* geom->normal.cross(force));
}
+ return true;
}
bool Law2_ScGeom_ViscoFrictPhys_CundallStrack::go(shared_ptr<IGeom>& ig, shared_ptr<IPhys>& ip, Interaction* contact){
@@ -106,5 +107,5 @@
geom->rotate(phys->creepedShear);
phys->creepedShear+= creepStiffness*phys->ks*(phys->shearForce-phys->creepedShear)*dt/viscosity;
phys->shearForce -= phys->ks*((phys->shearForce-phys->creepedShear)*dt/viscosity);}
- Law2_ScGeom_FrictPhys_CundallStrack::go(ig,ip,contact);
+ return Law2_ScGeom_FrictPhys_CundallStrack::go(ig,ip,contact);
}
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
