[cig-commits] [commit] master: Merge pull request #16 from jdannberg/composition-reaction (7b658ca)

[cig_noreply at geodynamics.org]

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

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

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

commit 7b658caa05d489ae3f8d61b8049b015e7be94f77
Merge: fec9fff 76adf6a
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri May 16 20:30:46 2014 -0500

    Merge pull request #16 from jdannberg/composition-reaction
    
    Composition reaction



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

7b658caa05d489ae3f8d61b8049b015e7be94f77
 ...elike-boundary.prm => composition-reaction.prm} |  22 ++-
 doc/manual/cookbooks/composition-reaction/0.png    | Bin 0 -> 1893 bytes
 doc/manual/cookbooks/composition-reaction/12.png   | Bin 0 -> 76562 bytes
 doc/manual/cookbooks/composition-reaction/2.png    | Bin 0 -> 41622 bytes
 doc/manual/cookbooks/composition-reaction/20.png   | Bin 0 -> 71281 bytes
 doc/manual/cookbooks/composition-reaction/4.png    | Bin 0 -> 50452 bytes
 doc/manual/cookbooks/composition-reaction/8.png    | Bin 0 -> 66259 bytes
 doc/manual/manual.tex                              |  62 ++++++++
 doc/modules/changes.h                              |   5 +
 .../{simple.h => composition_reaction.h}           |  24 ++-
 .../{simple.cc => composition_reaction.cc}         | 165 ++++++++++++++-------
 .../composition_reaction.prm                       |  41 +++--
 tests/composition_reaction/screen-output           | 142 ++++++++++++++++++
 tests/composition_reaction/statistics              |  28 ++++
 14 files changed, 414 insertions(+), 75 deletions(-)