[cig-commits] [commit] master: Merge pull request #20 from ian-r-rose/multicomponent (dbe66e1)

[cig_noreply at geodynamics.org]

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

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

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

commit dbe66e1b6d25d5ff21653c48f14f343e10ae69f4
Merge: ed4caeb 40ea364
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Mon May 19 17:13:28 2014 -0500

    Merge pull request #20 from ian-r-rose/multicomponent
    
    Multicomponent



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

dbe66e1b6d25d5ff21653c48f14f343e10ae69f4
 doc/modules/changes.h                              |  13 +
 .../{composition_reaction.h => multicomponent.h}   | 138 +++---
 source/material_model/multicomponent.cc            | 471 +++++++++++++++++++++
 .../multicomponent_arithmetic.prm                  |  72 ++--
 tests/multicomponent_arithmetic/screen-output      |  76 ++++
 tests/multicomponent_arithmetic/statistics         |  17 +
 .../multicomponent_geometric.prm                   |  72 ++--
 tests/multicomponent_geometric/screen-output       |  76 ++++
 tests/multicomponent_geometric/statistics          |  17 +
 .../multicomponent_harmonic.prm                    |  72 ++--
 tests/multicomponent_harmonic/screen-output        |  76 ++++
 tests/multicomponent_harmonic/statistics           |  17 +
 .../multicomponent_max_composition.prm             |  72 ++--
 tests/multicomponent_max_composition/screen-output |  76 ++++
 tests/multicomponent_max_composition/statistics    |  17 +
 15 files changed, 1111 insertions(+), 171 deletions(-)