------------------------------------------------------------
revno: 2638
committer: Bruno Chareyre <[email protected]>
branch nick: yade
timestamp: Mon 2011-01-03 15:30:38 +0100
message:
- Missing in last commit (fix builbot failure)
modified:
pkg/dem/NewtonIntegrator.hpp
--
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/NewtonIntegrator.hpp'
--- pkg/dem/NewtonIntegrator.hpp 2010-12-22 10:55:23 +0000
+++ pkg/dem/NewtonIntegrator.hpp 2011-01-03 14:30:38 +0000
@@ -23,6 +23,7 @@
class NewtonIntegrator : public GlobalEngine{
inline void cundallDamp(const Real& dt, const Vector3r& N, const Vector3r& V, Vector3r& A);
+ inline void blockDOFs(State* state, const bool& rotational);
inline void saveMaximaVelocity(const Body::id_t& id, State* state);
bool haveBins;
inline void leapfrogTranslate(State*, const Body::id_t& id, const Real& dt); // leap-frog translate
@@ -49,7 +50,7 @@
#endif
/// velocity bins (not used if not created)
shared_ptr<VelocityBins> velocityBins;
- virtual void action();
+ virtual void action();
YADE_CLASS_BASE_DOC_ATTRS_CTOR(NewtonIntegrator,GlobalEngine,"Engine integrating newtonian motion equations.",
((Real,damping,0.2,,"damping coefficient for Cundall's non viscous damping (see [Chareyre2005]_) [-]"))
((Real,maxVelocitySq,NaN,,"store square of max. velocity, for informative purposes; computed again at every step. |yupdate|"))
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
