[cig-commits] [commit] master: Merge pull request #5 from bangerth/master (485a82a)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/555391b308f972e57b2488cb024ed6bda549ebf0...485a82a477d4e359644ce65c4155a55cdde612d7

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

commit 485a82a477d4e359644ce65c4155a55cdde612d7
Merge: 555391b a8b14d6
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 12 08:15:05 2014 -0400

    Merge pull request #5 from bangerth/master
    
    Make some places of the code more generic where we currently hard-code base element numbers, by describing base elements in the Introspection class.



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

485a82a477d4e359644ce65c4155a55cdde612d7
 .gitignore                                         |  3 +++
 include/aspect/introspection.h                     | 25 +++++++++++++++++++++
 include/aspect/simulator.h                         |  9 +++++++-
 source/mesh_refinement/density.cc                  |  4 ++--
 source/mesh_refinement/nonadiabatic_temperature.cc |  4 ++--
 source/mesh_refinement/thermal_energy_density.cc   |  4 ++--
 source/mesh_refinement/velocity.cc                 |  2 +-
 source/mesh_refinement/viscosity.cc                |  4 ++--
 source/postprocess/composition_statistics.cc       | 10 ++++-----
 source/postprocess/duretz_et_al.cc                 |  2 +-
 source/postprocess/heat_flux_statistics.cc         |  6 +----
 source/postprocess/table_heat_flux_statistics.cc   |  6 +----
 source/postprocess/table_velocity_statistics.cc    |  2 +-
 source/postprocess/tan_gurnis.cc                   |  2 +-
 source/postprocess/temperature_statistics.cc       |  6 +----
 source/postprocess/velocity_statistics.cc          |  2 +-
 source/simulator/assembly.cc                       | 12 ++--------
 source/simulator/core.cc                           |  2 ++
 source/simulator/helper_functions.cc               | 20 +++++++++++++----
 source/simulator/initial_conditions.cc             | 17 +++++++++-----
 source/simulator/introspection.cc                  | 26 ++++++++++++++++++++++
 source/termination_criteria/steady_rms_velocity.cc |  2 +-
 22 files changed, 115 insertions(+), 55 deletions(-)