[cig-commits] [commit] master: Merge pull request #40 from ian-r-rose/freesurface_squash2 (dda1edd)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/153341ebd8b3224570769d7f5cd3dc72b7db127c...dda1edd743a39bfe5b21db0f612927a420cf25c5

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

commit dda1edd743a39bfe5b21db0f612927a420cf25c5
Merge: 153341e b9a47b4
Author: Timo Heister <timo.heister at gmail.com>
Date:   Wed May 21 10:48:47 2014 -0500

    Merge pull request #40 from ian-r-rose/freesurface_squash2
    
    Enormous patch for free surface framework.



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

dda1edd743a39bfe5b21db0f612927a420cf25c5
 .gitignore                                         |   1 +
 cookbooks/free-surface.prm                         | 140 +++++
 cookbooks/future/crameri_benchmark_1.prm           | 132 +++++
 .../future/crameri_benchmark_2.prm                 |  51 +-
 .../cookbooks/free_surface/free_surface_blob.png   | Bin 0 -> 8818 bytes
 .../free_surface/free_surface_topography.png       | Bin 0 -> 5467 bytes
 doc/manual/manual.bib                              |  23 +
 doc/manual/manual.tex                              | 165 ++++++
 doc/modules/changes.h                              |   9 +
 include/aspect/global.h                            |  13 +
 ...velocity_boundary_statistics.h => topography.h} |  21 +-
 include/aspect/simulator.h                         | 169 ++++++
 source/postprocess/topography.cc                   | 140 +++++
 source/simulator/assembly.cc                       |  36 +-
 source/simulator/core.cc                           |  74 ++-
 source/simulator/freesurface.cc                    | 650 +++++++++++++++++++++
 source/simulator/parameters.cc                     |  16 +
 .../free_surface_blob.prm                          |  64 +-
 tests/free_surface_blob/screen-output              | 208 +++++++
 tests/free_surface_blob/statistics                 |  24 +
 tests/free_surface_relaxation.cc                   | 178 ++++++
 .../free_surface_relaxation.prm                    |  75 ++-
 tests/free_surface_relaxation/screen-output        | 194 ++++++
 tests/free_surface_relaxation/statistics           |  23 +
 24 files changed, 2306 insertions(+), 100 deletions(-)