[cig-commits] [commit] master: Merge pull request #21 from bangerth/fixes (ed4caeb)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/3407c2fccc8c98ef3939d3c2d29077b4d899ff4b...ed4caebc0ab942d8c7bc1a6a3ba70e37f93accde

>---------------------------------------------------------------

commit ed4caebc0ab942d8c7bc1a6a3ba70e37f93accde
Merge: 3407c2f 492c223
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 19 15:32:44 2014 -0500

    Merge pull request #21 from bangerth/fixes
    
    Document the simple material model (and other related and assorted fixes).



>---------------------------------------------------------------

ed4caebc0ab942d8c7bc1a6a3ba70e37f93accde
 doc/manual/parameters.tex       | 492 +++++++++++++++++++++++++++++++---------
 source/material_model/simple.cc |  85 +++++--
 source/simulator/parameters.cc  |   2 +-
 3 files changed, 457 insertions(+), 122 deletions(-)