tRemoved problematic symbols - 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 695ed7de2c97e766a0062cfc5fd1d460bebaec84
 (DIR) parent 053ac9acb144b0c2cad656ae928bdec9d4638f57
 (HTM) Author: Anders Damsgaard <adc@geo.au.dk>
       Date:   Tue, 16 Oct 2012 17:23:19 +0200
       
       Removed problematic symbols
       
       Diffstat:
         M src/contactsearch.cuh               |       2 +-
         M src/device.cu                       |       2 +-
       
       2 files changed, 2 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/src/contactsearch.cuh b/src/contactsearch.cuh
       t@@ -426,7 +426,7 @@ __global__ void interact(unsigned int* dev_gridParticleIndex, // Input: Unsorted
            Float3 T = MAKE_FLOAT3(0.0f, 0.0f, 0.0f);
        
            // Apply linear elastic, frictional contact model to registered contacts
       -    if (devC_shearmodel == 2 || devC_shearmodel == 3) {
       +    if (devC_shearmodel == 2 || devC_shearmodel == 3) {
              unsigned int idx_b_orig, mempos;
              Float delta_n, x_ab_length, radius_b;
              Float3 x_ab;
 (DIR) diff --git a/src/device.cu b/src/device.cu
       t@@ -487,7 +487,7 @@ __host__ void gpuMain(Float4* host_x,
            // The contact search in topology() is only necessary for determining
            // the accumulated shear distance needed in the linear elastic
            // and nonlinear contact force model
       -    if (params->shearmodel == 2 || params->shearmodel == 3) {
       +    if (params->shearmodel == 2 || params->shearmodel == 3) {
              // For each particle: Search contacts in neighbor cells
              if (PROFILING == 1)
                startTimer(&kernel_tic);