yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3699
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Wed 2013-08-28 14:00:42 +0200
message:
  Minor fix in capillary models in ViscoelasticPM.
modified:
  pkg/dem/ViscoelasticCapillarPM.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/ViscoelasticCapillarPM.cpp'
--- pkg/dem/ViscoelasticCapillarPM.cpp	2013-06-12 14:35:50 +0000
+++ pkg/dem/ViscoelasticCapillarPM.cpp	2013-08-28 12:00:42 +0000
@@ -50,7 +50,7 @@
          */ 
         
         Real R = phys.R;
-        Real s = -geom.penetrationDepth/2.0;
+        Real s = -geom.penetrationDepth;
         Real Vb = phys.Vb;
         
         Real VbS = Vb/(R*R*R);
@@ -79,7 +79,7 @@
                   (0.03345 + 0.04543*Th1 - 0.09056*Th2) * log(VbS) +
                   (0.0018574 + 0.004456*Th1 - 0.006257*Th2) *log(VbS)*log(VbS);
   
-        Real sPl = s/sqrt(Vb/R);
+        Real sPl = (s/2.0)/sqrt(Vb/R);
         
         Real lnFS = f1 - f2*exp(f3*log(sPl) + f4*log(sPl)*log(sPl));
         Real FS = exp(lnFS);