tcorrect simulation lengths, clean up files - sphere - GPU-based 3D discrete el… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 26b198fb064b787573cbc94563dfb1e9f2365fe2 | |
parent 4334070428873a69c2593e64f2777fa48e3910f2 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 20 Jun 2014 13:35:24 +0200 | |
correct simulation lengths, clean up files | |
Diffstat: | |
M tests/contactmodel.py | 2 ++ | |
M tests/contactmodel_wall.py | 6 +++--- | |
2 files changed, 5 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/tests/contactmodel.py b/tests/contactmodel.py | |
t@@ -218,3 +218,5 @@ pytestutils.test(after.totalFrictionalEnergy() > 0.0, | |
"Oblique normal collision (8/8):") | |
pytestutils.test(after.totalFrictionalEnergy() > 0.0, | |
"Oblique normal collision (8/8):") | |
+ | |
+orig.cleanup() | |
diff --git a/tests/contactmodel_wall.py b/tests/contactmodel_wall.py | |
t@@ -21,7 +21,7 @@ orig.vel[0,2] = -0.1 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.gamma_wn[0] = 0.0 # Disable wall viscosity | |
orig.gamma_wt[0] = 0.0 # Disable wall viscosity | |
-orig.initTemporal(total = 0.3, file_dt = 0.01) | |
+orig.initTemporal(total = 1.0, file_dt = 0.01) | |
#orig.time_dt = orig.time_dt*0.1 | |
moment_before = orig.totalKineticEnergy() | |
orig.run(verbose=False) | |
t@@ -66,7 +66,7 @@ orig.vel[0,2] = -0.1 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.gamma_wn[0] = 1.0e6 | |
orig.gamma_wt[0] = 0.0 | |
-orig.initTemporal(total = 0.3, file_dt = 0.01) | |
+orig.initTemporal(total = 1.0, file_dt = 0.01) | |
Ekin_before = orig.energy('kin') | |
orig.run(verbose=False) | |
#orig.writeVTKall() | |
t@@ -89,7 +89,7 @@ orig.vel[0,0] = 0.1 | |
orig.defineWorldBoundaries(L=[10,10,10]) | |
orig.gamma_wn[0] = 1.0e6 | |
orig.gamma_wt[0] = 1.0e6 | |
-orig.initTemporal(total = 0.3, file_dt = 0.01) | |
+orig.initTemporal(total = 1.0, file_dt = 0.01) | |
E_kin_before = orig.energy('kin') | |
orig.run(verbose=False) | |
#orig.writeVTKall() |