From 037a68ac87b3781c4c6318d03bce568f267d4198 Mon Sep 17 00:00:00 2001 From: heltai Date: Mon, 13 Jan 2014 13:23:38 +0000 Subject: [PATCH] Merged r32197 through r32199 from trunk. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@32200 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/event.h | 7 +++++- .../deal.II/meshworker/local_integrator.h | 23 +++++++++++++++++++ deal.II/source/base/event.cc | 1 + 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/deal.II/include/deal.II/base/event.h b/deal.II/include/deal.II/base/event.h index 4ceeed33ec..a62e98643d 100644 --- a/deal.II/include/deal.II/base/event.h +++ b/deal.II/include/deal.II/base/event.h @@ -151,7 +151,12 @@ namespace Algorithms * new. */ extern const Event initial; - + + /** + * The mesh has changed. + */ + extern const Event remesh; + /** * The current derivative leads * to slow convergence of diff --git a/deal.II/include/deal.II/meshworker/local_integrator.h b/deal.II/include/deal.II/meshworker/local_integrator.h index 2516135024..f3a0595f80 100644 --- a/deal.II/include/deal.II/meshworker/local_integrator.h +++ b/deal.II/include/deal.II/meshworker/local_integrator.h @@ -22,6 +22,9 @@ #include #include +#include +#include + DEAL_II_NAMESPACE_OPEN namespace MeshWorker @@ -106,6 +109,26 @@ namespace MeshWorker */ bool use_face; + /** + * The names of the input vectors. If this vector is nonempty, it + * can be used by application programs to automatically select + * and verify the input vectors used for integration. + * + * @note This variable is currently not used by the library, but + * it is provided to help develop application programs. + */ + std::vector input_vector_names; + + /** + * The names of the results produced. If this vector is nonempty, + * it can be used by application programs to automatically assign + * names to output values and/or verify the names of vectors. + * + * @note This variable is currently not used by the library, but + * it is provided to help develop application programs. + */ + std::vector output_names; + /** * This error is thrown if one of the virtual functions cell(), * boundary(), or face() is called without being overloaded in a diff --git a/deal.II/source/base/event.cc b/deal.II/source/base/event.cc index fa701dff14..ff174373c0 100644 --- a/deal.II/source/base/event.cc +++ b/deal.II/source/base/event.cc @@ -65,6 +65,7 @@ namespace Algorithms namespace Events { const Event initial = Event::assign("Initial"); + const Event remesh = Event::assign("Remesh"); const Event bad_derivative = Event::assign("Bad Derivative"); const Event new_time = Event::assign("New Time"); const Event new_timestep_size = Event::assign("New Time Step Size"); -- 2.39.5