[cig-commits] [commit] master: Merge pull request #76 from tjhei/simpler_model (36d8703)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/6068770d955287f4cd9f8124d763697c4a6934d9...36d87031b9d5259810f221b3b17377d9d8944a24

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

commit 36d87031b9d5259810f221b3b17377d9d8944a24
Merge: 6068770 1c6a09b
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Tue May 27 17:50:50 2014 -0500

    Merge pull request #76 from tjhei/simpler_model
    
    Implement simpler model



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

36d87031b9d5259810f221b3b17377d9d8944a24
 include/aspect/material_model/simpler.h            | 104 ++++++++++++
 source/material_model/simpler.cc                   | 189 +++++++++++++++++++++
 tests/{box-first-time-step.prm => simpler-box.prm} |  10 +-
 .../screen-output                                  |  17 +-
 .../{global_refine_amr => simpler-box}/statistics  |   2 +-
 5 files changed, 308 insertions(+), 14 deletions(-)