Rename QTrapez to QTrapezoid.

diff --git a/include/deal.II/base/quadrature_lib.h b/include/deal.II/base/quadrature_lib.h
index a3a1b01edd67157242e0dd622286fc35a6b5e2b3..3a832504d6ffe363d90ee3443e4e1fd01df30ce5 100644 (file)
--- a/include/deal.II/base/quadrature_lib.h
+++ b/include/deal.II/base/quadrature_lib.h
@@ -108,20 +108,33 @@ public:
 
 /**
  * The trapezoidal rule for numerical quadrature. This formula with two
- * quadrature points is exact for linear polynomials.
+ * quadrature points is exact for linear polynomials and uses the
+ * end points of an interval for function evaluation in 1d, see
+ * https://en.wikipedia.org/wiki/Trapezoidal_rule . In higher dimensions,
+ * the class is constructed via a tensor product and then uses the
+ * vertices of a quadrilateral or hexahedron for function evaluation.
+ */
+template <int dim>
+class QTrapezoid : public Quadrature<dim>
+{
+public:
+  QTrapezoid();
+};
+
+
+/**
+ * An alias for QTrapezoid available for historic reasons. This name is
+ * deprecated.
  *
- * The class is poorly named since the proper name of the quadrature formula
+ * 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 results from the fact that its original authors' poor English
+ * 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>
-class QTrapez : public Quadrature<dim>
-{
-public:
-  QTrapez();
-};
+using QTrapez DEAL_II_DEPRECATED = QTrapezoid<dim>;
 
 
 
@@ -799,7 +812,7 @@ QGaussLog<1>::get_quadrature_weights(const unsigned int);
 template <>
 QMidpoint<1>::QMidpoint();
 template <>
-QTrapez<1>::QTrapez();
+QTrapezoid<1>::QTrapezoid();
 template <>
 QSimpson<1>::QSimpson();
 template <>

diff --git a/source/base/quadrature_lib.cc b/source/base/quadrature_lib.cc
index a2b92625851a6fa1cca8c92c7dcdbb43eef1a20e..9be07c25bda21ce0c24e03f9a850f1469f0564f7 100644 (file)
--- a/source/base/quadrature_lib.cc
+++ b/source/base/quadrature_lib.cc
@@ -171,7 +171,7 @@ QMidpoint<1>::QMidpoint()
 
 
 template <>
-QTrapez<1>::QTrapez()
+QTrapezoid<1>::QTrapezoid()
   : Quadrature<1>(2)
 {
   static const double xpts[] = {0.0, 1.0};
@@ -829,8 +829,8 @@ QMidpoint<dim>::QMidpoint()
 
 
 template <int dim>
-QTrapez<dim>::QTrapez()
-  : Quadrature<dim>(QTrapez<dim - 1>(), QTrapez<1>())
+QTrapezoid<dim>::QTrapezoid()
+  : Quadrature<dim>(QTrapezoid<dim - 1>(), QTrapezoid<1>())
 {}
 
 
@@ -1355,7 +1355,7 @@ QSplit<dim>::QSplit(const QSimplex<dim> &base, const Point<dim> &split_point)
 template class QGauss<2>;
 template class QGaussLobatto<2>;
 template class QMidpoint<2>;
-template class QTrapez<2>;
+template class QTrapezoid<2>;
 template class QSimpson<2>;
 template class QMilne<2>;
 template class QWeddle<2>;
@@ -1363,7 +1363,7 @@ template class QWeddle<2>;
 template class QGauss<3>;
 template class QGaussLobatto<3>;
 template class QMidpoint<3>;
-template class QTrapez<3>;
+template class QTrapezoid<3>;
 template class QSimpson<3>;
 template class QMilne<3>;
 template class QWeddle<3>;