------------------------------------------------------------ revno: 3945 committer: Anton Gladky <[email protected]> timestamp: Fri 2014-05-09 15:25:19 +0200 message: Set capillary parameters to 0. instead of -1. modified: core/Body.hpp pkg/dem/ViscoelasticCapillarPM.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 'core/Body.hpp' --- core/Body.hpp 2014-05-08 05:57:04 +0000 +++ core/Body.hpp 2014-05-09 13:25:19 +0000 @@ -95,8 +95,8 @@ ((Real,Cs,0.0,, "Color field (only for SPH-model)")) // [Mueller2003], (15) #endif #ifdef YADE_LIQMIGRATION - ((Real,Vf, -1.0,, "Individual amount of liquid")) - ((Real,Vmin,-1.0,, "Minimal amount of liquid")) + ((Real,Vf, 0.0,, "Individual amount of liquid")) + ((Real,Vmin, 0.0,, "Minimal amount of liquid")) #endif , /* ctor */, === modified file 'pkg/dem/ViscoelasticCapillarPM.hpp' --- pkg/dem/ViscoelasticCapillarPM.hpp 2014-05-08 05:57:04 +0000 +++ pkg/dem/ViscoelasticCapillarPM.hpp 2014-05-09 13:25:19 +0000 @@ -6,9 +6,9 @@ virtual ~ViscElCapMat(); YADE_CLASS_BASE_DOC_ATTRS_CTOR(ViscElCapMat,ViscElMat,"Material for extended viscoelastic model of contact with capillary parameters.", ((bool,Capillar,false,,"True, if capillar forces need to be added.")) - ((Real,Vb,NaN,,"Liquid bridge volume [m^3]")) - ((Real,gamma,NaN,,"Surface tension [N/m]")) - ((Real,theta,NaN,,"Contact angle [°]")) + ((Real,Vb,0.0,,"Liquid bridge volume [m^3]")) + ((Real,gamma,0.0,,"Surface tension [N/m]")) + ((Real,theta,0.0,,"Contact angle [°]")) ((std::string,CapillarType,"",,"Different types of capillar interaction: Willett_numeric, Willett_analytic [Willett2000]_ , Weigert [Weigert1999]_ , Rabinovich [Rabinov2005]_ , Lambert (simplified, corrected Rabinovich model) [Lambert2008]_ ")), createIndex(); ); @@ -29,12 +29,12 @@ ((bool,liqBridgeCreated,false,,"Whether liquid bridge was created, only after a normal contact of spheres")) ((bool,liqBridgeActive,false,, "Whether liquid bridge is active at the moment")) ((Real,sCrit,false,,"Critical bridge length [m]")) - ((Real,Vb,NaN,,"Liquid bridge volume [m^3]")) - ((Real,gamma,NaN,,"Surface tension [N/m]")) - ((Real,theta,NaN,,"Contact angle [rad]")) + ((Real,Vb,0.0,,"Liquid bridge volume [m^3]")) + ((Real,gamma,0.0,,"Surface tension [N/m]")) + ((Real,theta,0.0,,"Contact angle [rad]")) ((CapType,CapillarType,None_Capillar,,"Different types of capillar interaction: Willett_numeric, Willett_analytic, Weigert, Rabinovich, Lambert, Soulie")) #ifdef YADE_LIQMIGRATION - ((Real,Vmax,-1,,"Maximal liquid bridge volume [m^3]")) + ((Real,Vmax,0.0,,"Maximal liquid bridge volume [m^3]")) #endif , createIndex();
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
