[cig-commits] [commit] master: Merge pull request #1 from jdannberg/composition-reaction (1436cf7)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/fec9fff95d1f00eabc29ab290d8294518b63b49a...7b658caa05d489ae3f8d61b8049b015e7be94f77

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

commit 1436cf793e094cb30e354c6cae1a9a6c2dacf892
Merge: 47f27df dc663a1
Author: gassmoeller <r.gassmoeller at mailbox.org>
Date:   Fri May 16 13:45:11 2014 -0500

    Merge pull request #1 from jdannberg/composition-reaction
    
    add a new material model and cookbook with reactions between composition...



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

1436cf793e094cb30e354c6cae1a9a6c2dacf892
 ...elike-boundary.prm => composition-reaction.prm} |  28 +++-
 .../{simple.h => composition_reaction.h}           |  24 ++-
 .../{simple.cc => composition_reaction.cc}         | 165 ++++++++++++++-------
 3 files changed, 154 insertions(+), 63 deletions(-)