From 3559755fba7e578a52ae9ad9b9d5213a9df3e12e Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 31 Dec 2014 09:31:29 -0600 Subject: [PATCH] Remove deprecated function GridGenerator::parallelogram with a rank-2 tensor for the corners. --- doc/news/changes.h | 2 ++ include/deal.II/grid/grid_generator.h | 9 -------- source/grid/grid_generator.cc | 31 --------------------------- tests/grid/grid_generator_01.cc | 4 ++-- 4 files changed, 4 insertions(+), 42 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 147bcaf230..872a1d36c8 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -56,6 +56,8 @@ inconvenience this causes. - ThreadManagement::spawn. - Threads::ThreadCondition and Threads::ThreadMutex. - GridGenerator::laplace_transformation. + - The version of GridGenerator::parallelogram where the corners are given + as a rank-2 tensor rather than as an array of points.
  • Removed: The config.h file no longer exports HAVE_* definitions. diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h index 46745406ab..db2c71c0fb 100644 --- a/include/deal.II/grid/grid_generator.h +++ b/include/deal.II/grid/grid_generator.h @@ -210,15 +210,6 @@ namespace GridGenerator const Point (&corners)[dim], const bool colorize=false); - /** - * @deprecated Use the other function of same name. - */ - template - 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 @p dim * adjacent points are vectors describing the edges of the parallelepiped diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc index e27fe2e1fc..65710c8fd3 100644 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@ -647,37 +647,6 @@ 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, - const Tensor<2,2> &corners, - const bool colorize) - { - // simply pass everything to the other function of same name - const Point<2> x[2] = { corners[0], corners[1] }; - parallelogram (tria, x, colorize); - } - - // Parallelepiped implementation in 1d, 2d, and 3d. @note The // implementation in 1d is similar to hyper_rectangle(), and in 2d is diff --git a/tests/grid/grid_generator_01.cc b/tests/grid/grid_generator_01.cc index 9f2b7c23bd..21e4c93dff 100644 --- a/tests/grid/grid_generator_01.cc +++ b/tests/grid/grid_generator_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2005 - 2013 by the deal.II authors +// Copyright (C) 2005 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -95,7 +95,7 @@ void test(std::ostream &out) { deallog << "parallelogram" << std::endl; Triangulation tr; - Tensor<2,dim> corners; + Point corners[dim]; corners[0] = p1; if (dim>1) corners[1] = p2; if (dim>2) corners[2] = p3; -- 2.39.5