[cig-commits] [commit] master: Merge pull request #242 from tjhei/pull_229 (eef6299)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/23371c522d510d3edddde05d16731fd7039d510b...eef6299b61e1952be22819a80f6a6e4ee344b677

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

commit eef6299b61e1952be22819a80f6a6e4ee344b677
Merge: 23371c5 f2e43e0
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun Jan 18 17:37:50 2015 -0500

    Merge pull request #242 from tjhei/pull_229
    
    Use a manifold to generate better meshes for the shell.



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

eef6299b61e1952be22819a80f6a6e4ee344b677
 doc/modules/changes.h                              |    13 +-
 source/geometry_model/spherical_shell.cc           |    32 +-
 source/simulator/core.cc                           |     8 +-
 tests/adiabatic_conditions/depth_average.gnuplot   |   800 +-
 tests/adiabatic_conditions/screen-output           |    30 +-
 tests/adiabatic_conditions/statistics              |     2 +-
 .../depth_average.gnuplot                          |   800 +-
 tests/adiabatic_initial_conditions/statistics      |     2 +-
 .../depth_average.gnuplot                          |   800 +-
 .../screen-output                                  |    22 +-
 .../statistics                                     |     2 +-
 .../depth_average.gnuplot                          |   800 +-
 .../screen-output                                  |    22 +-
 .../statistics                                     |     2 +-
 tests/gplates-1-3/screen-output                    |     8 +-
 tests/gplates-1-3/statistics                       |     2 +-
 tests/gplates-1-4/screen-output                    |     8 +-
 tests/gplates-1-4/statistics                       |     2 +-
 tests/gplates-3d/screen-output                     |    29 +-
 tests/gplates-3d/statistics                        |     2 +-
 tests/gplates-rotation/screen-output               |     8 +-
 tests/gplates-rotation/statistics                  |     2 +-
 .../solution-00000.0000.gnuplot                    |  6144 +++----
 tests/initial_condition_S20RTS/screen-output       |    24 +-
 .../solution-00000.0000.gnuplot                    |  4608 +++---
 tests/initial_condition_S20RTS/statistics          |     2 +-
 tests/initial_condition_S40RTS/screen-output       |    22 +-
 .../solution-00000.0000.gnuplot                    |  4608 +++---
 tests/initial_condition_S40RTS/statistics          |     2 +-
 .../screen-output                                  |    88 +-
 .../solution-00000.0001.gnuplot                    |   768 +-
 .../solution-00005.0000.gnuplot                    | 16259 ++++++++++---------
 .../statistics                                     |    12 +-
 .../screen-output                                  |    70 +-
 .../solution-00003.0000.gnuplot                    |  2304 +--
 .../solution-00003.0001.gnuplot                    |  2301 ++-
 .../statistics                                     |     8 +-
 .../solution-00000.0000.gnuplot                    |  6144 +++----
 .../solution-00000.0000.gnuplot                    |  6144 +++----
 tests/passive_comp/depth_average.gnuplot           |  3200 ++--
 tests/passive_comp/screen-output                   |    50 +-
 tests/passive_comp/statistics                      |     8 +-
 .../solution-00000.0000.vtu                        |     2 +-
 tests/petsc_composition_names/statistics           |     2 +-
 tests/radioactive_decay/screen-output              |    32 +-
 tests/radioactive_decay/statistics                 |     4 +-
 tests/refine_vel/screen-output                     |   154 +-
 tests/refine_vel/statistics                        |    22 +-
 tests/remove_angular_momentum/screen-output        |   367 +-
 tests/remove_angular_momentum/statistics           |   115 +-
 tests/remove_net_rotation/screen-output            |   367 +-
 tests/remove_net_rotation/statistics               |   115 +-
 tests/simple-compressible/depth_average.gnuplot    |  1600 +-
 tests/simple-compressible/screen-output            |    32 +-
 tests/simple-compressible/statistics               |     4 +-
 tests/simple-incompressible/depth_average.gnuplot  |  1600 +-
 tests/simple-incompressible/screen-output          |    34 +-
 tests/simple-incompressible/statistics             |     4 +-
 .../depth_average.gnuplot                          |   800 +-
 tests/solidus-initial-conditions/screen-output     |    26 +-
 tests/spherical_velocity_statistics/screen-output  |   176 +-
 tests/spherical_velocity_statistics/statistics     |    22 +-
 .../steinberger-compressible/depth_average.gnuplot |  1600 +-
 tests/steinberger-compressible/screen-output       |    34 +-
 tests/steinberger-compressible/statistics          |     4 +-
 .../depth_average.gnuplot                          |  1600 +-
 tests/steinberger-incompressible/screen-output     |    34 +-
 tests/steinberger-incompressible/statistics        |     4 +-
 .../depth_average.gnuplot                          |  1600 +-
 .../steinberger-viscosity-adiabatic/screen-output  |    36 +-
 tests/steinberger-viscosity-adiabatic/statistics   |     4 +-
 tests/steinberger-viscosity/depth_average.gnuplot  | 14300 ++++++++++++++--
 tests/steinberger-viscosity/screen-output          |   252 +-
 tests/steinberger-viscosity/statistics             |    23 +-
 .../screen-output                                  |    26 +-
 .../statistics                                     |     2 +-
 .../screen-output                                  |    24 +-
 .../statistics                                     |     2 +-
 .../screen-output                                  |    28 +-
 .../statistics                                     |     2 +-
 .../screen-output                                  |    26 +-
 .../statistics                                     |     2 +-
 .../screen-output                                  |    26 +-
 .../statistics                                     |     2 +-
 tests/velocity_boundary_statistics/screen-output   |   176 +-
 tests/velocity_boundary_statistics/statistics      |    22 +-
 86 files changed, 47270 insertions(+), 34199 deletions(-)