From: maier Date: Mon, 14 Jan 2013 13:52:05 +0000 (+0000) Subject: Merge from Mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e947b6e7f3bbe0cb2bf578150ee00c974c70c805;p=dealii-svn.git Merge from Mainline Conflicts: deal.II/include/deal.II/grid/grid_generator.h deal.II/source/grid/grid_generator.cc git-svn-id: https://svn.dealii.org/branches/branch_cmake@28046 0785d39b-7218-0410-832d-ea1e28bc413d --- e947b6e7f3bbe0cb2bf578150ee00c974c70c805 diff --cc deal.II/include/deal.II/grid/grid_generator.h index 2cea902ac0,d70b55b5cb..234ff8e4cc --- a/deal.II/include/deal.II/grid/grid_generator.h +++ b/deal.II/include/deal.II/grid/grid_generator.h @@@ -284,30 -284,57 +284,56 @@@ public const bool colorize=false); /** - * A parallelogram. The first - * corner point is the - * origin. The dim - * adjacent points are the - * one-dimensional subtensors of - * the tensor provided and - * additional points will be sums - * of these two vectors. - * Colorizing is done according - * to hyper_rectangle(). + * A parallelogram. The first corner point is the origin. The dim + * adjacent points are the ones given in the second argument and the fourth + * point will be the sum of these two vectors. Colorizing is done in the + * same way as in hyper_rectangle(). * - * @note This function is - * implemented in 2d only. + * @note This function is implemented in 2d only. * - * @note The triangulation needs to be - * void upon calling this - * function. + * @note The triangulation needs to be void upon calling this function. */ template - static void - parallelogram(Triangulation &tria, - const Tensor<2,dim> &corners, - const bool colorize=false); + static + void + parallelogram(Triangulation &tria, + const Point (&corners)[dim], + const bool colorize=false); - + /** + * @deprecated Use the other function of same name. + */ + template + static + void + parallelogram(Triangulation &tria, + const Tensor<2,dim> &corners, + const bool colorize=false) DEAL_II_DEPRECATED; + + /** + * A parallelepiped. The first corner point is the origin. The + * dim adjacent points are vectors describing the edges of + * the parallelepiped with respect to the origin. Additional points + * are sums of these dim vectors. Colorizing is done according to + * hyper_rectangle(). + * + * @note This function silently reorders the vertices on the cells + * to lexiographic ordering (see + * GridReordering::reorder_grid). In other words, if + * reodering of the vertices does occur, the ordering of vertices in + * the array of corners will no longer refer to the + * same triangulation. + * + * @note The triangulation needs to be void upon calling this + * function. + */ + template + static + void + parallelepiped (Triangulation &tria, + const Point (&corners) [dim], + const bool colorize = false); + /** * Hypercube with a layer of