]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Break the dependence of MappingQ on MappingQ1.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 16 Sep 2015 11:45:03 +0000 (06:45 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 17 Sep 2015 19:45:31 +0000 (14:45 -0500)
include/deal.II/fe/mapping_q.h
include/deal.II/fe/mapping_q1.h
source/fe/mapping_q.cc

index d6695f5fb7a6c1c00f2e13aa14dbd2d73f5839e2..3dc87c4699002a1e87094aef7426b5b13bfd9334 100644 (file)
@@ -50,7 +50,7 @@ template <int dim, typename POLY> class TensorProductPolynomials;
  * @author Ralf Hartmann, 2000, 2001, 2005; Guido Kanschat 2000, 2001, Wolfgang Bangerth, 2015
  */
 template <int dim, int spacedim=dim>
-class MappingQ : public MappingQ1<dim,spacedim>
+class MappingQ : public MappingQGeneric<dim,spacedim>
 {
 public:
   /**
index 8951b5af9a1bdd35293bea5b644cfbc5bad8160c..20c0b3304550714e79f34be4e1d710a0f6b2f88e 100644 (file)
@@ -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().
index 75a33d8fd9e71e7cd57cdf6d2053f63359f10342..adfc5d6f9b8c58e5d6407141ac31b33728568df7 100644 (file)
@@ -56,7 +56,7 @@ template<int dim, int spacedim>
 MappingQ<dim,spacedim>::MappingQ (const unsigned int degree,
                                   const bool use_mapping_q_on_all_cells)
   :
-  MappingQ1<dim,spacedim>(degree),
+  MappingQGeneric<dim,spacedim>(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<dim,spacedim>::MappingQ (const unsigned int degree,
 template<int dim, int spacedim>
 MappingQ<dim,spacedim>::MappingQ (const MappingQ<dim,spacedim> &mapping)
   :
-  MappingQ1<dim,spacedim>(mapping.get_degree()),
+  MappingQGeneric<dim,spacedim>(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()

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.