[cig-commits] [commit] master: Merge pull request #75 from tjhei/manual_updates (9f82cd6)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/4a5a833f884ceec518244a723f11a86c3b456e70...9f82cd6f15bf7d445eb2bcf064a84960d179591d

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

commit 9f82cd6f15bf7d445eb2bcf064a84960d179591d
Merge: 4a5a833 e09666b
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 27 12:46:18 2014 -0500

    Merge pull request #75 from tjhei/manual_updates
    
    Manual updates



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

9f82cd6f15bf7d445eb2bcf064a84960d179591d
 .gitignore                                         |   1 +
 benchmark/solcx/{sol_cx.prm => solcx.prm}          |   0
 benchmark/solkz/{sol_kz.prm => solkz.prm}          |   0
 doc/Makefile                                       |  17 +-
 doc/manual/cookbooks/annotate.pl                   |   6 +-
 doc/manual/cookbooks/annotate_all.sh               |   9 -
 doc/manual/cookbooks/benchmarks/inclusion.prm.out  |  80 ---
 .../benchmarks/latent-heat/material.part.prm       |  43 ++
 .../cookbooks/benchmarks/stokes/stokeslaw.prm      |  10 +-
 .../cookbooks/benchmarks/van-keken/main.part.prm   |  17 +
 .../benchmarks/van-keken/postprocess.part.prm      |   3 +
 .../cookbooks/benchmarks/van-keken/smooth.part.prm |   8 +
 .../cookbooks/composition-active/active.part.prm   |  12 +
 .../composition-active/postprocess.part.prm        |   8 +
 .../composition-passive-tracers/tracer.part.prm    |  13 +
 .../cookbooks/composition-passive/passive.part.prm |  18 +
 .../composition-passive/postprocess.part.prm       |   3 +
 .../composition-reaction/initial.part.prm          |   8 +
 .../composition-reaction/material.part.prm         |  12 +
 .../cookbooks/convection-box-3d/amr.part.prm.out   |   7 -
 .../convection-box-3d/checkpoint.part.prm.out      |   3 -
 .../convection-box-3d/gravity.part.prm.out         |   7 -
 .../convection-box-3d/initial.part.prm.out         |   9 -
 .../convection-box-3d/postprocess.part.prm.out     |   8 -
 .../cookbooks/convection-box-3d/start.part.prm.out |  28 -
 doc/manual/cookbooks/convection-box/box.prm.out    | 169 ------
 .../cookbooks/convection-box/disc.part.prm.out     |   4 -
 .../cookbooks/convection-box/gravity.part.prm.out  |   5 -
 .../cookbooks/convection-box/refine.part.prm.out   |   5 -
 .../cookbooks/convection-box/refine2.part.prm.out  |   8 -
 .../cookbooks/free_surface/freesurface.part.prm    |  29 +
 doc/manual/cookbooks/gplates/gplates.part.prm      |  18 +
 doc/manual/cookbooks/gplates/slice1.part.prm       |   2 +
 doc/manual/cookbooks/gplates/slice2.part.prm       |   2 +
 doc/manual/cookbooks/overview/dim.part.prm.out     |   1 -
 .../cookbooks/overview/geometry.part.prm.out       |   9 -
 doc/manual/cookbooks/overview/simple.prm.out       |  16 -
 .../cookbooks/overview/structure.part.prm.out      |  22 -
 .../platelike-boundary/boundary.part.prm.out       |   7 -
 .../platelike-boundary/modelsettings.part.prm.out  |   6 -
 .../cookbooks/platelike-boundary/platelike.prm.out | 103 ----
 .../cookbooks/shell_simple_2d/shearheat.part.prm   |   3 +
 doc/manual/cookbooks/shell_simple_2d/shell.prm     |  79 +++
 doc/manual/cookbooks/shell_simple_3d/amr.part.prm  |   6 +
 .../cookbooks/shell_simple_3d/checkpoint.part.prm  |   3 +
 .../cookbooks/shell_simple_3d/part1.part.prm       |  14 +
 .../cookbooks/shell_simple_3d/part2.part.prm       |  18 +
 .../cookbooks/shell_simple_3d/part3.part.prm       |   7 +
 .../cookbooks/shell_simple_3d/part4.part.prm       |  10 +
 .../cookbooks/shell_simple_3d/postprocess.part.prm |  16 +
 doc/manual/manual.tex                              | 638 +++------------------
 51 files changed, 469 insertions(+), 1061 deletions(-)