From 9054b3aec3a1c4fe167308323194b3a66a9898d3 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Tue, 23 Feb 2010 23:04:22 +0000 Subject: [PATCH] move declaration of dimension into FEValuesBase git-svn-id: https://svn.dealii.org/trunk@20678 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/fe/fe_values.h | 24 ++++++++++++------------ deal.II/deal.II/source/fe/fe_values.cc | 8 ++++++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h index 8dd4ee1827..79501b6fe3 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -1474,6 +1474,18 @@ class FEValuesBase : protected FEValuesData, public Subscriptor { public: + /** + * Dimension in which this object + * operates. + */ + static const unsigned int dimension = dim; + + /** + * Dimension of the space in + * which this object operates. + */ + static const unsigned int space_dimension = spacedim; + /** * Number of quadrature points. */ @@ -2812,18 +2824,6 @@ template class FEValues : public FEValuesBase { public: - /** - * Dimension in which this object - * operates. - */ - static const unsigned int dimension = dim; - - /** - * Dimension of the space in - * which this object operates. - */ - static const unsigned int space_dimension = spacedim; - /** * Dimension of the object over * which we integrate. For the diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 4134d62af2..983102bcaf 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -3059,17 +3059,21 @@ FEValuesBase::get_cell_similarity () const } -/*------------------------------- FEValues -------------------------------*/ +template +const unsigned int FEValuesBase::dimension; template -const unsigned int FEValues::dimension; +const unsigned int FEValuesBase::space_dimension; + +/*------------------------------- FEValues -------------------------------*/ template const unsigned int FEValues::integral_dimension; + template FEValues::FEValues (const Mapping &mapping, const FiniteElement &fe, -- 2.39.5