From fd61702127acd817435e477ee829aed0460ae818 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 28 Sep 2020 17:54:25 -0600 Subject: [PATCH] Rename Simplex::PGauss to Simplex::QGauss. --- include/deal.II/simplex/quadrature_lib.h | 4 ++-- source/simplex/quadrature_lib.cc | 8 ++++---- tests/simplex/fe_lib_02.cc | 16 ++++++++-------- tests/simplex/poisson_01.cc | 4 ++-- tests/simplex/poisson_02.cc | 4 ++-- tests/simplex/q_projection_01.cc | 6 +++--- tests/simplex/quadrature_lib_01.cc | 4 ++-- tests/simplex/step-12.cc | 4 ++-- tests/simplex/step-18.cc | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/deal.II/simplex/quadrature_lib.h b/include/deal.II/simplex/quadrature_lib.h index 7fc793d4eb..41c02dc02f 100644 --- a/include/deal.II/simplex/quadrature_lib.h +++ b/include/deal.II/simplex/quadrature_lib.h @@ -38,13 +38,13 @@ namespace Simplex * @ingroup simplex */ template - class PGauss : public QSimplex + class QGauss : public QSimplex { public: /** * Constructor taking the number of quadrature points @p n_points. */ - explicit PGauss(const unsigned int n_points); + explicit QGauss(const unsigned int n_points); }; } // namespace Simplex diff --git a/source/simplex/quadrature_lib.cc b/source/simplex/quadrature_lib.cc index b0ffad033b..683c9ab7cd 100644 --- a/source/simplex/quadrature_lib.cc +++ b/source/simplex/quadrature_lib.cc @@ -29,7 +29,7 @@ DEAL_II_NAMESPACE_OPEN namespace Simplex { template - PGauss::PGauss(const unsigned int n_points) + QGauss::QGauss(const unsigned int n_points) : QSimplex(Quadrature()) { // fill quadrature points and quadrature weights @@ -146,8 +146,8 @@ namespace Simplex } // namespace Simplex -template class Simplex::PGauss<1>; -template class Simplex::PGauss<2>; -template class Simplex::PGauss<3>; +template class Simplex::QGauss<1>; +template class Simplex::QGauss<2>; +template class Simplex::QGauss<3>; DEAL_II_NAMESPACE_CLOSE diff --git a/tests/simplex/fe_lib_02.cc b/tests/simplex/fe_lib_02.cc index c65e02abf8..8e4c141a94 100644 --- a/tests/simplex/fe_lib_02.cc +++ b/tests/simplex/fe_lib_02.cc @@ -49,12 +49,12 @@ main() { initlog(); - test(Simplex::FE_P<2>(1), Simplex::PGauss<2>(3)); - test(Simplex::FE_P<2>(2), Simplex::PGauss<2>(7)); - test(Simplex::FE_P<3>(1), Simplex::PGauss<3>(4)); - test(Simplex::FE_P<3>(2), Simplex::PGauss<3>(10)); - test(Simplex::FE_DGP<2>(1), Simplex::PGauss<2>(3)); - test(Simplex::FE_DGP<2>(2), Simplex::PGauss<2>(7)); - test(Simplex::FE_DGP<3>(1), Simplex::PGauss<3>(4)); - test(Simplex::FE_DGP<3>(2), Simplex::PGauss<3>(10)); + test(Simplex::FE_P<2>(1), Simplex::QGauss<2>(3)); + test(Simplex::FE_P<2>(2), Simplex::QGauss<2>(7)); + test(Simplex::FE_P<3>(1), Simplex::QGauss<3>(4)); + test(Simplex::FE_P<3>(2), Simplex::QGauss<3>(10)); + test(Simplex::FE_DGP<2>(1), Simplex::QGauss<2>(3)); + test(Simplex::FE_DGP<2>(2), Simplex::QGauss<2>(7)); + test(Simplex::FE_DGP<3>(1), Simplex::QGauss<3>(4)); + test(Simplex::FE_DGP<3>(2), Simplex::QGauss<3>(10)); } diff --git a/tests/simplex/poisson_01.cc b/tests/simplex/poisson_01.cc index 84410336fb..e920c6e539 100644 --- a/tests/simplex/poisson_01.cc +++ b/tests/simplex/poisson_01.cc @@ -336,10 +336,10 @@ test_tet(const MPI_Comm &comm, const Parameters ¶ms) // 3) Select components Simplex::FE_P fe(params.degree); - Simplex::PGauss quad(dim == 2 ? (params.degree == 1 ? 3 : 7) : + Simplex::QGauss quad(dim == 2 ? (params.degree == 1 ? 3 : 7) : (params.degree == 1 ? 4 : 10)); - Simplex::PGauss face_quad(dim == 2 ? (params.degree == 1 ? 2 : 3) : + Simplex::QGauss face_quad(dim == 2 ? (params.degree == 1 ? 2 : 3) : (params.degree == 1 ? 3 : 7)); Simplex::FE_P fe_mapping(1); diff --git a/tests/simplex/poisson_02.cc b/tests/simplex/poisson_02.cc index 03110d8288..494dee8715 100644 --- a/tests/simplex/poisson_02.cc +++ b/tests/simplex/poisson_02.cc @@ -189,9 +189,9 @@ public: false, new Simplex::FE_DGP(degree), new MappingFE(Simplex::FE_P(1)), - new Simplex::PGauss(dim == 2 ? (degree == 1 ? 3 : 7) : + new Simplex::QGauss(dim == 2 ? (degree == 1 ? 3 : 7) : (degree == 1 ? 4 : 10)), - new Simplex::PGauss(dim == 2 ? (degree == 1 ? 2 : 3) : + new Simplex::QGauss(dim == 2 ? (degree == 1 ? 2 : 3) : (degree == 1 ? 3 : 7)), initial_refinement, number_refinement); diff --git a/tests/simplex/q_projection_01.cc b/tests/simplex/q_projection_01.cc index 919c388394..324cdc6080 100644 --- a/tests/simplex/q_projection_01.cc +++ b/tests/simplex/q_projection_01.cc @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -// Test QProjection for Simplex::PGauss. +// Test QProjection for Simplex::QGauss. #include @@ -38,7 +38,7 @@ test<2>(const unsigned int n_points) { const int dim = 2; - Simplex::PGauss quad_ref(n_points); + Simplex::QGauss quad_ref(n_points); const auto quad = QProjector::project_to_all_faces(ReferenceCell::Type::Tri, quad_ref); @@ -80,7 +80,7 @@ test<3>(const unsigned int n_points) { const int dim = 3; - Simplex::PGauss quad_ref(n_points); + Simplex::QGauss quad_ref(n_points); const auto quad = QProjector::project_to_all_faces(ReferenceCell::Type::Tet, quad_ref); diff --git a/tests/simplex/quadrature_lib_01.cc b/tests/simplex/quadrature_lib_01.cc index 8e9f8c3002..85d6b4a0aa 100644 --- a/tests/simplex/quadrature_lib_01.cc +++ b/tests/simplex/quadrature_lib_01.cc @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -// Test Simplex::PGauss: output its quadrature points and weights. +// Test Simplex::QGauss: output its quadrature points and weights. #include @@ -27,7 +27,7 @@ template void test(const unsigned int n_points) { - Simplex::PGauss quad(n_points); + Simplex::QGauss quad(n_points); for (unsigned int q = 0; q < quad.size(); ++q) { diff --git a/tests/simplex/step-12.cc b/tests/simplex/step-12.cc index e1f12330b6..4c7fe7e2c1 100644 --- a/tests/simplex/step-12.cc +++ b/tests/simplex/step-12.cc @@ -391,10 +391,10 @@ namespace Step12 QGauss face_quad(degree + 1); #else - Simplex::PGauss quad(dim == 2 ? (degree == 1 ? 3 : 7) : + Simplex::QGauss quad(dim == 2 ? (degree == 1 ? 3 : 7) : (degree == 1 ? 4 : 10)); - Simplex::PGauss face_quad(dim == 2 ? (degree == 1 ? 2 : 3) : + Simplex::QGauss face_quad(dim == 2 ? (degree == 1 ? 2 : 3) : (degree == 1 ? 3 : 7)); #endif diff --git a/tests/simplex/step-18.cc b/tests/simplex/step-18.cc index a146186b15..2bac10c4d1 100644 --- a/tests/simplex/step-18.cc +++ b/tests/simplex/step-18.cc @@ -419,7 +419,7 @@ namespace Step18 : triangulation() , fe(Simplex::FE_P(degree), dim) , dof_handler(triangulation) - , quadrature_formula(Simplex::PGauss(fe.degree == 1 ? 4 : 10)) + , quadrature_formula(Simplex::QGauss(fe.degree == 1 ? 4 : 10)) , mapping(Simplex::FE_P(1)) , present_time(0.0) , present_timestep(1.0) -- 2.39.5