tMerge branch 'master' of github.com:anders-dc/sphere - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
  HTML git clone git://src.adamsgaard.dk/sphere
   DIR Log
   DIR Files
   DIR Refs
   DIR LICENSE
       ---
   DIR commit 082573d044ba28b2f4ca1a4b51fb96e9d11e9bc0
   DIR parent 3bbfc4d96516a0d570ca27f40003bb31dba90183
  HTML Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Tue, 16 Feb 2016 10:20:42 -0800
       
       Merge branch 'master' of github.com:anders-dc/sphere
       
       Diffstat:
         M tests/cfd_tests_darcy.py            |       6 +++---
         M tests/cfd_tests_neumann-c_v=0.1.py  |       2 +-
         M tests/cfd_tests_neumann.py          |       2 +-
       
       3 files changed, 5 insertions(+), 5 deletions(-)
       ---
   DIR diff --git a/tests/cfd_tests_darcy.py b/tests/cfd_tests_darcy.py
       t@@ -58,7 +58,7 @@ orig.initTemporal(total = 0.5, file_dt = 0.01, dt = 1.0e-6)
        orig.run(verbose=False)
        py.readlast(verbose = False)
        ideal_grad_p_z = numpy.linspace(orig.p_f[0,0,0], orig.p_f[0,0,-1], orig.num[2])
       -orig.writeVTKall()
       +#orig.writeVTKall()
        compareNumpyArraysClose(numpy.zeros((1,orig.num[2])),\
                ideal_grad_p_z - py.p_f[0,0,:],\
                "Pressure gradient:\t", tolerance=1.0e-1)
       t@@ -167,7 +167,7 @@ orig.p_f[4,2,5] = 2.0
        #orig.run(verbose=False)
        orig.run(verbose=True)
        py = sphere.sim(sid = orig.sid, fluid = True)
       -py.writeVTKall()
       +#py.writeVTKall()
        
        
        #ones = numpy.ones((orig.num))
       t@@ -208,7 +208,7 @@ orig.setFluidTopFixedFlux(1.0)
        #orig.run(verbose=False)
        orig.run(verbose=True)
        py = sphere.sim(sid = orig.sid, fluid = True)
       -py.writeVTKall()
       +#py.writeVTKall()
        
        
        
   DIR diff --git a/tests/cfd_tests_neumann-c_v=0.1.py b/tests/cfd_tests_neumann-c_v=0.1.py
       t@@ -57,7 +57,7 @@ orig.bc_bot[0] = 1      # No-flow BC at bottom (Neumann)
        #orig.run(dry=True)
        orig.run(verbose=False)
        #orig.run(device=2)
       -orig.writeVTKall()
       +#orig.writeVTKall()
        py.readlast(verbose = False)
        #ideal_grad_p_z = numpy.linspace(
        #        orig.p_f[0,0,0] + orig.L[2]*orig.rho_f*numpy.abs(orig.g[2]),
   DIR diff --git a/tests/cfd_tests_neumann.py b/tests/cfd_tests_neumann.py
       t@@ -60,7 +60,7 @@ orig.g[2] = -10.0
        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)
        print(py.v_f)
        #ideal_grad_p_z = numpy.linspace(