[cig-commits] [commit] master: Merge pull request #42 from gassmoeller/compressible_perplex (73a71ba)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/a7135c1f7697d39efff2f47a79ca1e1395cff504...73a71ba37f203bfed63bb8b602fdbd30ab99b1af

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

commit 73a71ba37f203bfed63bb8b602fdbd30ab99b1af
Merge: a7135c1 e3047f9
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Wed May 21 16:02:37 2014 -0500

    Merge pull request #42 from gassmoeller/compressible_perplex
    
    Compressible perplex



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

73a71ba37f203bfed63bb8b602fdbd30ab99b1af
 .../test-steinberger-compressible/header.txt       |    13 +
 .../test-steinberger-compressible/make_testdata.sh |     7 +
 .../test-radial-visc.txt                           |   889 ++
 .../test-viscosity-prefactor.txt                   |  1001 ++
 .../test-steinberger-compressible/testdata.py      |    62 +
 .../test-steinberger-compressible/testdata.txt     | 10214 +++++++++++++++++++
 include/aspect/material_model/steinberger.h        |    60 +-
 source/material_model/steinberger.cc               |   259 +-
 source/velocity_boundary_conditions/gplates.cc     |     2 +-
 tests/simple-compressible.prm                      |     9 +-
 tests/simple-compressible/depth_average.gnuplot    |  1600 +--
 tests/simple-compressible/screen-output            |    34 +-
 tests/simple-compressible/statistics               |     4 +-
 ...-compressible.prm => simple-incompressible.prm} |    20 +-
 tests/simple-incompressible/depth_average.gnuplot  |  1407 +++
 tests/simple-incompressible/screen-output          |    65 +
 .../statistics                                     |     4 +-
 ...mpressible.prm => steinberger-compressible.prm} |    40 +-
 .../steinberger-compressible/depth_average.gnuplot |  1407 +++
 tests/steinberger-compressible/screen-output       |    53 +
 .../statistics                                     |     4 +-
 ...ressible.prm => steinberger-incompressible.prm} |    44 +-
 .../depth_average.gnuplot                          |  1407 +++
 tests/steinberger-incompressible/screen-output     |    53 +
 .../statistics                                     |     4 +-
 25 files changed, 17737 insertions(+), 925 deletions(-)