[cig-commits] [commit] master: Merge pull request #165 from bangerth/symbolic-names-for-boundary-ids (0cde46a)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Aug 8 04:57:35 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/7845f0356c011c6571ca6905bcdd9455ab32d3f1...0cde46a6f6b52f31e84a2da92bd44e09b85d8525
>---------------------------------------------------------------
commit 0cde46a6f6b52f31e84a2da92bd44e09b85d8525
Merge: 7845f03 42ecced
Author: Timo Heister <timo.heister at gmail.com>
Date: Fri Aug 8 07:57:47 2014 -0400
Merge pull request #165 from bangerth/symbolic-names-for-boundary-ids
Symbolic names for boundary ids
This turned out to be a much larger feature than I thought it would be. In any case, I think that it covers all of the places where we input or output boundary indicators in the input file, and it should now be possible to use symbolic names for them as provided by the geometry model.
There is a single place where it is currently still incomplete, namely in parsing the "Prescribed velocity boundary indicators" in Parameters::parse_geometry_dependent_parameters(). This will conflict with my changes to make pressure/traction boundary conditions possible and I would like to defer dealing with this place until this other patch. I promise to get to it.
This patch also addresses issue 126 (#126) whereby we need to initialize the SimulatorAccess object of every plugin before we parse parameters. This is likely about half of the total patch.
>---------------------------------------------------------------
0cde46a6f6b52f31e84a2da92bd44e09b85d8525
benchmark/burstedde/burstedde.prm | 10 +-
benchmark/inclusion/adaptive.prm | 5 +-
benchmark/inclusion/global.prm.base | 5 +-
benchmark/solcx/solcx.prm | 2 +-
benchmark/solkz/solkz.prm | 2 +-
benchmark/tangurnis/ba/tan.prm | 4 +-
benchmark/tangurnis/tala/tan.prm | 4 +-
benchmark/tangurnis/tala_c/tan.prm | 4 +-
cookbooks/composition-active.prm | 6 +-
cookbooks/composition-passive-tracers.prm | 6 +-
cookbooks/composition-passive.prm | 6 +-
cookbooks/composition-reaction.prm | 6 +-
cookbooks/convection-box-3d.prm | 19 +-
cookbooks/convection-box.prm | 15 +-
cookbooks/free-surface.prm | 12 +-
cookbooks/future/blankenbach.prm | 4 +-
cookbooks/future/crameri_benchmark_1.prm | 8 +-
cookbooks/future/crameri_benchmark_2.prm | 6 +-
cookbooks/future/gplates.prm | 10 +-
cookbooks/future/netrot.prm | 4 +-
cookbooks/future/nettranslation.prm | 4 +-
cookbooks/future/periodic_box.prm | 6 +-
cookbooks/future/radiogenic_heating.prm | 6 +-
cookbooks/future/radiogenic_heating_function.prm | 7 +-
cookbooks/future/sphere.prm | 6 +-
cookbooks/future/steinberger.prm | 6 +-
cookbooks/future/table_model.prm | 6 +-
cookbooks/gplates-2d.prm | 6 +-
cookbooks/latent-heat.prm | 9 +-
cookbooks/platelike-boundary.prm | 6 +-
cookbooks/shell_simple_2d.prm | 6 +-
cookbooks/shell_simple_3d.prm | 6 +-
cookbooks/stokes.prm | 2 +-
cookbooks/van-keken-discontinuous.prm | 4 +-
cookbooks/van-keken-smooth.prm | 4 +-
.../cookbooks/benchmarks/burstedde/burstedde.prm | 9 +-
doc/manual/cookbooks/benchmarks/inclusion.prm | 5 +-
doc/manual/cookbooks/benchmarks/inclusion.prm.out | 5 +-
doc/manual/cookbooks/benchmarks/solcx.prm | 2 +-
doc/manual/cookbooks/benchmarks/solcx.prm.out | 2 +-
doc/manual/cookbooks/benchmarks/solkz.prm | 2 +-
doc/manual/cookbooks/benchmarks/solkz.prm.out | 2 +-
.../cookbooks/benchmarks/stokes/stokeslaw.prm | 2 +-
.../cookbooks/benchmarks/stokes/stokeslaw.prm.out | 2 +-
.../cookbooks/convection-box-3d/start.part.prm | 4 +-
.../cookbooks/convection-box-3d/start.part.prm.out | 4 +-
doc/manual/cookbooks/convection-box/box.prm | 4 +-
doc/manual/cookbooks/convection-box/box.prm.out | 6 +-
.../cookbooks/free_surface/freesurface.part.prm | 8 +-
.../free_surface/freesurface.part.prm.out | 8 +-
doc/manual/cookbooks/gplates/gplates.part.prm | 6 +-
doc/manual/cookbooks/gplates/gplates.part.prm.out | 6 +-
.../platelike-boundary/modelsettings.part.prm | 6 +-
.../platelike-boundary/modelsettings.part.prm.out | 6 +-
.../cookbooks/platelike-boundary/platelike.prm | 6 +-
.../cookbooks/platelike-boundary/platelike.prm.out | 6 +-
doc/manual/cookbooks/shell_simple_2d/shell.prm | 6 +-
doc/manual/cookbooks/shell_simple_2d/shell.prm.out | 6 +-
.../cookbooks/shell_simple_3d/part2.part.prm | 6 +-
.../cookbooks/shell_simple_3d/part2.part.prm.out | 6 +-
doc/manual/manual.tex | 127 +++++---
doc/modules/changes.h | 12 +
include/aspect/adiabatic_conditions/interface.h | 3 +
include/aspect/boundary_composition/interface.h | 3 +
include/aspect/boundary_temperature/constant.h | 5 +-
include/aspect/boundary_temperature/interface.h | 3 +
.../compositional_initial_conditions/interface.h | 6 +-
include/aspect/geometry_model/box.h | 19 +-
include/aspect/geometry_model/interface.h | 87 ++++-
include/aspect/geometry_model/sphere.h | 9 +
include/aspect/geometry_model/spherical_shell.h | 9 +
include/aspect/gravity_model/interface.h | 3 +
include/aspect/heating_model/interface.h | 5 +-
include/aspect/initial_conditions/interface.h | 6 +-
include/aspect/material_model/interface.h | 3 +
include/aspect/mesh_refinement/composition.h | 11 -
include/aspect/mesh_refinement/interface.h | 20 +-
include/aspect/postprocess/interface.h | 14 +-
include/aspect/postprocess/visualization.h | 12 -
include/aspect/simulator.h | 49 ++-
include/aspect/termination_criteria/interface.h | 10 -
.../velocity_boundary_conditions/interface.h | 8 +-
source/adiabatic_conditions/interface.cc | 3 +-
source/boundary_composition/interface.cc | 3 +-
source/boundary_temperature/constant.cc | 72 +++--
source/boundary_temperature/interface.cc | 3 +-
.../compositional_initial_conditions/interface.cc | 3 +-
source/geometry_model/box.cc | 47 ++-
source/geometry_model/interface.cc | 112 +++++++
source/geometry_model/sphere.cc | 16 +-
source/geometry_model/spherical_shell.cc | 69 +++-
source/gravity_model/interface.cc | 3 +-
source/heating_model/interface.cc | 3 +-
source/initial_conditions/adiabatic.cc | 4 +-
source/initial_conditions/interface.cc | 3 +-
source/material_model/interface.cc | 3 +-
source/mesh_refinement/composition.cc | 26 +-
source/mesh_refinement/interface.cc | 47 +--
source/postprocess/heat_flux_statistics.cc | 17 +
source/postprocess/interface.cc | 26 +-
source/postprocess/velocity_boundary_statistics.cc | 30 +-
source/postprocess/visualization.cc | 41 +--
source/simulator/checkpoint_restart.cc | 3 -
source/simulator/core.cc | 104 +++++-
source/simulator/parameters.cc | 357 +++++++++++++++------
source/termination_criteria/interface.cc | 26 +-
source/velocity_boundary_conditions/gplates.cc | 2 +-
source/velocity_boundary_conditions/interface.cc | 9 +-
tests/adiabatic_conditions/statistics | 8 +-
tests/box-first-time-step-alternate-bc/statistics | 8 +-
tests/box-first-time-step/statistics | 8 +-
tests/diffusion-velocity/statistics | 8 +-
tests/diffusion/statistics | 16 +-
tests/find_postprocess/statistics | 8 +-
tests/global_refine_amr/statistics | 8 +-
tests/gplates-1-3/screen-output | 2 +-
tests/gplates-1-3/statistics | 4 +-
tests/gplates-1-4/screen-output | 2 +-
tests/gplates-1-4/statistics | 4 +-
tests/graphical_output_02/statistics | 8 +-
tests/minimum_refinement_function/statistics | 8 +-
.../statistics | 8 +-
.../statistics | 8 +-
tests/passive_comp/statistics | 4 +-
tests/refine_vel/statistics | 8 +-
tests/simple-compressible/statistics | 8 +-
tests/simple-incompressible/statistics | 8 +-
tests/simpler-box.prm | 5 +-
tests/simpler-box/statistics | 8 +-
tests/spherical_velocity_statistics/statistics | 8 +-
tests/steinberger-compressible/statistics | 8 +-
tests/steinberger-incompressible/statistics | 8 +-
tests/steinberger-viscosity-adiabatic/statistics | 8 +-
tests/steinberger-viscosity/statistics | 8 +-
...=> symbolic-boundary-names-box-constant-bc.prm} | 19 +-
.../screen-output | 41 +++
.../statistics | 10 +-
...ler-box.prm => symbolic-boundary-names-box.prm} | 14 +-
.../screen-output | 2 +-
.../statistics | 10 +-
...ndary-names-spherical-shell-2d-180-degrees.prm} | 33 +-
.../screen-output | 41 +++
.../statistics | 10 +-
...undary-names-spherical-shell-2d-90-degrees.prm} | 33 +-
.../screen-output | 41 +++
.../statistics | 10 +-
...lic-boundary-names-spherical-shell-2d-full.prm} | 32 +-
.../screen-output | 41 +++
.../statistics | 8 +-
...undary-names-spherical-shell-3d-90-degrees.prm} | 35 +-
.../screen-output | 41 +++
.../statistics | 23 ++
...lic-boundary-names-spherical-shell-3d-full.prm} | 34 +-
.../screen-output | 41 +++
.../statistics | 8 +-
tests/velocity_boundary_statistics/statistics | 24 +-
tests/vis_velocity_in_years/statistics | 8 +-
157 files changed, 1710 insertions(+), 841 deletions(-)
More information about the CIG-COMMITS
mailing list