[cig-commits] [commit] master: Merge pull request #248 manually (09cd1e0)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/eef6299b61e1952be22819a80f6a6e4ee344b677...09cd1e0322ded4719e699729a269b602229b86b3

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

commit 09cd1e0322ded4719e699729a269b602229b86b3
Merge: eef6299 ac54b57
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun Jan 18 20:41:37 2015 -0500

    Merge pull request #248 manually
    
    Change averaging in dynamic topography postprocessor from volume
    weighted to surface area weighted so that in the end the average of
    dynamic topography over the domain's surface area is zero (if Subtract
    mean of dynamic topography is set to true).
    
    Conflicts:
    	tests/dynamic_topography/dynamic_topography.00000



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

09cd1e0322ded4719e699729a269b602229b86b3
 source/postprocess/dynamic_topography.cc           |   48 +-
 .../visualization/dynamic_topography.cc            |   49 +-
 tests/dynamic_topography/dynamic_topography.00000  |  128 +-
 ...amic_topography.prm => dynamic_topography2.prm} |    9 +-
 tests/dynamic_topography2/dynamic_topography.00000 |   28 +
 tests/dynamic_topography2/screen-output            |   63 +
 .../solution-00000.0000.gnuplot                    | 3521 ++++++++++++++++++++
 7 files changed, 3760 insertions(+), 86 deletions(-)