[cig-commits] [commit] master: Merge pull request #115 from tjhei/cleanup_initialize (f16f157)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/dea94ae3fdac1f434e32718c384fe5ce83109802...db7eea299d721e7afa2dc72d8f42352dc88a9e16

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

commit f16f157d0a59297d85f93855deb62ab0026a8a88
Merge: fb6db35 332ff5d
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Sun Jun 1 13:34:58 2014 -0500

    Merge pull request #115 from tjhei/cleanup_initialize
    
    Cleanup initialize



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

f16f157d0a59297d85f93855deb62ab0026a8a88
 include/aspect/adiabatic_conditions/interface.h      |  6 +++---
 include/aspect/boundary_composition/box.h            |  8 ++------
 include/aspect/boundary_composition/interface.h      |  7 +++++++
 include/aspect/boundary_temperature/interface.h      |  7 +++++++
 .../compositional_initial_conditions/interface.h     |  4 +++-
 include/aspect/geometry_model/interface.h            |  7 +++++++
 include/aspect/gravity_model/interface.h             |  7 +++++++
 include/aspect/heating_model/interface.h             |  4 +++-
 include/aspect/initial_conditions/interface.h        |  7 +++----
 include/aspect/material_model/interface.h            |  4 +++-
 include/aspect/material_model/steinberger.h          |  1 +
 include/aspect/mesh_refinement/interface.h           |  7 +++++++
 include/aspect/postprocess/interface.h               |  5 +++++
 include/aspect/termination_criteria/interface.h      |  7 +++++++
 .../aspect/velocity_boundary_conditions/gplates.h    |  7 ++++---
 .../aspect/velocity_boundary_conditions/interface.h  | 16 +++++-----------
 source/adiabatic_conditions/initial_profile.cc       |  2 ++
 source/boundary_composition/box.cc                   |  7 ++-----
 source/boundary_composition/interface.cc             |  5 ++++-
 source/boundary_temperature/interface.cc             |  4 ++++
 source/compositional_initial_conditions/interface.cc |  1 -
 source/geometry_model/interface.cc                   |  4 ++++
 source/gravity_model/interface.cc                    |  5 +++++
 source/heating_model/interface.cc                    |  1 -
 source/initial_conditions/interface.cc               |  1 -
 source/material_model/interface.cc                   |  1 -
 source/mesh_refinement/interface.cc                  |  5 +++++
 source/postprocess/interface.cc                      |  4 ++++
 source/simulator/core.cc                             | 20 +++++++++++++++-----
 source/termination_criteria/interface.cc             | 12 ++++++++++--
 source/velocity_boundary_conditions/gplates.cc       |  5 ++++-
 source/velocity_boundary_conditions/interface.cc     | 13 ++++---------
 32 files changed, 137 insertions(+), 57 deletions(-)