Removed the static FEQ(1)

diff --git a/include/deal.II/fe/mapping_manifold.h b/include/deal.II/fe/mapping_manifold.h
index 0a6e712f8c3b347e7a16fb21407c2f5ba38f482d..93fb1ba8a346bf3ee4b935ff9e1e76efffac859c 100644 (file)
--- a/include/deal.II/fe/mapping_manifold.h
+++ b/include/deal.II/fe/mapping_manifold.h
@@ -25,7 +25,6 @@
 #include <deal.II/grid/tria_iterator.h>
 #include <deal.II/dofs/dof_accessor.h>
 #include <deal.II/fe/mapping.h>
-#include <deal.II/fe/fe_q.h>
 
 #include <cmath>
 
@@ -366,11 +365,6 @@ public:
    * @}
    */
 
-  /**
-   * An FE_Q object, used to compute weights for Manifold quadratures.
-   */
-  static const FE_Q<dim,spacedim> fe_q;
-
 protected:
 
   /**
@@ -413,7 +407,7 @@ MappingManifold<dim,spacedim>::InternalData::compute_manifold_quadrature_weights
     {
       for (unsigned int i=0; i<GeometryInfo<dim>::vertices_per_cell; ++i)
         {
-          cell_manifold_quadrature_weights[q][i] = fe_q.shape_value(i, quad.point(q));
+          cell_manifold_quadrature_weights[q][i] = GeometryInfo<dim>::d_linear_shape_function(quad.point(q), i);
         }
     }
 }

diff --git a/source/fe/mapping_manifold.cc b/source/fe/mapping_manifold.cc
index a921dce6d50bd5cc75660c2a8ba80805e2b636ee..590c2ac4a4b0ceb1d121713589672a54b2de0121 100644 (file)
--- a/source/fe/mapping_manifold.cc
+++ b/source/fe/mapping_manifold.cc
@@ -41,19 +41,11 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-
-template<int dim, int spacedim>
-const FE_Q<dim,spacedim>
-MappingManifold<dim,spacedim>::fe_q = FE_Q<dim,spacedim>(1);
-
-
-
 template<int dim, int spacedim>
 MappingManifold<dim,spacedim>::InternalData::InternalData ()
 {}
 
 
-
 template<int dim, int spacedim>
 std::size_t
 MappingManifold<dim,spacedim>::InternalData::memory_consumption () const
@@ -209,7 +201,7 @@ transform_unit_to_real_cell (const typename Triangulation<dim,spacedim>::cell_it
   for (unsigned int v=0; v<GeometryInfo<dim>::vertices_per_cell; ++v)
     {
       vertices.push_back(cell->vertex(v));
-      weights.push_back(fe_q.shape_value(v,p));
+      weights.push_back(GeometryInfo<dim>::d_linear_shape_function(p,v));
     }
   return cell->get_manifold().get_new_point(Quadrature<spacedim>(vertices, weights));
 }
@@ -439,7 +431,7 @@ namespace internal
 
                   // Get the weights to compute the np point in real space
                   for (unsigned int j=0; j<GeometryInfo<dim>::vertices_per_cell; ++j)
-                    weights[j] = MappingManifold<dim,spacedim>::fe_q.shape_value(j, np);
+                    weights[j] = GeometryInfo<dim>::d_linear_shape_function(np, j);
 
                   Point<spacedim> NP=data.manifold->
                                      get_new_point(Quadrature<spacedim>(data.vertices, weights));