tContactmodels changes - 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 b742ff213fba24e811e63093723c2b8858c86fae
 (DIR) parent c398f9510e7217e16bea1edabeaa5f2cea4cb22d
 (HTM) Author: Anders Damsgaard <adc@geo.au.dk>
       Date:   Thu, 11 Oct 2012 08:51:59 +0200
       
       Contactmodels changes
       
       Diffstat:
         M src/contactmodels.cuh               |       4 ++--
       
       1 file changed, 2 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/src/contactmodels.cuh b/src/contactmodels.cuh
       t@@ -385,8 +385,8 @@ __device__ void contactLinear(Float3* F, Float3* T,
              // Shear friction heat production rate: 
              // The energy lost from the tangential spring is dissipated as heat
              //*es_dot += -dot(vel_t_ab, f_t);
       -      //*es_dot += length(delta_t0 - delta_t) * devC_k_t / devC_dt; // Seen in EsyS-Particle
       -      *es_dot += fabs(dot(delta_t0 - delta_t, f_t)) / devC_dt; 
       +      *es_dot += length(delta_t0 - delta_t) * devC_k_t / devC_dt; // Seen in EsyS-Particle
       +      //*es_dot += fabs(dot(delta_t0 - delta_t, f_t)) / devC_dt; 
        
            } else { // Static case