From: Luca Heltai Date: Mon, 28 Mar 2016 11:17:53 +0000 (+0200) Subject: Removed the static FEQ(1) X-Git-Tag: v8.5.0-rc1~1131^2~5 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f902b34cb19849ec04a9029f2173901154d61a6b;p=dealii.git Removed the static FEQ(1) --- diff --git a/include/deal.II/fe/mapping_manifold.h b/include/deal.II/fe/mapping_manifold.h index 0a6e712f8c..93fb1ba8a3 100644 --- a/include/deal.II/fe/mapping_manifold.h +++ b/include/deal.II/fe/mapping_manifold.h @@ -25,7 +25,6 @@ #include #include #include -#include #include @@ -366,11 +365,6 @@ public: * @} */ - /** - * An FE_Q object, used to compute weights for Manifold quadratures. - */ - static const FE_Q fe_q; - protected: /** @@ -413,7 +407,7 @@ MappingManifold::InternalData::compute_manifold_quadrature_weights { for (unsigned int i=0; i::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::d_linear_shape_function(quad.point(q), i); } } } diff --git a/source/fe/mapping_manifold.cc b/source/fe/mapping_manifold.cc index a921dce6d5..590c2ac4a4 100644 --- a/source/fe/mapping_manifold.cc +++ b/source/fe/mapping_manifold.cc @@ -41,19 +41,11 @@ DEAL_II_NAMESPACE_OPEN - -template -const FE_Q -MappingManifold::fe_q = FE_Q(1); - - - template MappingManifold::InternalData::InternalData () {} - template std::size_t MappingManifold::InternalData::memory_consumption () const @@ -209,7 +201,7 @@ transform_unit_to_real_cell (const typename Triangulation::cell_it for (unsigned int v=0; v::vertices_per_cell; ++v) { vertices.push_back(cell->vertex(v)); - weights.push_back(fe_q.shape_value(v,p)); + weights.push_back(GeometryInfo::d_linear_shape_function(p,v)); } return cell->get_manifold().get_new_point(Quadrature(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::vertices_per_cell; ++j) - weights[j] = MappingManifold::fe_q.shape_value(j, np); + weights[j] = GeometryInfo::d_linear_shape_function(np, j); Point NP=data.manifold-> get_new_point(Quadrature(data.vertices, weights));