------------------------------------------------------------ revno: 3882 committer: Anton Gladky <[email protected]> timestamp: Thu 2014-04-03 11:27:51 +0200 message: Fix compilation. modified: pkg/dem/ViscoelasticPM.hpp
-- 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/ViscoelasticPM.hpp' --- pkg/dem/ViscoelasticPM.hpp 2014-04-03 09:05:20 +0000 +++ pkg/dem/ViscoelasticPM.hpp 2014-04-03 09:27:51 +0000 @@ -27,7 +27,7 @@ ((Real,ks,NaN,,"Shear elastic stiffness. Attention, this parameter cannot be set if tc, en or es is defined!")) ((Real,cs,NaN,,"Shear viscous constant. Attention, this parameter cannot be set if tc, en or es is defined!")) ((Real,mR,0.0,,"Rolling resistance, see [Zhou1999536]_.")) - ((unsigned int,mRtype,1,,"Rolling resistance type, see [Zhou1999536]_. mRtype=1 - equation (3) in [Zhou1999536]_; mRtype=2 - equation (4) in [Zhou1999536]_.")) + ((unsigned int,mRtype,1,,"Rolling resistance type, see [Zhou1999536]_. mRtype=1 - equation (3) in [Zhou1999536]_; mRtype=2 - equation (4) in [Zhou1999536]_.")), createIndex(); ); REGISTER_CLASS_INDEX(ViscElMat,FrictMat); @@ -78,5 +78,5 @@ }; REGISTER_SERIALIZABLE(Law2_ScGeom_ViscElPhys_Basic); -Real contactParameterCalculation(const Real& l1,const Real& l2, const bool& massMultiply); +Real contactParameterCalculation(const Real& l1,const Real& l2); void computeForceTorqueViscEl(shared_ptr<IGeom>& _geom, shared_ptr<IPhys>& _phys, Interaction* I, Vector3r & force, Vector3r & torque1, Vector3r & torque2);
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
