Remove an unused argument of FiniteElementData.

The value of this argument was unused by this class, but several derived
classes passed something down anyway. Fix this by simply removing the argument.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 5403fc08b8ed344b89c15f67345c857f3405108c..571f51156b47dd4a20a8d18980860f3a622f6103 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -38,6 +38,15 @@ inconvenience this causes.
 </p>
 
 <ol>
+  <li> Changed: The constructor of FiniteElementData had a last argument
+  <code>n_blocks</code> that was not actually used by the class to
+  initialize anything. It has been removed. In addition, the default
+  constructor of FiniteElementData has also been removed given that it
+  only creates a dysfunctional element.
+  <br>
+  (Wolfgang Bangerth, 2016/01/23).
+  </li>
+
   <li> Rework: SLEPcWrappers were reworked to allow usage of PETSc solvers
   and preconditioners inside SLEPc's eigensolvers. To that end extra methods
   were introduced to PETSc wrappers. Moreover, initialization of the
@@ -48,7 +57,7 @@ inconvenience this causes.
   (Denis Davydov, 2015/12/29).
   </li>
 
-  <li> Removed the deprecated Operator class in the Algorithms namespace.
+  <li> Removed: The deprecated Operator class in the Algorithms namespace.
   <br>
   (Timo Heister, 2015/12/21)
   </li>

diff --git a/include/deal.II/fe/fe_base.h b/include/deal.II/fe/fe_base.h
index 5ccbeab06f9cb82361c7f11893c9b0ed1420de28..1a290d7780a4a0f0674c2f6a22e888c71e252869 100644 (file)
--- a/include/deal.II/fe/fe_base.h
+++ b/include/deal.II/fe/fe_base.h
@@ -340,14 +340,11 @@ public:
    *   $H_\text{div}$ conforming; finally, completely discontinuous
    *   elements (implemented by the FE_DGQ class) are only $L_2$
    *   conforming.
