tChanged order in params struct - sphere - GPU-based 3D discrete element method… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 73fc6c1a3ca9364ec5a963d5ccaaa6a0975b5742 | |
parent 93d318f535ddd9d4db2a5cfb4a074d786518c051 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 8 Nov 2012 12:24:36 +0100 | |
Changed order in params struct | |
Diffstat: | |
M src/datatypes.h | 8 ++++---- | |
1 file changed, 4 insertions(+), 4 deletions(-) | |
--- | |
diff --git a/src/datatypes.h b/src/datatypes.h | |
t@@ -75,13 +75,13 @@ struct Params { | |
Float gamma_n; // Normal viscosity | |
Float gamma_t; // Tangential viscosity | |
Float gamma_r; // Rotational viscosity | |
- Float mu_ws; // Wall static friction coefficient | |
- Float mu_wd; // Wall dynamic friction coefficient | |
- Float gamma_wn; // Wall normal viscosity | |
- Float gamma_wt; // Wall tangential viscosity | |
Float mu_s; // Static friction coefficient | |
Float mu_d; // Dynamic friction coefficient | |
Float mu_r; // Rotational friction coefficient | |
+ Float gamma_wn; // Wall normal viscosity | |
+ Float gamma_wt; // Wall tangential viscosity | |
+ Float mu_ws; // Wall static friction coefficient | |
+ Float mu_wd; // Wall dynamic friction coefficient | |
Float rho; // Material density | |
unsigned int contactmodel; // Inter-particle contact model | |
Float kappa; // Capillary bond prefactor |