Remove QTrapezoid

diff --git a/include/deal.II/base/quadrature_lib.h b/include/deal.II/base/quadrature_lib.h
index bbf666ab4747abfe1eccb0aff5a1882d00ca2595..87b2718a06c41fab5bd06a27a468c2933b7cc041 100644 (file)
--- a/include/deal.II/base/quadrature_lib.h
+++ b/include/deal.II/base/quadrature_lib.h
@@ -127,22 +127,6 @@ public:
 };
 
 
-/**
- * An alias for QTrapezoid available for historic reasons. This name is
- * deprecated.
- *
- * The class was originally named QTrapez, a poorly named choice since the
- * proper name of the quadrature formula
- * is "trapezoidal rule", or sometimes also called the "trapezoid rule". The
- * misnomer resulted from the fact that its original authors' poor English
- * language skills led them to translate the name incorrectly from the German
- * "Trapezregel".
- */
-template <int dim>
-using QTrapez DEAL_II_DEPRECATED = QTrapezoid<dim>;
-
-
-
 /**
  * The Milne rule for numerical quadrature formula. The Milne rule is a closed
  * Newton-Cotes formula and is exact for polynomials of degree 5.

diff --git a/include/deal.II/fe/fe_tools.templates.h b/include/deal.II/fe/fe_tools.templates.h
index ad976353b263cff0006d3113219083fa38925317..3cedc410e8a95815f0dc99562842c261ab1ec931 100644 (file)
--- a/include/deal.II/fe/fe_tools.templates.h
+++ b/include/deal.II/fe/fe_tools.templates.h
@@ -2489,8 +2489,7 @@ namespace FETools
                     // find sub-quadrature
                     position = name.find('(');
                     const std::string subquadrature_name(name, 0, position);
-                    AssertThrow(subquadrature_name == "QTrapez" ||
-                                  subquadrature_name == "QTrapezoid",
+                    AssertThrow(subquadrature_name == "QTrapezoid",
                                 ExcNotImplemented(
                                   "Could not detect quadrature of name " +
                                   subquadrature_name));

diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h
index c1a922361c42cdc369321f04979767fc69a2b7b2..abf78f3fd38d11504cd80f987c1c3d73a169dabb 100644 (file)
--- a/include/deal.II/grid/reference_cell.h
+++ b/include/deal.II/grid/reference_cell.h
@@ -236,7 +236,7 @@ public:
    *
    * @note The weights of the quadrature object are left unfilled and
    *   consequently the object cannot usefully be used for actually
-   *   computing integrals. This is in contrast to, for example, the QTrapez
+   *   computing integrals. This is in contrast to, for example, the QTrapezoid
    *   class that correctly sets quadrature weights.
    */
   template <int dim>

