More documentation updates.

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

diff --git a/deal.II/doc/doxygen/headers/boundary.h b/deal.II/doc/doxygen/headers/boundary.h
index a1ffd81d861354cc9f8432189ac47379e7ed7fa9..facdcfc1c3ea4a6b3d83321ae8063aba5b2baefc 100644 (file)
--- a/deal.II/doc/doxygen/headers/boundary.h
+++ b/deal.II/doc/doxygen/headers/boundary.h
@@ -16,7 +16,7 @@
 
 
 /**
- * @defgroup boundary Boundary and Manifold description for triangulations
+ * @defgroup boundary Boundary and manifold description for triangulations
  *
  * The classes in this module are concerned with the description of the
  * geometry of a domain in which a Triangulation lives. This geometry

diff --git a/deal.II/include/deal.II/base/types.h b/deal.II/include/deal.II/base/types.h
index 057920a0822319fd2a9b0d6ebcf69043fcf7f41f..fcc25fd692c9f10bb8650288d6e4574f16da13df 100644 (file)
--- a/deal.II/include/deal.II/base/types.h
+++ b/deal.II/include/deal.II/base/types.h
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2009 - 2013 by the deal.II authors
+// Copyright (C) 2009 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -136,7 +136,7 @@ namespace types
    *
    * @see @ref GlossManifoldIndicator "Glossary entry on manifold indicators"
    */
-  typedef unsigned char manifold_id;
+  typedef unsigned int manifold_id;
 
   
   /**

diff --git a/deal.II/include/deal.II/grid/tria_accessor.h b/deal.II/include/deal.II/grid/tria_accessor.h
index ac30cef90d7cfbe13ea9fe256caf3454dd79528d..122090bc63ddb8703b6a45083bde6d9ab713cbad 100644 (file)
--- a/deal.II/include/deal.II/grid/tria_accessor.h
+++ b/deal.II/include/deal.II/grid/tria_accessor.h
@@ -1185,26 +1185,20 @@ public:
   bool at_boundary () const;
 
   /**
-   * Return a constant reference to a
-   * boundary object used for this
-   * object. This function is a shortcut to
-   * retrieving the boundary indicator
-   * using boundary_indicator() and then
-   * asking the
-   * Triangulation::get_boundary() function
-   * for the boundary object.
+   * Return a constant reference to the manifold object used for this
+   * object. This function exists for backward compatibility and calls
+   * get_manifold() internally.
    */
   const Boundary<dim,spacedim> &get_boundary () const;
     
   /**
-   * Return a constant reference to a
-   * manifold object used for this
-   * object. This function is a shortcut to
-   * retrieving the manifold indicator
-   * using manifold_indicator() and then
-   * asking the
-   * Triangulation::get_manifold() function
-   * for the manifold object.
+   * Return a constant reference to the manifold object used for this object.
+   *
+   * As explained in
+   * @ref boundary "Boundary and manifold description for triangulations",
+   * the process involved in finding the appropriate manifold description
+   * involves querying both the manifold or boundary indicators. See there
+   * for more information.
    */
   const Boundary<dim,spacedim> &get_manifold () const;
 

diff --git a/deal.II/include/deal.II/grid/tria_accessor.templates.h b/deal.II/include/deal.II/grid/tria_accessor.templates.h
index 0250414290e4c7094561b4a6234478a4d9065eaf..1e6ff54a0bfb1bcff937e0fe5dc5b44344fc850e 100644 (file)
--- a/deal.II/include/deal.II/grid/tria_accessor.templates.h
+++ b/deal.II/include/deal.II/grid/tria_accessor.templates.h
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 1999 - 2013 by the deal.II authors
+// Copyright (C) 1999 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -1922,19 +1922,20 @@ const Boundary<dim,spacedim> &
 TriaAccessor<structdim, dim, spacedim>::get_manifold () const
 {                                
   Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed());
+  
                                   // Get the default (manifold_id)
-  types::manifold_id mi = this->objects().manifold_id[this->present_index];
+  const types::manifold_id mi = this->objects().manifold_id[this->present_index];
   
                                   // In case this is not valid, check
                                   // the boundary id, after having
                                   // casted it to a manifold id
   if(mi == numbers::invalid_manifold_id) 
-    mi =  static_cast<types::manifold_id>
-         (structdim < dim ?
-          this->objects().boundary_or_material_id[this->present_index].boundary_id:
-          dim < spacedim ? 
-          this->objects().boundary_or_material_id[this->present_index].material_id:
-          numbers::invalid_manifold_id);
+    mi = static_cast<types::manifold_id>
+        (structdim < dim ?
+         this->objects().boundary_or_material_id[this->present_index].boundary_id:
+         dim < spacedim ? 
+         this->objects().boundary_or_material_id[this->present_index].material_id:
+         numbers::invalid_manifold_id);
   
   return this->tria->get_manifold(mi);
 }