yade-dev team mailing list archive

Thread
Date

[Branch ~yade-pkg/yade/git-trunk] Rev 3709: Fix k2-calculation in LudingPM.

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 11 Oct 2013 20:23:26 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3709
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Fri 2013-10-11 21:22:48 +0200
message:
  Fix k2-calculation in LudingPM.
modified:
  pkg/dem/LudingPM.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/LudingPM.cpp'
--- pkg/dem/LudingPM.cpp	2013-10-11 14:42:51 +0000
+++ pkg/dem/LudingPM.cpp	2013-10-11 19:22:48 +0000
@@ -93,11 +93,10 @@
   
   if (phys.DeltMax/phys.DeltPMax >= 1.0) {                           // [Luding2008], equation (8)
     phys.k2 = phys.kp;                                               // [Singh2013], equation (10)
+  } else {
+    phys.k2 = phys.k1 + (phys.kp - phys.k1)*phys.DeltMax/phys.DeltPMax;
   }
   
-  phys.k2 = phys.k1 + (phys.kp - phys.k1)*phys.DeltMax/phys.DeltPMax;
-  
-  
   if (phys.k2>phys.kp) { 
     phys.k2 = phys.kp;
   }
@@ -136,7 +135,6 @@
     }
   }
   
-  
   phys.DeltPrev = Delt;
   
   //===================================================================