[cig-commits] [commit] master: Implement the ability to refer to boundary components by symbolic names. (42ecced)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Aug 8 04:57:32 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/7845f0356c011c6571ca6905bcdd9455ab32d3f1...0cde46a6f6b52f31e84a2da92bd44e09b85d8525
>---------------------------------------------------------------
commit 42ecced8a0e35b66898c6e71dd0c4a87e11d6d89
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date: Mon Jun 2 10:03:46 2014 -0500
Implement the ability to refer to boundary components by symbolic names.
Add a function to the geometry interface to provide symbolic names for boundaries.
Let the 'box' geometry describe its boundary pieces.
Implement that we can parse symbolic names for boundary components. This is not tested right now, nor is there any error checking. All of that still to come.
Indent a section.
Add a test.
Add some error checking. There is one place where we do not yet translate names but that will have to wait for the pressure-bc branch to be done.
Update one TODO.
Make the heat flux and boundary velocity postprocessors also output the names of boundary components. Adjust the output of some of the tests (more is necessary).
Adjust a few more test outputs.
Also provide symbolic names for the spherical shell geometry.
Add tests forgotten in previous commit.
Adjust some more output files.
Improve error message.
Provide symbolic names for the sphere geometry as well.
Make the functions that translate between symbolic and numeric boundary indicators available globally.
Fix a style issue and remove an unnecessary local variable.
Fix wrong comment.
Trim whitespace from boundary indicator names.
Parse boundary names also in the 'constant' boundary temperature model. This is a bit inconvenient because at the time we'd like to parse the data, we do not yet have access to the geometry model and so we need to defer to a later time :-(
Fix screen output file.
Let the material model read its parameters only after we have initialized its SimulatorAccess base class.
Let the remainder of the plugins read their parameters only after we have initialized its SimulatorAccess base class.
Also let the various velocity boundary condition plugins read their parameters only after we have initialized its SimulatorAccess base class.
Undo a previous change whereby we were splitting initialization in two phases.
Move initialization to where it is possible.
Finish changing initialization orders. Fix a couple of errors in the previous code on the way.
Also initialize the postprocessors at the right time and place.
And repeat the whole process one more time with the visualization postprocessors.
Fix an ordering problem where we have changed the order in which functions are now called. This turns out to also make the code much simpler :-)
Move the code that evaluates symbolic boundary names into the Interface class.
Fix an off-by-one error.
Leave a note.
Rename a function. Also provide a way to translate from boundary_id to strings, not just the other way around.
Make compile.
Simplify the reverse lookup.
Fix the text in error messages.
Unify error reporting style.
Adjust some text. Fix an error message.
Expand doc string.
Expand doc string.
Provide an entry in the news file.
Make compile without C++11.
Avoid C++11-style variable initialization.
Update output files.
Set errno=0 before using it.
Adjust output file.
Fix space issue.
Provide more commentary.
Make error message more explicit. Make logic easier to read.
Make it actually compile.
Also parse prescribed velocity boundary conditions.
Convert these two input files to symbolic names.
Convert this input file to symbolic names as well.
Document the need for symbolic names.
Update this file with symbolic names.
Update this file with symbolic names.
Update comments.
Use better text.
Update more input files for symbolic boundary names.
Minor edits.
More conversions.
Convert the remainder of the cookbooks.
Also convert the benchmark input files.
Also convert the snippets of documentation that go into the manual.
Update the description of the statistics file.
Talk about boundary indicators in the manual. Regenerate the input file snippets.
fix some test outputs
As pointed out by Timo, add two missing initialize() calls.
Indent one line.
Simplify a function that we have twice to state what it really does.
>---------------------------------------------------------------
42ecced8a0e35b66898c6e71dd0c4a87e11d6d89
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(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 42ecced8a0e35b66898c6e71dd0c4a87e11d6d89
More information about the CIG-COMMITS
mailing list