-   *
-   * @param[in] n_blocks obsolete and ignored.
    */
   FiniteElementData (const std::vector<unsigned int> &dofs_per_object,
                      const unsigned int               n_components,
                      const unsigned int               degree,
-                     const Conformity                 conformity = unknown,
-                     const unsigned int               n_blocks = numbers::invalid_unsigned_int);
+                     const Conformity                 conformity = unknown);
 
   /**
    * Number of dofs per vertex.

diff --git a/include/deal.II/fe/fe_dg_vector.templates.h b/include/deal.II/fe/fe_dg_vector.templates.h
index 17e10b14cc15dbf22404ab4651166bdbb354ea97..ae1e3e9a4309eed0002cdf9c8ae377599126a327 100644 (file)
--- a/include/deal.II/fe/fe_dg_vector.templates.h
+++ b/include/deal.II/fe/fe_dg_vector.templates.h
@@ -30,7 +30,7 @@ FE_DGVector<PolynomialType,dim,spacedim>::FE_DGVector (
   FE_PolyTensor<PolynomialType, dim, spacedim>(
     deg,
     FiniteElementData<dim>(
-      get_dpo_vector(deg), dim, deg+1, FiniteElementData<dim>::L2, 1),
+      get_dpo_vector(deg), dim, deg+1, FiniteElementData<dim>::L2),
     std::vector<bool>(PolynomialType::compute_n_pols(deg), true),
     std::vector<ComponentMask>(PolynomialType::compute_n_pols(deg),
                                ComponentMask(dim,true)))

diff --git a/source/fe/fe_abf.cc b/source/fe/fe_abf.cc
index 79d8c060123d8132cbd2457f69ea480f980998c7..064c480a2a55ad7b48cdcb7fe979619b5f8daeca 100644 (file)
--- a/source/fe/fe_abf.cc
+++ b/source/fe/fe_abf.cc
@@ -45,7 +45,7 @@ FE_ABF<dim>::FE_ABF (const unsigned int deg)
   FE_PolyTensor<PolynomialsABF<dim>, dim> (
     deg,
     FiniteElementData<dim>(get_dpo_vector(deg),
-                           dim, deg+1, FiniteElementData<dim>::Hdiv, 1),
+                           dim, deg+1, FiniteElementData<dim>::Hdiv),
     std::vector<bool>(PolynomialsABF<dim>::compute_n_pols(deg), true),
     std::vector<ComponentMask>(PolynomialsABF<dim>::compute_n_pols(deg),
                                std::vector<bool>(dim,true))),

diff --git a/source/fe/fe_bdm.cc b/source/fe/fe_bdm.cc
index 2fe36b2f368cd2104b269df1be91574c5f8f2297..559709331c474ba3fd8708652990425969d8a4e3 100644 (file)
--- a/source/fe/fe_bdm.cc
+++ b/source/fe/fe_bdm.cc
@@ -39,7 +39,7 @@ FE_BDM<dim>::FE_BDM (const unsigned int deg)
   FE_PolyTensor<PolynomialsBDM<dim>, dim> (
     deg,
     FiniteElementData<dim>(get_dpo_vector(deg),
-                           dim, deg+1, FiniteElementData<dim>::Hdiv, 1),
+                           dim, deg+1, FiniteElementData<dim>::Hdiv),
     get_ria_vector (deg),
     std::vector<ComponentMask>(PolynomialsBDM<dim>::compute_n_pols(deg),
                                std::vector<bool>(dim,true)))

diff --git a/source/fe/fe_data.cc b/source/fe/fe_data.cc
index b04752ba216b6de4b5e55d2523cc17dfda220bea..ddcc3173f7e5d6180e14253af111454bb7ffe046 100644 (file)
--- a/source/fe/fe_data.cc
+++ b/source/fe/fe_data.cc
@@ -23,8 +23,7 @@ FiniteElementData<dim>::
 FiniteElementData (const std::vector<unsigned int> &dofs_per_object,
                    const unsigned int n_components,
                    const unsigned int degree,
-                   const Conformity conformity,
-                   const unsigned int)
+                   const Conformity conformity)
   :
   dofs_per_vertex(dofs_per_object[0]),
   dofs_per_line(dofs_per_object[1]),

diff --git a/source/fe/fe_nedelec.cc b/source/fe/fe_nedelec.cc
index 8934aaad2483b945f749cd02e93d9d7239daacfb..dcb488a5bf0d3ae5b419df5e3598f2282b955868 100644 (file)
--- a/source/fe/fe_nedelec.cc
+++ b/source/fe/fe_nedelec.cc
@@ -46,7 +46,7 @@ FE_Nedelec<dim>::FE_Nedelec (const unsigned int p) :
   FE_PolyTensor<PolynomialsNedelec<dim>, dim>
   (p,
    FiniteElementData<dim> (get_dpo_vector (p), dim, p + 1,
-                           FiniteElementData<dim>::Hcurl, 1),
+                           FiniteElementData<dim>::Hcurl),
    std::vector<bool> (PolynomialsNedelec<dim>::compute_n_pols (p), true),
    std::vector<ComponentMask>
    (PolynomialsNedelec<dim>::compute_n_pols (p),

diff --git a/source/fe/fe_raviart_thomas.cc b/source/fe/fe_raviart_thomas.cc
index aa3303a57a998b07aed3ec31870038909d2611c3..37a1a297ab6c0d6cdd4f2b4d0d8f26a29eb98369 100644 (file)
--- a/source/fe/fe_raviart_thomas.cc
+++ b/source/fe/fe_raviart_thomas.cc
@@ -45,7 +45,7 @@ FE_RaviartThomas<dim>::FE_RaviartThomas (const unsigned int deg)
   FE_PolyTensor<PolynomialsRaviartThomas<dim>, dim> (
     deg,
     FiniteElementData<dim>(get_dpo_vector(deg),
-                           dim, deg+1, FiniteElementData<dim>::Hdiv, 1),
+                           dim, deg+1, FiniteElementData<dim>::Hdiv),
     std::vector<bool>(PolynomialsRaviartThomas<dim>::compute_n_pols(deg), true),
     std::vector<ComponentMask>(PolynomialsRaviartThomas<dim>::compute_n_pols(deg),
                                std::vector<bool>(dim,true)))

diff --git a/source/fe/fe_raviart_thomas_nodal.cc b/source/fe/fe_raviart_thomas_nodal.cc
index 09f79d33c6d5deddbc20133e3a30d58d6c883527..7a81f17cf1294bcd4c4292120e3111cf29742630 100644 (file)
--- a/source/fe/fe_raviart_thomas_nodal.cc
+++ b/source/fe/fe_raviart_thomas_nodal.cc
@@ -38,7 +38,7 @@ FE_RaviartThomasNodal<dim>::FE_RaviartThomasNodal (const unsigned int deg)
   FE_PolyTensor<PolynomialsRaviartThomas<dim>, dim> (
     deg,
     FiniteElementData<dim>(get_dpo_vector(deg),
-                           dim, deg+1, FiniteElementData<dim>::Hdiv, 1),
+                           dim, deg+1, FiniteElementData<dim>::Hdiv),
     get_ria_vector (deg),
     std::vector<ComponentMask>(PolynomialsRaviartThomas<dim>::compute_n_pols(deg),
                                std::vector<bool>(dim,true)))

diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc
index f50d3a2f62ed5decd99c545834728dab9741d718..2d1265f22f5bb115e0fe5ce014aacface0faf793 100644 (file)
--- a/source/fe/fe_system.cc
+++ b/source/fe/fe_system.cc
@@ -2449,8 +2449,6 @@ FESystem<dim,spacedim>::multiply_dof_numbers (
 
   unsigned int degree = 0; // degree is the maximal degree of the components
 
-  unsigned int summed_multiplicities = 0;
-
   for (unsigned int i=0; i<fes.size(); i++)
     if (multiplicities[i]>0)
       {
@@ -2462,8 +2460,6 @@ FESystem<dim,spacedim>::multiply_dof_numbers (
         multiplied_n_components+=fes[i]->n_components() * multiplicities[i];
 
         degree = std::max(degree, fes[i]->tensor_degree() );
-
-        summed_multiplicities += multiplicities[i];
       }
 
   // assume conformity of the first finite element and then take away
@@ -2497,8 +2493,7 @@ FESystem<dim,spacedim>::multiply_dof_numbers (
   return FiniteElementData<dim> (dpo,
                                  multiplied_n_components,
                                  degree,
-                                 total_conformity,
-                                 summed_multiplicities);
+                                 total_conformity);
 }