[cig-commits] [commit] master: Merge branch 'master' into direct_solver (48b2e93)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon May 19 20:14:19 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/76d4275352ef2cae5de9a073acd1c03a92c2670c...4f3d06fd1f3754419813db37ec9ef7f0f6f3cb15
>---------------------------------------------------------------
commit 48b2e93fc6243adf985a1afc23c47aa9b56e3dc4
Merge: 0699e7a 49421dc
Author: Timo Heister <timo.heister at gmail.com>
Date: Mon May 19 18:53:37 2014 -0400
Merge branch 'master' into direct_solver
>---------------------------------------------------------------
48b2e93fc6243adf985a1afc23c47aa9b56e3dc4
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 | 3 +-
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 | 140 ++++--
doc/manual/parameters.tex | 492 ++++++++++++++++-----
doc/modules/changes.h | 33 ++
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 | 1 -
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 | 48 +-
.../{gravity_model => heating_model}/interface.h | 106 +++--
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 | 1 -
.../{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 | 1 -
.../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 | 1 -
.../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 | 3 +-
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 | 3 +-
.../aspect/velocity_boundary_conditions/gplates.h | 17 +-
.../velocity_boundary_conditions/interface.h | 16 +-
.../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 | 1 -
.../{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 | 1 -
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 | 112 ++++-
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 | 1 -
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 | 1 -
.../visualization/dynamic_topography.cc | 17 +-
.../postprocess/visualization/error_indicator.cc | 1 -
.../postprocess/visualization/friction_heating.cc | 1 -
source/postprocess/visualization/melt_fraction.cc | 1 -
.../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 | 1 -
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 | 7 +-
source/simulator/checkpoint_restart.cc | 1 -
source/simulator/core.cc | 14 +-
source/simulator/helper_functions.cc | 1 -
source/simulator/initial_conditions.cc | 1 -
source/simulator/introspection.cc | 1 -
source/simulator/nullspace.cc | 1 -
source/simulator/parameters.cc | 11 +-
source/simulator/simulator_access.cc | 1 -
source/simulator/solver.cc | 1 -
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 | 7 +-
source/velocity_boundary_conditions/gplates.cc | 27 +-
source/velocity_boundary_conditions/interface.cc | 7 +-
.../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 ++
.../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 -
tests/dynamic_topography.prm | 127 ++++++
tests/dynamic_topography/dynamic_topography.00000 | 64 +++
tests/dynamic_topography/screen-output | 71 +++
tests/graphical_output.prm | 1 -
tests/inclusion_2.prm | 1 -
tests/inclusion_4.prm | 1 -
tests/inclusion_adaptive.prm | 1 -
.../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/plugin.prm | 1 -
...position-active.prm => postprocess_initial.prm} | 15 +-
tests/postprocess_initial/screen-output | 103 +++++
tests/postprocess_initial/statistics | 27 ++
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 -
280 files changed, 3387 insertions(+), 943 deletions(-)
diff --cc source/simulator/core.cc
index 2c845d4,0b4442a..601fccf
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@@ -497,9 -499,9 +499,9 @@@ namespace aspec
p = velocity_boundary_conditions.begin();
p != velocity_boundary_conditions.end(); ++p)
{
- p->second->set_current_time (time);
+ p->second->update ();
VectorFunctionFromVelocityFunctionObject<dim> vel
- (parameters.n_compositional_fields,
+ (introspection.n_components,
std_cxx1x::bind (&VelocityBoundaryConditions::Interface<dim>::boundary_velocity,
p->second,
std_cxx1x::_1));
More information about the CIG-COMMITS
mailing list