[cig-commits] [commit] master: Merge pull request #260 from tjhei/rename_morency_plugin (16c5141)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/59e1a2f9609f8666d604a8513b66c1d5f7b326b8...16c51416ab671466458d3c80fd33e77cd7c2e364

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

commit 16c51416ab671466458d3c80fd33e77cd7c2e364
Merge: 59e1a2f 395f1c6
Author: Timo Heister <timo.heister at gmail.com>
Date:   Thu Jan 22 17:15:55 2015 -0500

    Merge pull request #260 from tjhei/rename_morency_plugin
    
    Rework morency plugin
    
    - rename to "Morency and Doin"
    - do not parse model depth and n_compositional_fields from the ParameterHandler



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

16c51416ab671466458d3c80fd33e77cd7c2e364
 doc/manual/parameters.tex                    | 98 ++++++++++++++--------------
 include/aspect/material_model/morency_doin.h |  1 -
 source/material_model/morency_doin.cc        | 32 ++-------
 tests/morency_doin.prm                       |  4 +-
 4 files changed, 58 insertions(+), 77 deletions(-)