tFinished implementation of Hertzian contact model. Still untested - 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 fec4aebdc2f9e8f4b8cd6008f9f4cf867c69d3d5
 (DIR) parent 695ed7de2c97e766a0062cfc5fd1d460bebaec84
 (HTM) Author: Anders Damsgaard <adc@geo.au.dk>
       Date:   Wed, 17 Oct 2012 10:59:22 +0200
       
       Finished implementation of Hertzian contact model. Still untested
       
       Diffstat:
         M src/contactmodels.cuh               |       2 +-
         M src/main.cpp                        |       8 +++++++-
       
       2 files changed, 8 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/src/contactmodels.cuh b/src/contactmodels.cuh
       t@@ -591,7 +591,7 @@ __device__ void contactHertz(Float3* F, Float3* T,
          // Store sum of tangential displacements
          dev_delta_t[mempos] = MAKE_FLOAT4(delta_t.x, delta_t.y, delta_t.z, 0.0f);
        
       -} // End of contactLinear()
       +} // End of contactHertz()
        
        
        #endif
 (DIR) diff --git a/src/main.cpp b/src/main.cpp
       t@@ -397,7 +397,13 @@ int main(int argc, char *argv[])
          if (params.shearmodel == 1)
            cout << "  - Shear force model: Viscous, fricional\n";
          else if (params.shearmodel == 2)
       -    cout << "  - Shear force model: Elastic, frictional\n";
       +    cout << "  - Shear force model: Linear elastic, viscous, frictional\n";
       +  else if (params.shearmodel == 3)
       +    cout << "  - Shear force model: Nonlinear (Hertzian) elastic, viscous, frictional\n";
       +  else {
       +    cerr << "Error: Shear model value not understood.\n";
       +    exit(1);
       +  }
        
          cout << "  - Number of dynamic walls: " << params.nw << "\n";