[cig-commits] [commit] master: Merge pull request #253 from tjhei/new_has_curved_el (23371c5)

[cig_noreply at geodynamics.org]

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

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

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

commit 23371c522d510d3edddde05d16731fd7039d510b
Merge: a402e9e e3526ef
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Jan 16 14:59:56 2015 -0500

    Merge pull request #253 from tjhei/new_has_curved_el
    
    New GeometryModel::has_curved_elements()
    
    New: GeometryModel::has_curved_elements() will allow for optimizations if all boundaries are straight (and later only FlatManifold is used).



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

23371c522d510d3edddde05d16731fd7039d510b
 doc/modules/changes.h                              |     7 +-
 include/aspect/geometry_model/box.h                |     9 +
 include/aspect/geometry_model/interface.h          |    11 +
 include/aspect/geometry_model/sphere.h             |     9 +
 include/aspect/geometry_model/spherical_shell.h    |     9 +
 source/geometry_model/box.cc                       |     6 +
 source/geometry_model/interface.cc                 |     7 +
 source/geometry_model/sphere.cc                    |     7 +
 source/geometry_model/spherical_shell.cc           |     7 +
 source/simulator/core.cc                           |    11 +-
 .../composition_names/solution-00000.0000.gnuplot  |     4 +-
 tests/composition_names/statistics                 |     2 +-
 tests/compositional_boundary_values/screen-output  |    34 +-
 .../compositional_boundary_values_02/screen-output |    34 +-
 .../compositional_boundary_values_03/screen-output |    34 +-
 tests/depth_average_01/depth_average.gnuplot       |  4080 ++---
 tests/depth_average_02/depth_average.gnuplot       |   192 +-
 tests/depth_average_03/depth_average.gnuplot       |    64 +-
 tests/depth_average_04/depth_average.vtk           |     4 +-
 tests/diffusion/depth_average.gnuplot              |  3552 ++--
 tests/diffusion/statistics                         |    10 +-
 tests/dynamic_topography/dynamic_topography.00000  |    32 +-
 tests/melt_postprocessor_peridotite/screen-output  |    22 +-
 .../solution-00000.0000.gnuplot                    | 16380 +++++++++---------
 .../solution-00000.0001.gnuplot                    | 16384 +++++++++----------
 tests/melt_postprocessor_peridotite/statistics     |     2 +-
 tests/melt_postprocessor_pyroxenite/screen-output  |    28 +-
 .../solution-00000.0000.gnuplot                    | 16380 +++++++++---------
 .../solution-00000.0001.gnuplot                    | 16384 +++++++++----------
 tests/melt_postprocessor_pyroxenite/statistics     |     2 +-
 tests/no_flow/screen-output                        |    60 +-
 tests/no_flow/statistics                           |    34 +-
 .../time-dependent-temperature-bc-2/screen-output  |    24 +-
 tests/time-dependent-temperature-bc/screen-output  |    24 +-
 tests/zero-temperature/screen-output               |    24 +-
 tests/zero-temperature/statistics                  |     4 +-
 36 files changed, 36976 insertions(+), 36901 deletions(-)