From 4e6c2db3e2c748a55a0e136076b2e6ef69e6fa47 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 16 Sep 2015 06:45:03 -0500 Subject: [PATCH] Break the dependence of MappingQ on MappingQ1. --- include/deal.II/fe/mapping_q.h | 2 +- include/deal.II/fe/mapping_q1.h | 7 ------- source/fe/mapping_q.cc | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/deal.II/fe/mapping_q.h b/include/deal.II/fe/mapping_q.h index d6695f5fb7..3dc87c4699 100644 --- a/include/deal.II/fe/mapping_q.h +++ b/include/deal.II/fe/mapping_q.h @@ -50,7 +50,7 @@ template class TensorProductPolynomials; * @author Ralf Hartmann, 2000, 2001, 2005; Guido Kanschat 2000, 2001, Wolfgang Bangerth, 2015 */ template -class MappingQ : public MappingQ1 +class MappingQ : public MappingQGeneric { public: /** diff --git a/include/deal.II/fe/mapping_q1.h b/include/deal.II/fe/mapping_q1.h index 8951b5af9a..20c0b33045 100644 --- a/include/deal.II/fe/mapping_q1.h +++ b/include/deal.II/fe/mapping_q1.h @@ -98,13 +98,6 @@ public: protected: - /** - * Constructor. This constructor is for odd purposes: MappingQ is - * derived from this class (for historical reasons) and it needs a - * way to pass down the "true" polynomial degree of the mapping. - */ - MappingQ1 (const unsigned int degree); - /** * Computes the support points of the mapping. For @p MappingQ1 these are * the vertices, as obtained by calling Mapping::get_vertices(). diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index 75a33d8fd9..adfc5d6f9b 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -56,7 +56,7 @@ template MappingQ::MappingQ (const unsigned int degree, const bool use_mapping_q_on_all_cells) : - MappingQ1(degree), + MappingQGeneric(degree), // see whether we want to use *this* mapping objects on *all* cells, // or defer to an explicit Q1 mapping on interior cells. if @@ -78,7 +78,7 @@ MappingQ::MappingQ (const unsigned int degree, template MappingQ::MappingQ (const MappingQ &mapping) : - MappingQ1(mapping.get_degree()), + MappingQGeneric(mapping.get_degree()), use_mapping_q_on_all_cells (mapping.use_mapping_q_on_all_cells), // clone the Q1 mapping for use on interior cells (if necessary) // or to create a good initial guess in transform_real_to_unit_cell() -- 2.39.5