Fixed WB comments, and a leftover which got messed up when squashing.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 1dbfb4ad744339a05008d395d0be08e8de133d17..31972cb3db7fffd340d25be2c6b067c5dfd6e57a 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -99,7 +99,8 @@ inconvenience this causes.
 <ol>
   
   <li> New: Added two optional parameters to TriaAccessor::center()
-  and a new method TriaAccessor::point(). They allow to query for a 
+  and a new method TriaAccessor::intermediate_point(). 
+  They allow to query for a 
   geometrically coherent center, or ask for arbitrary points on the 
   underlying Manifold, given the dim coordinates in the reference 
   element.

diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h
index b5433347b472ad454853f26f02ad6e653bcc6812..1e021d717800398e891d4350b070142ae3bc7b22 100644 (file)
--- a/include/deal.II/grid/tria_accessor.h
+++ b/include/deal.II/grid/tria_accessor.h
@@ -1541,11 +1541,18 @@ public:
   /**
    * Returns a point belonging to the Manifold<dim,spacedim> where
    * this object lives, given its parametric coordinates on the
-   * reference #strucdim cell. This function queries the underlying
+   * reference #structdim cell. This function queries the underlying
    * manifold object, and can be used to obtain the exact geometrical
    * location of arbitrary points on this object.
+   *
+   * Notice that the argument @p coordinates are the coordinates on
+   * the <emph>reference cell</emph>, given in reference
+   * coordinates. In other words, the argument provides a weighting
+   * between the different vertices. For example, for lines, calling
+   * this function with argument Point<1>(.5), is equivalent to asking
+   * the line for its center.
    */
-  Point<spacedim> point(const Point<structdim> &coordinates) const;
+  Point<spacedim> intermediate_point(const Point<structdim> &coordinates) const;
 
   /**
    * Center of the object. The center of an object is defined to be

diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index dd79a43d847b3c84f84a858c7f9125901d186abc..b02ebd736f2cf3eab5ee780430157b156acdab0a 100644 (file)
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -3957,9 +3957,7 @@ namespace internal
                 // triangulation.vertices[next_unused_vertex] = new_point;
                 triangulation.vertices[next_unused_vertex] =
                   cell->get_manifold().get_new_point
-                  (Manifolds::get_default_quadrature
-                   <typename Triangulation<dim,spacedim>::active_cell_iterator,
-                   spacedim>(cell));
+                  (Manifolds::get_default_quadrature(cell));
 
                 // if the user_flag is set, i.e. if the
                 // cell is at the boundary, use a
@@ -5827,9 +5825,7 @@ namespace internal
                         // function
                         triangulation.vertices[next_unused_vertex] =
                           quad->get_manifold().get_new_point
-                          (Manifolds::get_default_quadrature
-                           <typename Triangulation<dim,spacedim>::quad_iterator,
-                           spacedim>(quad, true));
+                          (Manifolds::get_default_quadrature(quad, true));
                       }
                     triangulation.vertices_used[next_unused_vertex] = true;
                     // now that we created the right point, make up

diff --git a/source/grid/tria_accessor.cc b/source/grid/tria_accessor.cc
index 2e86b69cd45308848c13afb52be7d1dd00eb8882..b8feff30ff0e106ff95287dee9ccd98ab4ddd146 100644 (file)
--- a/source/grid/tria_accessor.cc
+++ b/source/grid/tria_accessor.cc
@@ -1186,7 +1186,7 @@ set_all_manifold_ids (const types::manifold_id manifold_ind) const
 
 template <int structdim, int dim, int spacedim>
 Point<spacedim>
-TriaAccessor<structdim, dim, spacedim>::point (const Point<structdim> &coordinates) const
+TriaAccessor<structdim, dim, spacedim>::intermediate_point (const Point<structdim> &coordinates) const
 {
   // We use an FE_Q<structdim>(1) to extract the "weights" of each
   // vertex, used to get a point from the manifold.