Merged from trunk.

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

diff --cc deal.II/doc/doxygen/headers/glossary.h
Simple merge

diff --cc deal.II/include/deal.II/grid/tria.h
index 2fdf1cd100b61869f009f9d98bbefd60aa03ebbb,baacd216c91a9ed3c60e840f30dcdcd9c1e55818..db48b14f80fae9e5374bd7ce621b2a3b1a1bd31d
--- 1/deal.II/include/deal.II/grid/tria.h
--- 2/deal.II/include/deal.II/grid/tria.h
+++ b/deal.II/include/deal.II/grid/tria.h
@@@ -2687,21 -2909,39 +2726,40 @@@ public
    unsigned int n_levels () const;
  
    /**
 -   * Return the number of levels in use. This function is equivalent to
 -   * n_levels() for a serial Triangulation, but gives the maximum of
 -   * n_levels() over all processors for a parallel::distributed::Triangulation
 -   * and therefore can be larger than n_levels().
 +   * Return the number of levels in use. This function is equivalent
 +   * to n_levels() for a serial Triangulation, but gives the maximum
 +   * of n_levels() over all processors for a
 +   * parallel::distributed::Triangulation and therefore can be larger
 +   * than n_levels().
     */
-   virtual unsigned int n_global_levels () const;
+   virtual
+   unsigned int n_global_levels () const;
  
    /**
-    * Return the total number of vertices.  Some of them may not be
-    * used, which usually happens upon coarsening of a triangulation
-    * when some vertices are discarded, but we do not want to renumber
-    * the remaining ones, leading to holes in the numbers of used
-    * vertices.  You can get the number of used vertices using @p
-    * n_used_vertices function.
+    * Return true if the triangulation has hanging nodes.
+    *
+    * The function is made virtual since the result can be interpreted in different
+    * ways, depending on whether the triangulation lives only on a single processor,
+    * or may be distributed as done in the parallel::distributed::Triangulation
+    * class (see there for a description of what the function is supposed to do in the
+    * parallel context).
+    */
+   virtual
+   bool has_hanging_nodes() const;
+ 
+   /**
+    * Return the total number of
+    * vertices.  Some of them may
+    * not be used, which usually
+    * happens upon coarsening of a
+    * triangulation when some
+    * vertices are discarded, but we
+    * do not want to renumber the
+    * remaining ones, leading to
+    * holes in the numbers of used
+    * vertices.  You can get the
+    * number of used vertices using
+    * @p n_used_vertices function.
     */
    unsigned int n_vertices () const;
  
@@@ -2765,13 -3034,21 +2823,20 @@@
    /*@{*/
  
    /**
 -   * Total number of lines, used or
 -   * unused.
 +   * Total number of lines, used or unused.
-   *
-   * @note This function really exports internal information about the
-   * triangulation. It shouldn't be used in applications. The function
-   * is only part of the public interface of this class because it is
-   * used in some of the other classes that build very closely on it
-   * (in particular, the DoFHandler class).
+    *
+    * @note This function really
+    * exports internal information
+    * about the triangulation. It
+    * shouldn't be used in
+    * applications. The function is
+    * only part of the public
+    * interface of this class
+    * because it is used in some of
+    * the other classes that build
+    * very closely on it (in
+    * particular, the DoFHandler
+    * class).
     */
    unsigned int n_raw_lines () const;
  

diff --cc deal.II/include/deal.II/grid/tria_accessor.h
Simple merge

diff --cc deal.II/source/grid/tria.cc
Simple merge