From: Luca Heltai Date: Sat, 13 Sep 2014 10:08:36 +0000 (+0200) Subject: Fixed WB comments, and a leftover which got messed up when squashing. X-Git-Tag: v8.2.0-rc1~153^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6a3056b3a8b10fd2b7651c924a2a7c342bdd565;p=dealii.git 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 1dbfb4ad74..31972cb3db 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -99,7 +99,8 @@ inconvenience this causes.
  1. 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 b5433347b4..1e021d7178 100644 --- 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 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 reference cell, 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 point(const Point &coordinates) const; + Point intermediate_point(const Point &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 dd79a43d84..b02ebd736f 100644 --- 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 - ::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 - ::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 2e86b69cd4..b8feff30ff 100644 --- 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 Point -TriaAccessor::point (const Point &coordinates) const +TriaAccessor::intermediate_point (const Point &coordinates) const { // We use an FE_Q(1) to extract the "weights" of each // vertex, used to get a point from the manifold.