[cig-commits] [commit] master: Merge pull request #137 from gassmoeller/flexible-steinberger-viscosity-boundaries (646b028)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/9398730971b5217314dc121bc16852d75951d0b4...646b028803359614a76a003795e6d97f0a5a0603

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

commit 646b028803359614a76a003795e6d97f0a5a0603
Merge: 9398730 5b14dc5
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Fri Jun 20 02:23:17 2014 -0500

    Merge pull request #137 from gassmoeller/flexible-steinberger-viscosity-boundaries
    
    Flexible steinberger viscosity boundaries



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

646b028803359614a76a003795e6d97f0a5a0603
 include/aspect/material_model/steinberger.h        |    4 +
 source/material_model/steinberger.cc               |   70 +-
 ...ble.prm => steinberger-viscosity-adiabatic.prm} |   22 +-
 .../depth_average.gnuplot                          | 1407 ++++++++++++++++++++
 .../steinberger-viscosity-adiabatic/screen-output  |   54 +
 .../statistics                                     |    4 +-
 ...-compressible.prm => steinberger-viscosity.prm} |   18 +-
 tests/steinberger-viscosity/depth_average.gnuplot  | 1407 ++++++++++++++++++++
 tests/steinberger-viscosity/screen-output          |   54 +
 .../statistics                                     |    4 +-
 10 files changed, 3002 insertions(+), 42 deletions(-)