]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Merge from Mainline
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 14 Jan 2013 13:52:05 +0000 (13:52 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 14 Jan 2013 13:52:05 +0000 (13:52 +0000)
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

1  2 
deal.II/include/deal.II/grid/grid_generator.h
deal.II/include/deal.II/lac/constraint_matrix.h
deal.II/include/deal.II/lac/constraint_matrix.templates.h
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/grid/grid_generator.cc
deal.II/source/lac/slepc_solver.cc
deal.II/source/numerics/matrix_tools.cc

index 2cea902ac00bf020bd3ffb26ed538b5c3523b4b4,d70b55b5cb6b7dead4cf71491129ff50a8c593e9..234ff8e4ccec6f25c4981bd60ecde7a5811c65ab
@@@ -284,30 -284,57 +284,56 @@@ public
                                const bool                               colorize=false);
  
    /**
-    * A parallelogram. The first
-    * corner point is the
-    * origin. The <tt>dim</tt>
-    * 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 <tt>dim</tt>
+    * 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 <int dim>
-   static void
-   parallelogram(Triangulation<dim>  &tria,
-                 const Tensor<2,dim> &corners,
-                 const bool           colorize=false);
+   static
+   void
+   parallelogram(Triangulation<dim> &tria,
+               const Point<dim> (&corners)[dim],
+               const bool           colorize=false);
  
 -
+   /**
+    * @deprecated Use the other function of same name.
+    */
+   template <int dim>
+   static
+   void
+   parallelogram(Triangulation<dim> &tria,
+               const Tensor<2,dim> &corners,
+               const bool           colorize=false) DEAL_II_DEPRECATED;
+   /**
+    * A parallelepiped. The first corner point is the origin. The
+    * <tt>dim</tt> 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
+    * <code>GridReordering::reorder_grid</code>). In other words, if
+    * reodering of the vertices does occur, the ordering of vertices in
+    * the array of <code>corners</code> will no longer refer to the
+    * same triangulation.
+    *
+    * @note The triangulation needs to be void upon calling this
+    * function.
+    */
+   template <int dim>
+     static
+     void
+     parallelepiped (Triangulation<dim>  &tria,
+                  const Point<dim>   (&corners) [dim],
+                  const bool           colorize = false);
+    
  
    /**
     * Hypercube with a layer of
Simple merge
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.