Merged r32197 through r32199 from trunk.

git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@32200 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/base/event.h b/deal.II/include/deal.II/base/event.h
index 4ceeed33ec4ce4282da9a0fef0d57960b4b0998a..a62e98643dbfd493f65f149b59f1621157774a8a 100644 (file)
--- 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 2516135024ec87b08e3cc9955cd0d1767de787f9..f3a0595f802c1e3e71e7efd79e52b56119f30c99 100644 (file)
--- 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 <deal.II/base/subscriptor.h>
 #include <deal.II/base/std_cxx1x/function.h>
 
+#include <vector>
+#include <string>
+
 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<std::string> 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<std::string> 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 fa701dff1494b8a00774f659674692546364f403..ff174373c003a0064c8843b89a87aad11ee9cc7d 100644 (file)
--- 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");