[cig-commits] [commit] master: Merge pull request #158 from jperryhouts/morency_doin_material (ffc256c)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/8e658c7b94fac5e74f13922ee8f0eb288218ea50...ffc256cdd8eb2bb0e29f36c4bb469a9810b94d29

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

commit ffc256cdd8eb2bb0e29f36c4bb469a9810b94d29
Merge: 8e658c7 2d0c744
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Wed Dec 10 15:59:52 2014 -0600

    Merge pull request #158 from jperryhouts/morency_doin_material
    
    Added material model based on rheology in Morency and Doin, 2004



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

ffc256cdd8eb2bb0e29f36c4bb469a9810b94d29
 doc/manual/cookbooks/morency_doin/morency_doin.prm |  42 +++
 .../cookbooks/morency_doin/morency_doin.prm.out    |  42 +++
 .../morency_doin/morency_doin_2004_fig1.pdf        | Bin 0 -> 12211 bytes
 doc/manual/manual.bib                              |  11 +
 doc/manual/manual.tex                              |  41 +++
 doc/modules/changes.h                              |   5 +
 include/aspect/material_model/morency_doin.h       | 182 ++++++++++
 source/material_model/morency_doin.cc              | 398 +++++++++++++++++++++
 tests/morency_doin.prm                             | 100 ++++++
 tests/morency_doin/depth_average.gnuplot           | 231 ++++++++++++
 tests/morency_doin/screen-output                   |  43 +++
 .../{composition_names => morency_doin}/statistics |   9 +-
 12 files changed, 1096 insertions(+), 8 deletions(-)