tdecrease v_f_z tolerance, shorten test w/o gravity, use SET_1 - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
 (HTM) git clone git://src.adamsgaard.dk/sphere
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) LICENSE
       ---
 (DIR) commit a4c60b5f703e14c9eceaebfa453254a7b6907a8c
 (DIR) parent 66f0976b98fe72703eefec2e29d90bc623520325
 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Mon, 20 Oct 2014 16:10:59 +0200
       
       decrease v_f_z tolerance, shorten test w/o gravity, use SET_1
       
       Diffstat:
         M src/debug.h                         |       4 ++--
         M tests/cfd_tests_neumann.py          |       5 +++--
       
       2 files changed, 5 insertions(+), 4 deletions(-)
       ---
 (DIR) diff --git a/src/debug.h b/src/debug.h
       t@@ -51,7 +51,7 @@ const int conv_log_interval = 4;
        // simulation of particulate systems: Theoretical developments".
        // SET_2 corresponds approximately to Model A in Zhu et al. 2007.
        // Choose exactly one.
       -//#define SET_1 // set 1 not functional!
       -#define SET_2
       +#define SET_1
       +//#define SET_2
        
        #endif
 (DIR) diff --git a/tests/cfd_tests_neumann.py b/tests/cfd_tests_neumann.py
       t@@ -16,7 +16,7 @@ orig.defaultParams(mu_s = 0.4, mu_d = 0.4)
        orig.defineWorldBoundaries([0.4, 0.4, 1], dx = 0.1)
        #orig.initFluid(mu = 8.9e-4)
        orig.initFluid(mu = 0.0)
       -orig.initTemporal(total = 0.5, file_dt = 0.05, dt = 1.0e-4)
       +orig.initTemporal(total = 0.05, file_dt = 0.005, dt = 1.0e-4)
        py = sphere.sim(sid = orig.sid, fluid = True)
        orig.bc_bot[0] = 1      # No-flow BC at bottom (Neumann)
        #orig.run(dry=True)
       t@@ -62,7 +62,8 @@ compareNumpyArraysClose(ideal_grad_p_z, py.p_f[0,0,:],
                "Pressure gradient:\t", tolerance=1.0e2)
        
        # Fluid flow along z should be very small
       -if ((numpy.abs(py.v_f[:,:,:,2]) < 5.0e-2).all()):
       +#if ((numpy.abs(py.v_f[:,:,:,2]) < 5.0e-2).all()):
       +if ((numpy.abs(py.v_f[:,:,:,2]) < 1.0e-4).all()):
            print("Flow field:\t\t" + passed())
        else:
            print("Flow field:\t\t" + failed())