[cig-commits] [commit] master: Merge pull request #259 from tjhei/formatting (59e1a2f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Jan 22 08:16:25 PST 2015
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/2fcde671ad63cce6d01d453c70d572b875893f2b...59e1a2f9609f8666d604a8513b66c1d5f7b326b8
>---------------------------------------------------------------
commit 59e1a2f9609f8666d604a8513b66c1d5f7b326b8
Merge: 2fcde67 4f52fdd
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date: Thu Jan 22 10:16:03 2015 -0600
Merge pull request #259 from tjhei/formatting
Pre-release cleanup
>---------------------------------------------------------------
59e1a2f9609f8666d604a8513b66c1d5f7b326b8
benchmark/davies_et_al/case-2.3-plugin/VoT.cc | 2 +-
.../plugin/simpler-with-crust.cc | 2 +-
doc/manual/parameters.tex | 400 ++++++++++++++++++++-
doc/modules/changes.h | 145 ++++----
.../aspect/adiabatic_conditions/initial_profile.h | 26 +-
include/aspect/adiabatic_conditions/interface.h | 8 +-
include/aspect/boundary_composition/box.h | 5 +-
include/aspect/boundary_composition/interface.h | 8 +-
include/aspect/boundary_temperature/function.h | 4 +-
include/aspect/boundary_temperature/interface.h | 8 +-
.../compositional_initial_conditions/interface.h | 8 +-
include/aspect/geometry_model/box.h | 36 +-
include/aspect/geometry_model/interface.h | 114 +++---
include/aspect/geometry_model/sphere.h | 22 +-
include/aspect/geometry_model/spherical_shell.h | 22 +-
include/aspect/global.h | 19 +-
include/aspect/gravity_model/function.h | 4 +-
include/aspect/gravity_model/interface.h | 8 +-
include/aspect/heating_model/interface.h | 8 +-
.../initial_conditions/S40RTS_perturbation.h | 49 +--
include/aspect/initial_conditions/interface.h | 8 +-
.../aspect/initial_conditions/spherical_shell.h | 25 +-
include/aspect/material_model/interface.h | 108 +++---
include/aspect/material_model/latent_heat_melt.h | 12 +-
include/aspect/material_model/morency_doin.h | 111 +++---
include/aspect/mesh_refinement/interface.h | 4 +-
.../mesh_refinement/maximum_refinement_function.h | 4 +-
.../mesh_refinement/minimum_refinement_function.h | 4 +-
include/aspect/particle/generator.h | 5 +-
include/aspect/particle/integrator.h | 8 +-
include/aspect/particle/output.h | 11 +-
include/aspect/particle/particle.h | 11 +-
include/aspect/particle/world.h | 13 +-
include/aspect/postprocess/visualization.h | 40 +--
.../visualization/artificial_viscosity.h | 23 +-
.../postprocess/visualization/dynamic_topography.h | 23 +-
.../postprocess/visualization/error_indicator.h | 23 +-
.../visualization/material_properties.h | 12 +-
.../postprocess/visualization/seismic_anomalies.h | 46 +--
include/aspect/simulator.h | 75 ++--
include/aspect/simulator_access.h | 10 +-
include/aspect/termination_criteria/interface.h | 4 +-
include/aspect/utilities.h | 14 +-
.../aspect/velocity_boundary_conditions/gplates.h | 13 +-
.../velocity_boundary_conditions/interface.h | 8 +-
source/adiabatic_conditions/initial_profile.cc | 2 +-
source/adiabatic_conditions/interface.cc | 2 +-
source/boundary_composition/box.cc | 2 +-
source/boundary_composition/initial_composition.cc | 2 +-
source/boundary_composition/interface.cc | 2 +-
source/boundary_composition/spherical_constant.cc | 2 +-
source/boundary_temperature/box.cc | 2 +-
source/boundary_temperature/constant.cc | 2 +-
source/boundary_temperature/function.cc | 2 +-
source/boundary_temperature/initial_temperature.cc | 2 +-
source/boundary_temperature/interface.cc | 2 +-
source/boundary_temperature/spherical_constant.cc | 2 +-
.../compositional_initial_conditions/function.cc | 2 +-
.../compositional_initial_conditions/interface.cc | 2 +-
source/geometry_model/box.cc | 2 +-
source/geometry_model/interface.cc | 2 +-
source/geometry_model/sphere.cc | 2 +-
source/geometry_model/spherical_shell.cc | 2 +-
source/global.cc | 2 +-
source/gravity_model/function.cc | 2 +-
source/gravity_model/interface.cc | 2 +-
source/gravity_model/radial.cc | 2 +-
source/gravity_model/vertical.cc | 2 +-
source/heating_model/constant_heating.cc | 2 +-
source/heating_model/function.cc | 2 +-
source/heating_model/interface.cc | 2 +-
source/heating_model/radioactive_decay.cc | 2 +-
source/initial_conditions/S40RTS_perturbation.cc | 2 +-
source/initial_conditions/adiabatic.cc | 14 +-
source/initial_conditions/box.cc | 2 +-
source/initial_conditions/function.cc | 2 +-
source/initial_conditions/harmonic_perturbation.cc | 2 +-
source/initial_conditions/interface.cc | 2 +-
source/initial_conditions/solidus.cc | 2 +-
source/initial_conditions/spherical_shell.cc | 2 +-
source/main.cc | 2 +-
source/material_model/composition_reaction.cc | 2 +-
source/material_model/interface.cc | 2 +-
source/material_model/latent_heat.cc | 2 +-
source/material_model/latent_heat_melt.cc | 2 +-
source/material_model/morency_doin.cc | 12 +-
source/material_model/multicomponent.cc | 2 +-
source/material_model/simple.cc | 2 +-
source/material_model/simple_compressible.cc | 2 +-
source/material_model/simpler.cc | 2 +-
source/material_model/steinberger.cc | 2 +-
source/material_model/table.cc | 2 +-
source/mesh_refinement/composition.cc | 2 +-
source/mesh_refinement/density.cc | 2 +-
source/mesh_refinement/interface.cc | 2 +-
.../mesh_refinement/maximum_refinement_function.cc | 2 +-
.../mesh_refinement/minimum_refinement_function.cc | 2 +-
source/mesh_refinement/nonadiabatic_temperature.cc | 2 +-
source/mesh_refinement/temperature.cc | 2 +-
source/mesh_refinement/thermal_energy_density.cc | 2 +-
source/mesh_refinement/topography.cc | 2 +-
source/mesh_refinement/velocity.cc | 2 +-
source/mesh_refinement/viscosity.cc | 2 +-
source/particle/generator.cc | 2 +-
source/particle/integrator.cc | 2 +-
source/particle/output.cc | 2 +-
source/particle/particle.cc | 2 +-
source/postprocess/basic_statistics.cc | 10 +-
source/postprocess/composition_statistics.cc | 2 +-
source/postprocess/depth_average.cc | 2 +-
source/postprocess/dynamic_topography.cc | 54 +--
source/postprocess/heat_flux_statistics.cc | 2 +-
source/postprocess/interface.cc | 2 +-
source/postprocess/internal_heating_statistics.cc | 2 +-
source/postprocess/pressure_statistics.cc | 2 +-
.../postprocess/spherical_velocity_statistics.cc | 2 +-
source/postprocess/table_heat_flux_statistics.cc | 10 +-
source/postprocess/table_velocity_statistics.cc | 10 +-
source/postprocess/temperature_statistics.cc | 2 +-
source/postprocess/topography.cc | 2 +-
source/postprocess/tracer.cc | 2 +-
source/postprocess/velocity_boundary_statistics.cc | 2 +-
source/postprocess/velocity_statistics.cc | 2 +-
.../postprocess/viscous_dissipation_statistics.cc | 2 +-
source/postprocess/visualization.cc | 16 +-
.../visualization/artificial_viscosity.cc | 2 +-
source/postprocess/visualization/density.cc | 2 +-
.../visualization/dynamic_topography.cc | 44 +--
.../postprocess/visualization/error_indicator.cc | 2 +-
.../postprocess/visualization/friction_heating.cc | 2 +-
source/postprocess/visualization/gravity.cc | 2 +-
.../postprocess/visualization/internal_heating.cc | 2 +-
.../visualization/material_properties.cc | 2 +-
source/postprocess/visualization/melt_fraction.cc | 2 +-
.../visualization/nonadiabatic_pressure.cc | 2 +-
.../visualization/nonadiabatic_temperature.cc | 2 +-
source/postprocess/visualization/partition.cc | 2 +-
.../postprocess/visualization/seismic_anomalies.cc | 2 +-
source/postprocess/visualization/seismic_vp.cc | 2 +-
source/postprocess/visualization/seismic_vs.cc | 2 +-
source/postprocess/visualization/specific_heat.cc | 2 +-
source/postprocess/visualization/strain_rate.cc | 2 +-
.../visualization/thermal_expansivity.cc | 2 +-
.../visualization/thermodynamic_phase.cc | 2 +-
source/postprocess/visualization/viscosity.cc | 2 +-
.../postprocess/visualization/viscosity_ratio.cc | 2 +-
source/simulator/assembly.cc | 16 +-
source/simulator/checkpoint_restart.cc | 2 +-
source/simulator/core.cc | 4 +-
source/simulator/freesurface.cc | 2 +-
source/simulator/helper_functions.cc | 2 +-
source/simulator/initial_conditions.cc | 2 +-
source/simulator/introspection.cc | 2 +-
source/simulator/nullspace.cc | 2 +-
source/simulator/parameters.cc | 2 +-
source/simulator/simulator_access.cc | 2 +-
source/termination_criteria/end_step.cc | 2 +-
source/termination_criteria/end_time.cc | 2 +-
source/termination_criteria/interface.cc | 2 +-
source/termination_criteria/steady_rms_velocity.cc | 2 +-
source/termination_criteria/user_request.cc | 2 +-
source/velocity_boundary_conditions/function.cc | 2 +-
source/velocity_boundary_conditions/gplates.cc | 4 +-
source/velocity_boundary_conditions/interface.cc | 2 +-
.../velocity_boundary_conditions/zero_velocity.cc | 2 +-
tests/find_postprocess.cc | 2 +-
tests/free_surface_relaxation.cc | 2 +-
tests/global_refine_amr.cc | 2 +-
tests/time-dependent-temperature-bc.cc | 2 +-
169 files changed, 1164 insertions(+), 769 deletions(-)
More information about the CIG-COMMITS
mailing list