tdisable smoothing by default - sphere - GPU-based 3D discrete element method a… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit c78588fb16a62ac83d795931b11eb627e3301f87 | |
parent 41e66afd67d38a7d4184b80c7a883ac6008ae44c | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 9 Jun 2014 15:23:29 +0200 | |
disable smoothing by default | |
Diffstat: | |
M python/sphere.py | 6 +++--- | |
M tests/cfd_tests_neumann.py | 3 +-- | |
2 files changed, 4 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -306,7 +306,7 @@ class sim: | |
# Smoothing parameter, should be in the range [0.0;1.0[. | |
# 0.0 = no smoothing. | |
- self.gamma = numpy.array(0.5) | |
+ self.gamma = numpy.array(0.0) | |
# Under-relaxation parameter, should be in the range ]0.0;1.0]. | |
# 1.0 = no under-relaxation | |
t@@ -2410,7 +2410,7 @@ class sim: | |
self.free_slip_bot = numpy.ones(1, dtype=numpy.int32) | |
self.free_slip_top = numpy.ones(1, dtype=numpy.int32) | |
- self.gamma = numpy.array(0.5) | |
+ self.gamma = numpy.array(0.0) | |
self.theta = numpy.array(1.0) | |
self.beta = numpy.array(0.0) | |
self.tolerance = numpy.array(1.0e-8) | |
t@@ -3919,7 +3919,7 @@ class sim: | |
parameter should be in the range [0.0;1.0[. The higher the value, the | |
more averaging is introduced. A value of 0.0 disables all averaging. | |
- The default and recommended value is 0.5. | |
+ The default and recommended value is 0.0. | |
:param theta: The smoothing parameter value | |
:type theta: float | |
diff --git a/tests/cfd_tests_neumann.py b/tests/cfd_tests_neumann.py | |
t@@ -20,11 +20,10 @@ py = sphere.sim(sid = orig.sid, fluid = True) | |
orig.bc_bot[0] = 1 # No-flow BC at bottom (Neumann) | |
#orig.run(dry=True) | |
orig.run(verbose=False) | |
-#orig.writeVTKall() | |
+orig.writeVTKall() | |
py.readlast(verbose = False) | |
ones = numpy.ones((orig.num)) | |
py.readlast(verbose = False) | |
-py.writeVTKall() | |
compareNumpyArraysClose(ones, py.p_f, "Conservation of pressure:", | |
tolerance = 1.0e-1) | |