From: Wolfgang Bangerth Date: Wed, 22 Feb 2006 06:41:51 +0000 (+0000) Subject: Export dimension and integral_dimension to make the life of some hp code X-Git-Tag: v8.0.0~12228 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea45d65f28a0c10f0a429ca4d3d4fc6c14265df0;p=dealii.git Export dimension and integral_dimension to make the life of some hp code easier (requires less template arguments) git-svn-id: https://svn.dealii.org/trunk@12454 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 e4326a91e2..8205671d63 100644 --- a/deal.II/deal.II/include/fe/fe_values.h +++ b/deal.II/deal.II/include/fe/fe_values.h @@ -356,7 +356,8 @@ class FEValuesData * @author Wolfgang Bangerth, 1998, 2003, Guido Kanschat, 2001 */ template -class FEValuesBase : protected FEValuesData, public Subscriptor +class FEValuesBase : protected FEValuesData, + public Subscriptor { public: /** @@ -1628,6 +1629,20 @@ template class FEValues : public FEValuesBase { public: + /** + * Dimension in which this object + * operates. + */ + static const unsigned int dimension = dim; + + /** + * Dimension of the object over + * which we integrate. For the + * present class, this is equal + * to dim. + */ + static const unsigned int integral_dimension = dim; + /** * Constructor. Gets cell * independent data from mapping @@ -1921,7 +1936,21 @@ template class FEFaceValues : public FEFaceValuesBase { public: - /** + /** + * Dimension in which this object + * operates. + */ + static const unsigned int dimension = dim; + + /** + * Dimension of the object over + * which we integrate. For the + * present class, this is equal + * to dim-1. + */ + static const unsigned int integral_dimension = dim-1; + + /** * Constructor. Gets cell * independent data from mapping * and finite element objects, @@ -2080,6 +2109,20 @@ template class FESubfaceValues : public FEFaceValuesBase { public: + /** + * Dimension in which this object + * operates. + */ + static const unsigned int dimension = dim; + + /** + * Dimension of the object over + * which we integrate. For the + * present class, this is equal + * to dim-1. + */ + static const unsigned int integral_dimension = dim-1; + /** * Constructor. Gets cell * independent data from mapping diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 76700988cd..39a09ab5b4 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -1050,6 +1050,13 @@ FEValuesBase::compute_update_flags (const UpdateFlags update_flags) const /*------------------------------- FEValues -------------------------------*/ +template +const unsigned int FEValues::dimension; + +template +const unsigned int FEValues::integral_dimension; + + template FEValues::FEValues (const Mapping &mapping, @@ -1315,6 +1322,12 @@ FEFaceValuesBase::memory_consumption () const /*------------------------------- FEFaceValues -------------------------------*/ +template +const unsigned int FEFaceValues::dimension; + +template +const unsigned int FEFaceValues::integral_dimension; + template FEFaceValues::FEFaceValues (const Mapping &mapping, @@ -1524,6 +1537,14 @@ void FEFaceValues::do_reinit (const unsigned int face_no) /*------------------------------- FESubFaceValues -------------------------------*/ +template +const unsigned int FESubfaceValues::dimension; + +template +const unsigned int FESubfaceValues::integral_dimension; + + + template FESubfaceValues::FESubfaceValues (const Mapping &mapping, const FiniteElement &fe,