[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/aspect (d148500)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/0586ab6f9cf6ec525c331a8c0113ca155a3f1f87...d148500eae3d92d6094ffdbb7fa3f87712d1deac

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

commit d148500eae3d92d6094ffdbb7fa3f87712d1deac
Merge: 06eb090 0586ab6
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Tue May 20 15:50:55 2014 -0500

    Merge branch 'master' of https://github.com/geodynamics/aspect



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

d148500eae3d92d6094ffdbb7fa3f87712d1deac
 .../{simple.h => simple_compressible.h}            |   43 +-
 include/aspect/simulator_access.h                  |    6 +
 source/material_model/simple_compressible.cc       |  289 ++++
 source/simulator/simulator_access.cc               |    7 +
 tests/simple-compressible.prm                      |   98 ++
 tests/simple-compressible/depth_average.gnuplot    | 1407 ++++++++++++++++++++
 tests/simple-compressible/screen-output            |   52 +
 .../statistics                                     |   11 +-
 tests/simple_compressibility_iterated_stokes.cc    |    2 +
 ... => simple_compressibility_iterated_stokes.prm} |   33 +-
 .../screen-output                                  |    2 +-
 11 files changed, 1913 insertions(+), 37 deletions(-)