tdecrease elastic stiffness for tests - sphere - GPU-based 3D discrete element … | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit d7c50fd0540071e68bd56b8eb99188627e5620f7 | |
parent f67134dcadd498588f5689329190fa3940efff8d | |
Author: Anders Damsgaard Christensen <[email protected]> | |
Date: Tue, 16 Aug 2016 12:45:09 -0700 | |
decrease elastic stiffness for tests | |
Diffstat: | |
M tests/contactmodel_wall_young.py | 8 ++++---- | |
M tests/contactmodel_young.py | 18 +++++++++--------- | |
2 files changed, 13 insertions(+), 13 deletions(-) | |
--- | |
diff --git a/tests/contactmodel_wall_young.py b/tests/contactmodel_wall_young.py | |
t@@ -17,7 +17,7 @@ orig = sphere.sim(np=1, nw=0, sid='contactmodeltest') | |
sphere.cleanup(orig) | |
orig.radius[:] = 1.0 | |
orig.x[0,:] = [5.0, 5.0, 1.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = -0.1 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.gamma_wn[0] = 0.0 # Disable wall viscosity | |
t@@ -42,7 +42,7 @@ pytestutils.compareFloats(moment_before, moment_after,\ | |
orig = sphere.sim(np=1, sid='contactmodeltest') | |
orig.radius[:] = 1.0 | |
orig.x[0,:] = [5.0, 5.0, 1.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = -0.1 | |
orig.vel[0,0] = 0.1 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
t@@ -64,7 +64,7 @@ pytestutils.compareFloats(moment_before, moment_after,\ | |
orig = sphere.sim(np=1, sid='contactmodeltest') | |
orig.radius[:] = 1.0 | |
orig.x[0,:] = [5.0, 5.0, 1.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = -0.1 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.gamma_wn[0] = 1.0e6 | |
t@@ -87,7 +87,7 @@ pytestutils.compareFloats(Ekin_before, Ekin_after+Ev_after,\ | |
orig = sphere.sim(np=1, sid='contactmodeltest') | |
orig.radius[:] = 1.0 | |
orig.x[0,:] = [5.0, 5.0, 1.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = -0.1 | |
orig.vel[0,0] = 0.1 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
diff --git a/tests/contactmodel_young.py b/tests/contactmodel_young.py | |
t@@ -20,7 +20,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [1.0, 1.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 4.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
v_orig = 1 | |
orig.vel[0,2] = v_orig | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
t@@ -43,7 +43,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [2.0, 1.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 5.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = 1.0 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.initTemporal(total = 0.1, file_dt = 0.01) | |
t@@ -60,7 +60,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [1.0, 2.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 5.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = 1.0 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.initTemporal(total = 0.1, file_dt = 0.01) | |
t@@ -80,7 +80,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [1.0, 1.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 4.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
v_orig = 1 | |
orig.vel[0,2] = v_orig | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
t@@ -106,7 +106,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [2.0, 1.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 5.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = 1.0 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.initTemporal(total = 0.1, file_dt = 0.01) | |
t@@ -126,7 +126,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [1.0, 2.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 5.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = 1.0 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.initTemporal(total = 0.1, file_dt = 0.01) | |
t@@ -151,7 +151,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [1.0, 1.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 4.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = 1 | |
orig.vel[0,0] = 1 | |
orig.mu_s[0] = 1e9 # no slip | |
t@@ -176,7 +176,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [1.0, 1.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 4.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = 1 | |
orig.vel[0,0] = 1 | |
orig.mu_s[0] = 0.3 | |
t@@ -204,7 +204,7 @@ sphere.cleanup(orig) | |
orig.radius[:] = [1.0, 1.0] | |
orig.x[0,:] = [5.0, 5.0, 2.0] | |
orig.x[1,:] = [5.0, 5.0, 4.05] | |
-orig.setYoungsModulus(70.0e9) | |
+orig.setYoungsModulus(7.0e9) | |
orig.vel[0,2] = 1 | |
orig.vel[0,0] = 1 | |
orig.mu_s[0] = 0.3 |