[cig-commits] [commit] master: Merge pull request #19 from SiqiZhang/Solidus-initial-conditions (b2eaff9)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/a21aaa79d75b89a3d50d5c865e7dc51d309da9b9...b2eaff9e459f8351633e8b4b43c1284c90373873

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

commit b2eaff9e459f8351633e8b4b43c1284c90373873
Merge: a21aaa7 8944fd6
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Tue May 20 14:19:36 2014 -0500

    Merge pull request #19 from SiqiZhang/Solidus-initial-conditions
    
    Solidus initial conditions



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

b2eaff9e459f8351633e8b4b43c1284c90373873
 data/initial temperature/solidus.Mars              |  13 +
 .../{harmonic_perturbation.h => solidus.h}         | 111 ++++++--
 source/initial_conditions/solidus.cc               | 302 +++++++++++++++++++++
 cookbooks/shell_simple_2d.prm => tests/solidus.prm |  41 ++-
 4 files changed, 425 insertions(+), 42 deletions(-)