tcorrect calls to viscous energy function - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
 (HTM) git clone git://src.adamsgaard.dk/sphere
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) LICENSE
       ---
 (DIR) commit 9d713d88e6e730aba71a8d153120d28f6584ee40
 (DIR) parent b97cceb94ea37bc77a59165f0d994708d8553ed1
 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Fri, 20 Jun 2014 13:23:14 +0200
       
       correct calls to viscous energy function
       
       Diffstat:
         M tests/contactmodel.py               |       9 +++++----
       
       1 file changed, 5 insertions(+), 4 deletions(-)
       ---
 (DIR) diff --git a/tests/contactmodel.py b/tests/contactmodel.py
       t@@ -86,12 +86,12 @@ orig.run(verbose=False)
        after.readlast(verbose=False)
        #print(orig.totalKineticEnergy())
        #print(after.totalKineticEnergy())
       -#print(after.totalViscousNormalEnergy())
       +#print(after.totalViscousEnergy())
        pytestutils.test(orig.vel[0,2] > after.vel[1,2],\
                "Viscoelastic normal collision (1/4):")
        pytestutils.compareFloats(orig.totalKineticEnergy(),
                                  after.totalKineticEnergy()
       -                          + after.totalViscousNormalEnergy(),
       +                          + after.totalViscousEnergy(),
                "Viscoelastic normal collision (2/4):", tolerance=0.05)
        
        # Normal impact with different sizes: Check for conservation of momentum
       t@@ -110,7 +110,7 @@ orig.run(verbose=False)
        after.readlast(verbose=False)
        pytestutils.compareFloats(orig.totalKineticEnergy(),
                                  after.totalKineticEnergy()
       -                          + after.totalViscousNormalEnergy(),
       +                          + after.totalViscousEnergy(),
                "Viscoelastic normal collision (3/4):", tolerance=0.05)
        
        # Normal impact with different sizes: Check for conservation of momentum
       t@@ -129,7 +129,7 @@ orig.run(verbose=False)
        after.readlast(verbose=False)
        pytestutils.compareFloats(orig.totalKineticEnergy(),
                                  after.totalKineticEnergy()
       -                          + after.totalViscousNormalEnergy(),
       +                          + after.totalViscousEnergy(),
                "Viscoelastic normal collision (4/4):", tolerance=0.05)
        
        
       t@@ -205,6 +205,7 @@ orig.initTemporal(total = 0.1, file_dt = 0.01)
        
        orig.run(verbose=False)
        after.readlast(verbose=False)
       +after.totalViscousEnergy()
        pytestutils.compareFloats(orig.totalKineticEnergy(),
                                  after.totalKineticEnergy()
                                  + after.totalRotationalEnergy()