[cig-commits] [commit] master: Merge pull request #189 from gassmoeller/fix_adiabatic (449120e)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/43f425f57ef5959f8b3b406b08aea3cf203cd979...449120eb5efbd20a34e046b56ed2f049cfa841c3

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

commit 449120eb5efbd20a34e046b56ed2f049cfa841c3
Merge: 43f425f f78b8ac
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue Aug 19 14:38:28 2014 -0400

    Merge pull request #189 from gassmoeller/fix_adiabatic
    
    Fix a bug and add a test. We had a bug in the initial condition 'adiabatic' that only got triggered if one used a model with the bottom boundary layer parameter set to some value and without adiabatic heating. The temperature difference between model and boundary temperature was calculated wrong in this case. This pull request should fix this bug and add a test for this case.



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

449120eb5efbd20a34e046b56ed2f049cfa841c3
 doc/modules/changes.h                              |   9 +
 source/initial_conditions/adiabatic.cc             |   7 +-
 ...m => adiabatic_initial_conditions_constant.prm} |  18 +-
 .../depth_average.gnuplot                          | 707 +++++++++++++++++++++
 .../screen-output                                  |  26 +-
 .../statistics                                     |   2 +-
 6 files changed, 745 insertions(+), 24 deletions(-)