[cig-commits] [commit] master: Merge branch 'master' into benchmark_ownmaterialmodel (b226233)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed May 21 04:23:37 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/c883fc069e0dcc93cce45e1d52c84c05c9c4385b...1f4ab820b0191d9a4058b78c91b629bc94c437ec
>---------------------------------------------------------------
commit b22623300055aa10012fb6eb27907e700f9b4c1a
Merge: 848e062 edbe217
Author: Timo Heister <timo.heister at gmail.com>
Date: Tue May 20 11:07:45 2014 -0400
Merge branch 'master' into benchmark_ownmaterialmodel
>---------------------------------------------------------------
b22623300055aa10012fb6eb27907e700f9b4c1a
benchmark/tangurnis/ba/tan.prm | 3 -
benchmark/tangurnis/tala/tan.prm | 3 -
benchmark/tangurnis/tala_c/tan.prm | 3 -
...elike-boundary.prm => composition-reaction.prm} | 22 +-
cookbooks/convection-box-3d.prm | 1 -
cookbooks/convection-box.prm | 1 -
cookbooks/future/blankenbach.prm | 1 -
cookbooks/future/nettranslation.prm | 1 -
cookbooks/future/periodic_box.prm | 1 -
.../radiogenic_heating.prm} | 75 +---
.../radiogenic_heating_function.prm} | 77 +---
cookbooks/future/steinberger.prm | 1 -
cookbooks/future/table_model.prm | 1 -
cookbooks/gplates-2d.prm | 1 -
cookbooks/latent-heat.prm | 1 -
doc/manual/cookbooks/composition-reaction/0.png | Bin 0 -> 1893 bytes
doc/manual/cookbooks/composition-reaction/12.png | Bin 0 -> 76562 bytes
doc/manual/cookbooks/composition-reaction/2.png | Bin 0 -> 41622 bytes
doc/manual/cookbooks/composition-reaction/20.png | Bin 0 -> 71281 bytes
doc/manual/cookbooks/composition-reaction/4.png | Bin 0 -> 50452 bytes
doc/manual/cookbooks/composition-reaction/8.png | Bin 0 -> 66259 bytes
doc/manual/manual.tex | 102 ++++-
doc/manual/parameters.tex | 492 ++++++++++++++++-----
doc/modules/changes.h | 41 ++
include/aspect/adiabatic_conditions.h | 1 -
include/aspect/boundary_composition/box.h | 1 -
.../boundary_composition/initial_composition.h | 1 -
include/aspect/boundary_composition/interface.h | 1 -
.../boundary_composition/spherical_constant.h | 1 -
include/aspect/boundary_temperature/box.h | 1 -
.../boundary_temperature/initial_temperature.h | 1 -
include/aspect/boundary_temperature/interface.h | 1 -
.../boundary_temperature/spherical_constant.h | 1 -
include/aspect/boundary_temperature/tan_gurnis.h | 1 -
.../compositional_initial_conditions/function.h | 1 -
.../compositional_initial_conditions/interface.h | 2 -
include/aspect/geometry_model/box.h | 1 -
include/aspect/geometry_model/interface.h | 1 -
include/aspect/geometry_model/spherical_shell.h | 1 -
include/aspect/global.h | 1 -
include/aspect/gravity_model/interface.h | 1 -
include/aspect/gravity_model/radial.h | 1 -
include/aspect/gravity_model/vertical.h | 1 -
.../constant_heating.h} | 41 +-
.../function.h | 42 +-
.../interface.h | 89 ++--
include/aspect/initial_conditions/adiabatic.h | 1 -
include/aspect/initial_conditions/box.h | 1 -
include/aspect/initial_conditions/function.h | 1 -
.../initial_conditions/harmonic_perturbation.h | 1 -
include/aspect/initial_conditions/interface.h | 1 -
.../aspect/initial_conditions/spherical_shell.h | 1 -
include/aspect/introspection.h | 21 +-
.../{simple.h => composition_reaction.h} | 25 +-
include/aspect/material_model/duretz_et_al.h | 1 -
include/aspect/material_model/interface.h | 1 -
include/aspect/material_model/latent_heat.h | 1 -
.../material_model/{simple.h => multicomponent.h} | 130 +++---
include/aspect/material_model/simple.h | 1 -
include/aspect/material_model/steinberger.h | 1 -
include/aspect/material_model/table.h | 1 -
include/aspect/material_model/tan_gurnis.h | 1 -
include/aspect/mesh_refinement/composition.h | 1 -
include/aspect/mesh_refinement/density.h | 1 -
include/aspect/mesh_refinement/interface.h | 24 +-
.../minimum_refinement_function.h} | 49 +-
.../mesh_refinement/nonadiabatic_temperature.h | 1 -
include/aspect/mesh_refinement/temperature.h | 1 -
.../mesh_refinement/thermal_energy_density.h | 1 -
include/aspect/mesh_refinement/topography.h | 1 -
include/aspect/mesh_refinement/velocity.h | 1 -
include/aspect/mesh_refinement/viscosity.h | 1 -
include/aspect/particle/generator.h | 1 -
include/aspect/particle/integrator.h | 1 -
include/aspect/particle/output.h | 1 -
include/aspect/particle/particle.h | 1 -
include/aspect/particle/world.h | 1 -
include/aspect/plugins.h | 1 -
.../aspect/postprocess/composition_statistics.h | 1 -
include/aspect/postprocess/depth_average.h | 1 -
include/aspect/postprocess/duretz_et_al.h | 1 -
include/aspect/postprocess/dynamic_topography.h | 23 +-
include/aspect/postprocess/heat_flux_statistics.h | 1 -
include/aspect/postprocess/interface.h | 1 -
.../postprocess/table_heat_flux_statistics.h | 1 -
.../aspect/postprocess/table_velocity_statistics.h | 1 -
include/aspect/postprocess/tan_gurnis.h | 1 -
.../aspect/postprocess/temperature_statistics.h | 1 -
include/aspect/postprocess/tracer.h | 1 -
include/aspect/postprocess/velocity_statistics.h | 1 -
include/aspect/postprocess/visualization.h | 1 -
.../visualization/artificial_viscosity.h | 1 -
include/aspect/postprocess/visualization/density.h | 1 -
.../postprocess/visualization/dynamic_topography.h | 61 ++-
.../postprocess/visualization/error_indicator.h | 1 -
.../postprocess/visualization/friction_heating.h | 1 -
.../postprocess/visualization/melt_fraction.h | 1 -
.../visualization/nonadiabatic_pressure.h | 1 -
.../visualization/nonadiabatic_temperature.h | 1 -
.../aspect/postprocess/visualization/partition.h | 1 -
.../postprocess/visualization/seismic_anomalies.h | 1 -
.../aspect/postprocess/visualization/seismic_vp.h | 1 -
.../aspect/postprocess/visualization/seismic_vs.h | 1 -
.../postprocess/visualization/specific_heat.h | 1 -
.../aspect/postprocess/visualization/strain_rate.h | 1 -
.../visualization/thermal_expansivity.h | 1 -
.../visualization/thermodynamic_phase.h | 1 -
.../aspect/postprocess/visualization/viscosity.h | 1 -
.../postprocess/visualization/viscosity_ratio.h | 1 -
include/aspect/simulator.h | 19 +-
include/aspect/simulator_access.h | 1 -
include/aspect/termination_criteria/end_time.h | 1 -
include/aspect/termination_criteria/interface.h | 1 -
.../termination_criteria/steady_rms_velocity.h | 1 -
include/aspect/termination_criteria/user_request.h | 1 -
.../velocity_boundary_conditions/duretz_et_al.h | 1 -
.../aspect/velocity_boundary_conditions/function.h | 1 -
.../aspect/velocity_boundary_conditions/gplates.h | 1 -
.../velocity_boundary_conditions/interface.h | 1 -
.../velocity_boundary_conditions/zero_velocity.h | 1 -
source/adiabatic_conditions.cc | 1 -
source/boundary_composition/box.cc | 1 -
source/boundary_composition/initial_composition.cc | 1 -
source/boundary_composition/interface.cc | 1 -
source/boundary_composition/spherical_constant.cc | 1 -
source/boundary_temperature/box.cc | 1 -
source/boundary_temperature/initial_temperature.cc | 1 -
source/boundary_temperature/interface.cc | 1 -
source/boundary_temperature/spherical_constant.cc | 1 -
source/boundary_temperature/tan_gurnis.cc | 1 -
.../compositional_initial_conditions/function.cc | 1 -
.../compositional_initial_conditions/interface.cc | 1 -
source/geometry_model/box.cc | 1 -
source/geometry_model/interface.cc | 1 -
source/geometry_model/spherical_shell.cc | 1 -
source/global.cc | 1 -
source/gravity_model/interface.cc | 1 -
source/gravity_model/vertical.cc | 1 -
source/heating_model/constant_heating.cc | 90 ++++
source/heating_model/function.cc | 118 +++++
.../{gravity_model => heating_model}/interface.cc | 78 ++--
source/initial_conditions/adiabatic.cc | 1 -
source/initial_conditions/box.cc | 1 -
source/initial_conditions/function.cc | 1 -
source/initial_conditions/harmonic_perturbation.cc | 1 -
source/initial_conditions/interface.cc | 1 -
source/initial_conditions/spherical_shell.cc | 1 -
source/main.cc | 61 ++-
.../{simple.cc => composition_reaction.cc} | 166 ++++---
source/material_model/duretz_et_al.cc | 1 -
source/material_model/interface.cc | 1 -
source/material_model/latent_heat.cc | 1 -
source/material_model/multicomponent.cc | 471 ++++++++++++++++++++
source/material_model/simple.cc | 86 +++-
source/material_model/steinberger.cc | 1 -
source/material_model/table.cc | 1 -
source/material_model/tan_gurnis.cc | 1 -
source/mesh_refinement/composition.cc | 1 -
source/mesh_refinement/density.cc | 1 -
source/mesh_refinement/interface.cc | 83 +++-
.../mesh_refinement/minimum_refinement_function.cc | 117 +++++
source/mesh_refinement/nonadiabatic_temperature.cc | 1 -
source/mesh_refinement/temperature.cc | 1 -
source/mesh_refinement/thermal_energy_density.cc | 1 -
source/mesh_refinement/topography.cc | 1 -
source/mesh_refinement/velocity.cc | 1 -
source/mesh_refinement/viscosity.cc | 1 -
source/particle/generator.cc | 1 -
source/particle/integrator.cc | 1 -
source/particle/output.cc | 1 -
source/particle/particle.cc | 1 -
source/postprocess/composition_statistics.cc | 1 -
source/postprocess/depth_average.cc | 1 -
source/postprocess/duretz_et_al.cc | 1 -
source/postprocess/dynamic_topography.cc | 114 ++++-
source/postprocess/heat_flux_statistics.cc | 1 -
source/postprocess/interface.cc | 1 -
source/postprocess/table_heat_flux_statistics.cc | 1 -
source/postprocess/table_velocity_statistics.cc | 1 -
source/postprocess/tan_gurnis.cc | 1 -
source/postprocess/temperature_statistics.cc | 6 +-
source/postprocess/tracer.cc | 1 -
source/postprocess/velocity_statistics.cc | 1 -
source/postprocess/visualization.cc | 1 -
.../visualization/artificial_viscosity.cc | 1 -
source/postprocess/visualization/density.cc | 9 +-
.../visualization/dynamic_topography.cc | 234 +++++++---
.../postprocess/visualization/error_indicator.cc | 1 -
.../postprocess/visualization/friction_heating.cc | 1 -
source/postprocess/visualization/melt_fraction.cc | 11 +-
.../visualization/nonadiabatic_pressure.cc | 1 -
.../visualization/nonadiabatic_temperature.cc | 1 -
source/postprocess/visualization/partition.cc | 1 -
.../postprocess/visualization/seismic_anomalies.cc | 1 -
source/postprocess/visualization/seismic_vp.cc | 1 -
source/postprocess/visualization/seismic_vs.cc | 1 -
source/postprocess/visualization/specific_heat.cc | 9 +-
source/postprocess/visualization/strain_rate.cc | 1 -
.../visualization/thermal_expansivity.cc | 1 -
.../visualization/thermodynamic_phase.cc | 1 -
source/postprocess/visualization/viscosity.cc | 1 -
.../postprocess/visualization/viscosity_ratio.cc | 1 -
source/simulator/assembly.cc | 40 +-
source/simulator/checkpoint_restart.cc | 1 -
source/simulator/core.cc | 183 ++++++--
source/simulator/helper_functions.cc | 72 ++-
source/simulator/initial_conditions.cc | 42 +-
source/simulator/introspection.cc | 59 +--
source/simulator/nullspace.cc | 12 +-
source/simulator/parameters.cc | 19 +-
source/simulator/simulator_access.cc | 1 -
source/simulator/solver.cc | 67 ++-
source/termination_criteria/end_time.cc | 1 -
source/termination_criteria/interface.cc | 1 -
source/termination_criteria/steady_rms_velocity.cc | 1 -
source/termination_criteria/user_request.cc | 1 -
.../velocity_boundary_conditions/duretz_et_al.cc | 1 -
source/velocity_boundary_conditions/function.cc | 1 -
source/velocity_boundary_conditions/gplates.cc | 3 +-
source/velocity_boundary_conditions/interface.cc | 1 -
.../velocity_boundary_conditions/zero_velocity.cc | 1 -
tests/CMakeLists.txt | 41 +-
.../{composition-active.prm => always_refine.prm} | 15 +-
tests/always_refine/screen-output | 124 ++++++
tests/always_refine/statistics | 28 ++
tests/composition-active/statistics | 132 +++---
tests/composition-passive-tracers/statistics | 36 +-
.../composition_reaction.prm | 41 +-
tests/composition_reaction/screen-output | 142 ++++++
tests/composition_reaction/statistics | 28 ++
tests/conservative_with_mpi.prm | 1 -
tests/depth_average_01.prm | 1 -
tests/depth_average_02.prm | 1 -
tests/depth_average_03.prm | 1 -
tests/depth_average_04.prm | 1 -
tests/diffusion-velocity.prm | 1 -
tests/diffusion.prm | 1 -
.../latent-heat.prm => tests/direct_solver_1.prm | 10 +-
tests/direct_solver_1/screen-output | 98 ++++
tests/direct_solver_1/statistics | 18 +
tests/dynamic_topography.prm | 130 ++++++
tests/dynamic_topography/dynamic_topography.00000 | 64 +++
tests/dynamic_topography/screen-output | 71 +++
tests/dynamic_topography/solution-00000.0000.vtu | 43 ++
tests/graphical_output.prm | 1 -
tests/inclusion_2.prm | 1 -
tests/inclusion_4.prm | 1 -
tests/inclusion_adaptive.prm | 1 -
cookbooks/latent-heat.prm => tests/latent_heat.prm | 33 +-
tests/latent_heat/screen-output | 45 ++
tests/latent_heat/statistics | 13 +
tests/minimum_refinement_function.prm | 211 +++++++++
tests/minimum_refinement_function/screen-output | 143 ++++++
.../solution-00003.0000.vtu | 39 ++
.../solution-00003.0001.vtu | 39 ++
tests/minimum_refinement_function/statistics | 23 +
.../multicomponent_arithmetic.prm | 73 +--
tests/multicomponent_arithmetic/screen-output | 76 ++++
tests/multicomponent_arithmetic/statistics | 17 +
.../multicomponent_geometric.prm | 73 +--
tests/multicomponent_geometric/screen-output | 76 ++++
tests/multicomponent_geometric/statistics | 17 +
.../multicomponent_harmonic.prm | 73 +--
tests/multicomponent_harmonic/screen-output | 76 ++++
tests/multicomponent_harmonic/statistics | 17 +
.../multicomponent_max_composition.prm | 73 +--
tests/multicomponent_max_composition/screen-output | 76 ++++
tests/multicomponent_max_composition/statistics | 17 +
tests/no_flow.prm | 3 +-
tests/non_conservative_with_mpi.prm | 1 -
tests/passive_comp.prm | 1 -
tests/passive_comp/statistics | 2 +-
tests/plugin.prm | 1 -
...position-active.prm => postprocess_initial.prm} | 15 +-
tests/postprocess_initial/screen-output | 103 +++++
tests/postprocess_initial/statistics | 27 ++
tests/prmbackslash-2.prm | 168 +++++++
tests/{sol_cx_2 => prmbackslash-2}/screen-output | 0
tests/{sol_cx_2 => prmbackslash-2}/statistics | 0
tests/{maxtimestep.prm => prmbackslash.prm} | 16 +-
tests/{maxtimestep => prmbackslash}/screen-output | 0
tests/{maxtimestep => prmbackslash}/statistics | 0
tests/radiogenic_heating.prm | 111 +++++
.../screen-output | 28 +-
tests/radiogenic_heating/statistics | 13 +
tests/refinement_topography.prm | 1 -
tests/sol_cx_2.prm | 1 -
tests/sol_cx_2_conservative.prm | 1 -
tests/sol_cx_2_normalized_pressure.prm | 1 -
tests/sol_cx_2_q3.prm | 1 -
tests/sol_cx_4.prm | 1 -
tests/sol_cx_4_conservative.prm | 1 -
tests/sol_cx_4_normalized_pressure.prm | 1 -
...4_normalized_pressure_large_static_pressure.prm | 1 -
..._4_normalized_pressure_low_solver_tolerance.prm | 1 -
tests/sol_cx_tracers.prm | 1 -
tests/sol_kz_2.prm | 1 -
tests/sol_kz_2_cheaper_first_phase_solver.prm | 1 -
tests/sol_kz_2_conservative.prm | 1 -
tests/sol_kz_2_no_first_phase_solver.prm | 1 -
tests/sol_kz_2_q3.prm | 1 -
tests/sol_kz_4.prm | 1 -
tests/sol_kz_4_conservative.prm | 1 -
tests/stokes/statistics | 2 +-
304 files changed, 5159 insertions(+), 1256 deletions(-)
More information about the CIG-COMMITS
mailing list