tonly read interaction force if np>0. Set1 default - 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 c4537045c16f9addc88c92d6acd3185033395d6e
 (DIR) parent 5fe93e0a63a2a3aee9ca74a41995943f8410b055
 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Tue, 17 Jun 2014 12:58:20 +0200
       
       only read interaction force if np>0. Set1 default
       
       Diffstat:
         M src/debug.h                         |       4 ++--
         M src/navierstokes.cuh                |       2 +-
         M tests/cfd_tests_neumann.py          |       1 -
       
       3 files changed, 3 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
       -#define SET_2
       +#define SET_1
       +//#define SET_2
        
        #endif
 (DIR) diff --git a/src/navierstokes.cuh b/src/navierstokes.cuh
       t@@ -2184,7 +2184,7 @@ __global__ void findPredNSvelocities(
                // The particle-fluid interaction force should only be incoorporated if
                // there is a fluid viscosity
                Float3 f_i_c, f_i_xn, f_i_yn, f_i_zn;
       -        if (devC_params.mu > 0.0) {
       +        if (devC_params.mu > 0.0 && devC_np > 0) {
                    f_i_c  = dev_ns_F_pf[cellidx];
                    f_i_xn = dev_ns_F_pf[idx(x-1,y,z)];
                    f_i_yn = dev_ns_F_pf[idx(x,y-1,z)];
 (DIR) diff --git a/tests/cfd_tests_neumann.py b/tests/cfd_tests_neumann.py
       t@@ -37,7 +37,6 @@ else:
        print('''# Neumann bottom, Dirichlet top BC.
        # Gravity, pressure gradients => transient flow''')
        orig = sphere.sim("neumann", fluid = True)
       -cleanup(orig)
        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)