[cig-commits] [commit] master: Merge branch 'master' into direct_solver (69b1e1a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/76d4275352ef2cae5de9a073acd1c03a92c2670c...4f3d06fd1f3754419813db37ec9ef7f0f6f3cb15

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

commit 69b1e1a5cdacde515e4563c5175c0d2172414dc2
Merge: b2905b7 c49030f
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri May 16 12:39:46 2014 -0400

    Merge branch 'master' into direct_solver



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

69b1e1a5cdacde515e4563c5175c0d2172414dc2
 .gitignore                                         | 12 +++---
 include/aspect/material_model/interface.h          |  3 +-
 .../aspect/velocity_boundary_conditions/gplates.h  | 42 +++++++++++++--------
 source/material_model/interface.cc                 |  3 +-
 .../postprocess/visualization/seismic_anomalies.cc |  8 ++--
 source/simulator/helper_functions.cc               |  3 ++
 source/velocity_boundary_conditions/gplates.cc     | 43 ++++++++++++----------
 7 files changed, 66 insertions(+), 48 deletions(-)