[cig-commits] [commit] master: Merge pull request #142 from jdannberg/melting_model (17d5dd1)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/c44f6360403e235564e469966bfb840fb21bc6f8...17d5dd198c2cf9608a846c965b1d40ff89e227e6

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

commit 17d5dd198c2cf9608a846c965b1d40ff89e227e6
Merge: c44f636 4dd89bf
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Sun Jun 22 08:20:31 2014 -0500

    Merge pull request #142 from jdannberg/melting_model
    
    Material model that includes latent heat of melting



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

17d5dd198c2cf9608a846c965b1d40ff89e227e6
 .../{latent_heat.h => latent_heat_melt.h}          | 115 ++--
 source/material_model/latent_heat_melt.cc          | 753 +++++++++++++++++++++
 ...dotite.prm => upwelling_melting_peridotite.prm} |  85 +--
 tests/upwelling_melting_peridotite/screen-output   |  78 +++
 tests/upwelling_melting_peridotite/statistics      |  20 +
 ...xenite.prm => upwelling_melting_pyroxenite.prm} | 108 +--
 tests/upwelling_melting_pyroxenite/screen-output   |  87 +++
 tests/upwelling_melting_pyroxenite/statistics      |  21 +
 8 files changed, 1148 insertions(+), 119 deletions(-)