 |
tChanged default parameter values - sphere - GPU-based 3D discrete element meth… |
 |
git clone git://src.adamsgaard.dk/sphere |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 64db934af888379c169a6dd049403e8583fd8f92 |
|
parent 4d3c6955f57e81d58fe8f0135d673a39e6b50d15 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Thu, 6 Sep 2012 14:50:24 +0200 |
|
|
|
Changed default parameter values |
|
|
|
Diffstat: |
|
M python/sphere.py | 18 +++++++++--------- |
|
|
|
1 file changed, 9 insertions(+), 9 deletions(-) |
|
--- |
|
diff --git a/python/sphere.py b/python/sphere.py |
|
t@@ -654,16 +654,16 @@ class Spherebin: |
|
self.time_file_dt[0] = file_dt |
|
self.time_step_count[0] = 0 |
|
|
|
- def defaultParams(self, ang_s = 20, |
|
- ang_d = 15, |
|
+ def defaultParams(self, ang_s = 28, |
|
+ ang_d = 28, |
|
ang_r = 0, |
|
- rho = 2660, |
|
- k_n = 1e9, |
|
- k_t = 1e9, |
|
- k_r = 4e6, |
|
- gamma_n = 1e3, |
|
- gamma_t = 1e3, |
|
- gamma_r = 2e3, |
|
+ rho = 2600, |
|
+ k_n = 1.16e9, |
|
+ k_t = 1.16e9, |
|
+ k_r = 0, |
|
+ gamma_n = 0, |
|
+ gamma_t = 0, |
|
+ gamma_r = 0, |
|
gamma_wn = 1e3, |
|
gamma_ws = 1e3, |
|
gamma_wr = 2e3, |
