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 f7107ca4d940bf0c38ca12a092dc5b3f1ffd0314
   DIR parent 122961646538904260583d0f4dd5afe0a98b312d
  HTML Author: Anders Damsgaard Christensen <adc@geo.au.dk>
       Date:   Wed, 24 Aug 2016 11:39:31 -0700
       
       Merge branch 'master' of github.com:anders-dc/sphere
       
       Diffstat:
         M README.rst                          |       9 +++++++++
       
       1 file changed, 9 insertions(+), 0 deletions(-)
       ---
   DIR diff --git a/README.rst b/README.rst
       t@@ -20,6 +20,15 @@ See `LICENSE.txt <LICENSE.txt>`_ for more information.
        
        Important release notes
        -----------------------
       +2016-08-16: Scale-invariant grain-contact model implemented based on Ergenzinger 
       +et al 2010 and Obermayr et al 2013.  To use specify a positive Young's modulus 
       +with ``setYoungsModulus(<value>)`` in the Python module.  This overrides any 
       +contact stiffnesses specified in ``k_n`` and ``k_t``.  This command should be 
       +used before the timestep length is determined in ``initTemporal(...)``.
       +
       +2016-08-14: Dirichlet and von Neumann horizontal boundary conditions implemented 
       +in addition to horizontal periodicity for the Darcian fluid solver.
       +
        2015-09-06: A new flux boundary condition has been added to the Darcy fluid
        solver.