From: Ralf Hartmann Date: Tue, 21 Feb 2006 12:53:52 +0000 (+0000) Subject: Remove get_default_mapping function. Use StaticMappingQ1 instead. X-Git-Tag: v8.0.0~12245 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb42fbe53bc86143b86a86c6a0f11e30b53ffc96;p=dealii.git Remove get_default_mapping function. Use StaticMappingQ1 instead. git-svn-id: https://svn.dealii.org/trunk@12437 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index b9cf5a3d2b..e4326a91e2 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -1595,15 +1595,6 @@ class FEValuesBase : protected FEValuesData, public Subscriptor */ UpdateFlags compute_update_flags (const UpdateFlags update_flags) const; - /** - * Returns reference to default - * MappingQ1 object. Needed - * by constructors of derived - * classes that uses - * MappingQ1 implicitly. - */ - static const Mapping &get_default_mapping(); - private: /** * Copy constructor. Since diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 3f1732986e..76700988cd 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -1047,15 +1047,6 @@ FEValuesBase::compute_update_flags (const UpdateFlags update_flags) const -template -const Mapping & -FEValuesBase::get_default_mapping () -{ - static const MappingQ1 mapping_q1; - return mapping_q1; -} - - /*------------------------------- FEValues -------------------------------*/ @@ -1086,7 +1077,7 @@ FEValues::FEValues (const FiniteElement &fe, FEValuesBase (q.n_quadrature_points, fe.dofs_per_cell, update_default, - this->get_default_mapping(), + StaticMappingQ1::mapping, fe), quadrature (q) { @@ -1350,7 +1341,7 @@ FEFaceValues::FEFaceValues (const FiniteElement &fe, FEFaceValuesBase (quadrature.n_quadrature_points, fe.dofs_per_cell, update_flags, - this->get_default_mapping(), + StaticMappingQ1::mapping, fe, quadrature) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); @@ -1558,7 +1549,7 @@ FESubfaceValues::FESubfaceValues (const FiniteElement &fe, FEFaceValuesBase (quadrature.n_quadrature_points, fe.dofs_per_cell, update_flags, - this->get_default_mapping(), + StaticMappingQ1::mapping, fe, quadrature) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));