From 483d5ee66be7973e80d4ce4db35ce0cc70cb7b19 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sun, 18 Oct 2015 22:36:43 -0400 Subject: [PATCH] Prefer QuadratureType to Quadrature in templates. Writing something like template is ambiguous because Quadrature is also a class. --- include/deal.II/matrix_free/matrix_free.h | 110 +++++++++++----------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index af6ee41f6b..4e63fbf8c0 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -292,32 +292,32 @@ public: * used, which gets the partitioning information builtin into the * DoFHandler. */ - template + template void reinit (const Mapping &mapping, const DH &dof_handler, const ConstraintMatrix &constraint, const IndexSet &locally_owned_dofs, - const Quadrature &quad, + const QuadratureType &quad, const AdditionalData additional_data = AdditionalData()); /** * Initializes the data structures. Same as above, but with index set stored * in the DoFHandler for describing the locally owned degrees of freedom. */ - template + template void reinit (const Mapping &mapping, const DH &dof_handler, const ConstraintMatrix &constraint, - const Quadrature &quad, + const QuadratureType &quad, const AdditionalData additional_data = AdditionalData()); /** * Initializes the data structures. Same as above, but using a $Q_1$ mapping. */ - template + template void reinit (const DH &dof_handler, const ConstraintMatrix &constraint, - const Quadrature &quad, + const QuadratureType &quad, const AdditionalData additional_data = AdditionalData()); /** @@ -346,12 +346,12 @@ public: * used, which gets the partitioning information from the DoFHandler. This * is the most general initialization function. */ - template - void reinit (const Mapping &mapping, + template + void reinit (const Mapping &mapping, const std::vector &dof_handler, const std::vector &constraint, - const std::vector &locally_owned_set, - const std::vector &quad, + const std::vector &locally_owned_set, + const std::vector &quad, const AdditionalData additional_data = AdditionalData()); /** @@ -359,20 +359,20 @@ public: * description of the locally owned range of degrees of freedom is taken * from the DoFHandler. */ - template - void reinit (const Mapping &mapping, + template + void reinit (const Mapping &mapping, const std::vector &dof_handler, const std::vector &constraint, - const std::vector &quad, + const std::vector &quad, const AdditionalData additional_data = AdditionalData()); /** * Initializes the data structures. Same as above, but using a $Q_1$ mapping. */ - template + template void reinit (const std::vector &dof_handler, const std::vector &constraint, - const std::vector &quad, + const std::vector &quad, const AdditionalData additional_data = AdditionalData()); /** @@ -382,20 +382,20 @@ public: * as might be necessary when several components in a vector-valued problem * are integrated together based on the same quadrature formula. */ - template - void reinit (const Mapping &mapping, + template + void reinit (const Mapping &mapping, const std::vector &dof_handler, const std::vector &constraint, - const Quadrature &quad, + const QuadratureType &quad, const AdditionalData additional_data = AdditionalData()); /** * Initializes the data structures. Same as above, but using a $Q_1$ mapping. */ - template + template void reinit (const std::vector &dof_handler, const std::vector &constraint, - const Quadrature &quad, + const QuadratureType &quad, const AdditionalData additional_data = AdditionalData()); /** @@ -1462,16 +1462,16 @@ namespace internal template -template +template void MatrixFree:: -reinit(const DH &dof_handler, - const ConstraintMatrix &constraints_in, - const Quad &quad, +reinit(const DH &dof_handler, + const ConstraintMatrix &constraints_in, + const QuadratureType &quad, const typename MatrixFree::AdditionalData additional_data) { std::vector dof_handlers; std::vector constraints; - std::vector quads; + std::vector quads; dof_handlers.push_back(&dof_handler); constraints.push_back (&constraints_in); @@ -1487,17 +1487,17 @@ reinit(const DH &dof_handler, template -template +template void MatrixFree:: -reinit(const Mapping &mapping, - const DH &dof_handler, - const ConstraintMatrix &constraints_in, - const Quad &quad, +reinit(const Mapping &mapping, + const DH &dof_handler, + const ConstraintMatrix &constraints_in, + const QuadratureType &quad, const typename MatrixFree::AdditionalData additional_data) { std::vector dof_handlers; std::vector constraints; - std::vector quads; + std::vector quads; dof_handlers.push_back(&dof_handler); constraints.push_back (&constraints_in); @@ -1513,11 +1513,11 @@ reinit(const Mapping &mapping, template -template +template void MatrixFree:: reinit(const std::vector &dof_handler, const std::vector &constraint, - const std::vector &quad, + const std::vector &quad, const typename MatrixFree::AdditionalData additional_data) { std::vector locally_owned_set = @@ -1531,14 +1531,14 @@ reinit(const std::vector &dof_handler, template -template +template void MatrixFree:: -reinit(const std::vector &dof_handler, - const std::vector &constraint, - const Quad &quad, +reinit(const std::vector &dof_handler, + const std::vector &constraint, + const QuadratureType &quad, const typename MatrixFree::AdditionalData additional_data) { - std::vector quads; + std::vector quads; quads.push_back(quad); std::vector locally_owned_set = internal::MatrixFree::extract_locally_owned_index_sets @@ -1550,15 +1550,15 @@ reinit(const std::vector &dof_handler, template -template +template void MatrixFree:: -reinit(const Mapping &mapping, - const std::vector &dof_handler, - const std::vector &constraint, - const Quad &quad, +reinit(const Mapping &mapping, + const std::vector &dof_handler, + const std::vector &constraint, + const QuadratureType &quad, const typename MatrixFree::AdditionalData additional_data) { - std::vector quads; + std::vector quads; quads.push_back(quad); std::vector locally_owned_set = internal::MatrixFree::extract_locally_owned_index_sets @@ -1570,12 +1570,12 @@ reinit(const Mapping &mapping, template -template +template void MatrixFree:: -reinit(const Mapping &mapping, - const std::vector &dof_handler, - const std::vector &constraint, - const std::vector &quad, +reinit(const Mapping &mapping, + const std::vector &dof_handler, + const std::vector &constraint, + const std::vector &quad, const typename MatrixFree::AdditionalData additional_data) { std::vector locally_owned_set = @@ -1588,13 +1588,13 @@ reinit(const Mapping &mapping, template -template +template void MatrixFree:: -reinit(const Mapping &mapping, - const std::vector &dof_handler, - const std::vector &constraint, - const std::vector &locally_owned_set, - const std::vector &quad, +reinit(const Mapping &mapping, + const std::vector &dof_handler, + const std::vector &constraint, + const std::vector &locally_owned_set, + const std::vector &quad, const typename MatrixFree::AdditionalData additional_data) { // find out whether we use a hp Quadrature or a standard quadrature -- 2.39.5