diff --git a/source/grid/manifold_lib.cc b/source/grid/manifold_lib.cc
index 63437b587382f468a42da10743827ce5be9c1b15..30f7be3672fd4ea1087f819d9b87342d2cbae683 100644 (file)
--- a/source/grid/manifold_lib.cc
+++ b/source/grid/manifold_lib.cc
@@ -1689,10 +1689,10 @@ TransfiniteInterpolationManifold<dim, spacedim>::initialize(
   //
   // In the co-dimension one case (meaning  dim < spacedim) we have to fall
   // back to a simple GridTools::affine_cell_approximation<dim>() which
-  // requires 2^dim points, instead. Thus, initialize the QIteraded
+  // requires 2^dim points, instead. Thus, initialize the QIterated
   // quadrature with no subdivisions.
   std::vector<Point<dim>> unit_points =
-    QIterated<dim>(QTrapez<1>(), (dim == spacedim ? 2 : 1)).get_points();
+    QIterated<dim>(QTrapezoid<1>(), (dim == spacedim ? 2 : 1)).get_points();
   std::vector<Point<spacedim>> real_points(unit_points.size());
 
   for (const auto &cell : triangulation.active_cell_iterators())

diff --git a/tests/bits/point_value_03.cc b/tests/bits/point_value_03.cc
index 738b2e8b5a2ff453b7ffc02fb47c3fab2b5be8ce..2067fecc84dc013a695032abc3be495c9923c1d9 100644 (file)
--- a/tests/bits/point_value_03.cc
+++ b/tests/bits/point_value_03.cc
@@ -124,7 +124,7 @@ check()
   parallel::distributed::Triangulation<dim> tria(MPI_COMM_WORLD);
   make_mesh(tria);
 
-  FE_Q<dim>       element(QIterated<1>(QTrapez<1>(), 3));
+  FE_Q<dim>       element(QIterated<1>(QTrapezoid<1>(), 3));
   DoFHandler<dim> dof(tria);
   dof.distribute_dofs(element);
 

diff --git a/tests/matrix_free/tensor_product_evaluate_01.cc b/tests/matrix_free/tensor_product_evaluate_01.cc
index 05010a1fcbb405e34f9831b9316edb10e40a35f2..1dea372cbfffd3b80ba5cd4522f0de54f527137a 100644 (file)
--- a/tests/matrix_free/tensor_product_evaluate_01.cc
+++ b/tests/matrix_free/tensor_product_evaluate_01.cc
@@ -65,7 +65,7 @@ test(const unsigned int degree)
 
   const std::vector<Point<dim>> evaluation_points =
     dim == 3 ? QGauss<dim>(2).get_points() :
-               QIterated<dim>(QTrapez<1>(), 3).get_points();
+               QIterated<dim>(QTrapezoid<1>(), 3).get_points();
 
   deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
           << std::endl;

diff --git a/tests/matrix_free/tensor_product_evaluate_02.cc b/tests/matrix_free/tensor_product_evaluate_02.cc
index b3a4fce8ce02cd2208e872787b522d321879fbc7..584c0d33f8cb52321ea444056bd7346a2c1e7b11 100644 (file)
--- a/tests/matrix_free/tensor_product_evaluate_02.cc
+++ b/tests/matrix_free/tensor_product_evaluate_02.cc
@@ -60,7 +60,7 @@ test(const unsigned int degree)
 
   const std::vector<Point<dim>> evaluation_points =
     dim == 3 ? QGauss<dim>(2).get_points() :
-               QIterated<dim>(QTrapez<1>(), 3).get_points();
+               QIterated<dim>(QTrapezoid<1>(), 3).get_points();
 
   deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
           << std::endl;

diff --git a/tests/matrix_free/tensor_product_evaluate_03.cc b/tests/matrix_free/tensor_product_evaluate_03.cc
index 4fc54cf14eaaac269b896dc6a4df5d9e6e5bf274..d7120cc0bd1bc18312aaa42212ae621dfc7a774d 100644 (file)
--- a/tests/matrix_free/tensor_product_evaluate_03.cc
+++ b/tests/matrix_free/tensor_product_evaluate_03.cc
@@ -61,7 +61,7 @@ test(const unsigned int degree)
 
   const std::vector<Point<dim>> evaluation_points =
     dim == 3 ? QGauss<dim>(2).get_points() :
-               QIterated<dim>(QTrapez<1>(), 3).get_points();
+               QIterated<dim>(QTrapezoid<1>(), 3).get_points();
 
   deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
           << std::endl;

diff --git a/tests/matrix_free/tensor_product_evaluate_04.cc b/tests/matrix_free/tensor_product_evaluate_04.cc
index 3c0c5146ef83fc1d01f4ae18c2e18f745e09275a..4f0ace43a5e849c4d9e271c8819b838f9f524f6c 100644 (file)
--- a/tests/matrix_free/tensor_product_evaluate_04.cc
+++ b/tests/matrix_free/tensor_product_evaluate_04.cc
@@ -58,7 +58,7 @@ test(const unsigned int degree)
 
   const std::vector<Point<dim>> evaluation_points =
     dim == 3 ? QGauss<dim>(2).get_points() :
-               QIterated<dim>(QTrapez<1>(), 3).get_points();
+               QIterated<dim>(QTrapezoid<1>(), 3).get_points();
 
   deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
           << std::endl;

diff --git a/tests/matrix_free/tensor_product_evaluate_05.cc b/tests/matrix_free/tensor_product_evaluate_05.cc
index 911b8cceeb2ebaba0bd4d59975d620571b40ef13..b22d56ce226a2be606a14ae1827582e61ef2f60f 100644 (file)
--- a/tests/matrix_free/tensor_product_evaluate_05.cc
+++ b/tests/matrix_free/tensor_product_evaluate_05.cc
@@ -59,7 +59,7 @@ test(const unsigned int degree)
 
   const std::vector<Point<dim>> evaluation_points =
     dim == 3 ? QGauss<dim>(2).get_points() :
-               QIterated<dim>(QTrapez<1>(), 3).get_points();
+               QIterated<dim>(QTrapezoid<1>(), 3).get_points();
 
   deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
           << std::endl;

diff --git a/tests/matrix_free/tensor_product_evaluate_06.cc b/tests/matrix_free/tensor_product_evaluate_06.cc
index 9aaa94790659bd70aa0a4319e8f84f73e6379a2f..7876cd1591e329478191ddd1933776c498b73f67 100644 (file)
--- a/tests/matrix_free/tensor_product_evaluate_06.cc
+++ b/tests/matrix_free/tensor_product_evaluate_06.cc
@@ -55,7 +55,7 @@ test(const unsigned int degree)
 
   const std::vector<Point<dim>> evaluation_points =
     dim == 3 ? QGauss<dim>(2).get_points() :
-               QIterated<dim>(QTrapez<1>(), 3).get_points();
+               QIterated<dim>(QTrapezoid<1>(), 3).get_points();
 
   deallog << "Evaluate in " << dim << "d with polynomial degree " << degree
           << std::endl;