tgamma_ws renamed to gamma_wt - 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 d1f0d08576c454a475c7dff77168d7f17ae664f8
 (DIR) parent 97645c4855a4b023c0ad2cb8146889ebd70cc7a9
 (HTM) Author: Anders Damsgaard <adc@geo.au.dk>
       Date:   Mon, 22 Oct 2012 11:37:47 +0200
       
       gamma_ws renamed to gamma_wt
       
       Diffstat:
         M src/contactmodels.cuh               |       2 +-
         M src/file_io.cpp                     |       4 ++--
         M src/main.cpp                        |       2 +-
       
       3 files changed, 4 insertions(+), 4 deletions(-)
       ---
 (DIR) diff --git a/src/contactmodels.cuh b/src/contactmodels.cuh
       t@@ -61,7 +61,7 @@ __device__ Float contactLinear_wall(Float3* F, Float3* T, Float* es_dot,
          // divide by zero (producing a NaN)
          if (vel_t_length > 0.f) {
        
       -    Float f_t_visc  = devC_params.gamma_ws * vel_t_length; // Tangential force by viscous model
       +    Float f_t_visc  = devC_params.gamma_wt * vel_t_length; // Tangential force by viscous model
            Float f_t_limit = devC_params.mu_s * f_n_length;      // Max. friction
        
            // If the shear force component exceeds the friction,
 (DIR) diff --git a/src/file_io.cpp b/src/file_io.cpp
       t@@ -142,7 +142,7 @@ int fwritebin(char *target,
            }
            fwrite(&params->periodic, sizeof(params->periodic), 1, fp);
            fwrite(&params->gamma_wn, sizeof(params->gamma_wn), 1, fp);
       -    fwrite(&params->gamma_ws, sizeof(params->gamma_ws), 1, fp);
       +    fwrite(&params->gamma_wt, sizeof(params->gamma_wt), 1, fp);
            fwrite(&params->gamma_wr, sizeof(params->gamma_wr), 1, fp);
        
        
       t@@ -320,7 +320,7 @@ int fwritebin(char *target,
            fwrite(&params->periodic, sizeof(params->periodic), 1, fp);
            d = (double)params->gamma_wn;
            fwrite(&d, sizeof(d), 1, fp);
       -    d = (double)params->gamma_ws;
       +    d = (double)params->gamma_wt;
            fwrite(&d, sizeof(d), 1, fp);
            d = (double)params->gamma_wr;
            fwrite(&d, sizeof(d), 1, fp);
 (DIR) diff --git a/src/main.cpp b/src/main.cpp
       t@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
          // Wall viscosities
          if (fread(&params.gamma_wn, sizeof(params.gamma_wn), 1, fp) != 1)
            exit(1);
       -  if (fread(&params.gamma_ws, sizeof(params.gamma_ws), 1, fp) != 1)
       +  if (fread(&params.gamma_wt, sizeof(params.gamma_wt), 1, fp) != 1)
            exit(1);
          if (fread(&params.gamma_wr, sizeof(params.gamma_wr), 1, fp) != 1)
            exit(1);