tAdded paraview req., fixed collision.py - 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 e067c2514f5f5878c1134f4b6320ad543280de99
 (DIR) parent 62dfdd49c34234fa27a19f280cf989271a18e6fe
 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Tue, 22 Oct 2013 15:20:03 +0200
       
       Added paraview req., fixed collision.py
       
       Diffstat:
         M README.rst                          |       3 ++-
         M python/collision.py                 |       8 ++++----
       
       2 files changed, 6 insertions(+), 5 deletions(-)
       ---
 (DIR) diff --git a/README.rst b/README.rst
       t@@ -28,12 +28,13 @@ The runtime requirements are:
            with compute capability 2.0 or greater.
          * A Nvidia CUDA-enabled GPU and device driver
        
       -Optional tools, required for simulation setup and data processing:
       +Optional tools, required/useful for simulation setup and data processing:
          * `Python 2.7 <http://www.python.org/getit/releases/2.7/>`_
          * `Numpy <http://numpy.scipy.org>`_
          * `Matplotlib <http://matplotlib.org>`_
          * `Imagemagick <http://www.imagemagick.org/script/index.php>`_
          * `ffmpeg <http://ffmpeg.org/>`_
       +  * `Paraview <http://www.paraview.org>`_
          * `Python-VTK <http://www.vtk.org>`_
        
        Optional tools, required for building the documentation:
 (DIR) diff --git a/python/collision.py b/python/collision.py
       t@@ -1,7 +1,7 @@
        #!/usr/bin/env python
        """
        Example of two particles colliding.
       -Place script in sphere/python folder, and invoke with `python 2.7 collision.py`
       +Place script in sphere/python folder, and invoke with `python collision.py`
        """
        
        # Import the sphere module for setting up, running, and analyzing the
       t@@ -19,8 +19,8 @@ SB = sphere.Spherebin(np = 2, sid = 'collision')
        SB.radius[:] = 0.3 # set radii to 0.3 m
        
        # Define the positions of the two particles
       -SB.x[0, :] = numpy.array([0.0, 0.0, 0.0])   # particle 1 (idx 0)
       -SB.x[1, :] = numpy.array([1.0, 0.0, 0.0])   # particle 2 (idx 1)
       +SB.x[0, :] = numpy.array([10.0, 5.0, 5.0])   # particle 1 (idx 0)
       +SB.x[1, :] = numpy.array([11.0, 5.0, 5.0])   # particle 2 (idx 1)
        
        # The default velocity is [0,0,0]. Slam particle 1 into particle 2 by defining
        # a positive x velocity for particle 1.
       t@@ -31,7 +31,7 @@ GRAVITY = numpy.array([0.0, 0.0, 0.0])
        
        # Set the world limits and the particle sorting grid. The particles need to stay
        # within the world limits for the entire simulation, otherwise it will stop!
       -SB.initGridAndWorldsize(g = GRAVITY, margin = 10.0)
       +SB.initGridAndWorldsize(g = GRAVITY, margin = 5.0)
        
        # Define the temporal parameters, e.g. the total time (total) and the file
        # output interval (file_dt), both in seconds