fix template instantiations for GridGenerator::parallelogram, do not pass array as...

git-svn-id: https://svn.dealii.org/trunk@31695 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/grid/grid_generator.h b/deal.II/include/deal.II/grid/grid_generator.h
index a3f40212781bdb734438de9de6b8092d442fa9c2..7307374abec79d7e6abc2f074b2e3d21ab4ead14 100644 (file)
--- a/deal.II/include/deal.II/grid/grid_generator.h
+++ b/deal.II/include/deal.II/grid/grid_generator.h
@@ -205,7 +205,7 @@ namespace GridGenerator
   template <int dim>
   void
   parallelogram (Triangulation<dim> &tria,
-                 const Point<dim>  (&corners) [dim],
+                 const Point<dim>  corners[dim],
                  const bool          colorize=false);
 
   /**

diff --git a/deal.II/source/grid/grid_generator.cc b/deal.II/source/grid/grid_generator.cc
index 298de0aac39b33d15ef1a9f547927869c2bd706c..b129a9d7114a1229519d3b6298d616b4541026fc 100644 (file)
--- a/deal.II/source/grid/grid_generator.cc
+++ b/deal.II/source/grid/grid_generator.cc
@@ -629,11 +629,30 @@ namespace GridGenerator
   }
 
 
+
+  template<>
+  void
+  parallelogram (Triangulation<3>  &tria,
+                 const Point<3> corners[3],
+                 const bool         colorize)
+  {
+    Assert (false, ExcNotImplemented());
+  }
+
+  template<>
+  void
+  parallelogram (Triangulation<1>  &tria,
+                 const Point<1> corners[1],
+                 const bool         colorize)
+  {
+    Assert (false, ExcNotImplemented());
+  }
+
 // Implementation for 2D only
   template<>
   void
   parallelogram (Triangulation<2>  &tria,
-                 const Point<2> (&corners)[2],
+                 const Point<2> corners[2],
                  const bool         colorize)
   {
     std::vector<Point<2> > vertices (GeometryInfo<2>::vertices_per_cell);
@@ -655,6 +674,25 @@ namespace GridGenerator
   }
 
 
+  template<>
+  void
+  parallelogram (Triangulation<1>  &tria,
+                 const Tensor<2,1> &corners,
+                 const bool         colorize)
+  {
+    Assert (false, ExcNotImplemented());
+  }
+
+  template<>
+  void
+  parallelogram (Triangulation<3>  &tria,
+                 const Tensor<2,3> &corners,
+                 const bool         colorize)
+  {
+    Assert (false, ExcNotImplemented());
+  }
+
+
   template<>
   void
   parallelogram (Triangulation<2>  &tria,

diff --git a/deal.II/source/grid/grid_generator.inst.in b/deal.II/source/grid/grid_generator.inst.in
index 5ce5fcc0f475bec12cadfb927bfc9466a8ad6254..ff179bd53e1309e4c549bc1b2480faffdbbf2b27 100644 (file)
--- a/deal.II/source/grid/grid_generator.inst.in
+++ b/deal.II/source/grid/grid_generator.inst.in
@@ -50,6 +50,17 @@ namespace GridGenerator \{
       Triangulation<deal_II_dimension> &,
       const unsigned int, const double, const double);
   
+  template
+  void
+  parallelogram (Triangulation<deal_II_dimension>  &,
+                 const Tensor<2,deal_II_dimension> &,
+                 const bool           );
+  template
+  void
+  parallelogram (Triangulation<deal_II_dimension> &,
+                 const Point<deal_II_dimension> [deal_II_dimension],
+                 const bool);
+
   template void
     subdivided_hyper_rectangle<deal_II_dimension>
     (Triangulation<deal_II_dimension> &,