[cig-commits] [commit] master: Merge branch 'topography_visualization' of https://github.com/jdannberg/aspect (4c4d157)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/1256f07c1b5e15057b8f9338a2e49d00331d4b57...b1709845591f347112ebb0d7c06092f25ab52866

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

commit 4c4d157810f8c49dc7ba11f287a5d102c49794f7
Merge: 1256f07 ac90ad7
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 19 21:39:08 2014 -0400

    Merge branch 'topography_visualization' of https://github.com/jdannberg/aspect



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

4c4d157810f8c49dc7ba11f287a5d102c49794f7
 .../postprocess/visualization/dynamic_topography.h |  60 ++++--
 source/postprocess/dynamic_topography.cc           |   2 +-
 .../visualization/dynamic_topography.cc            | 229 +++++++++++++++------
 3 files changed, 215 insertions(+), 76 deletions(-)