From: kainan.wang Date: Fri, 11 Jan 2013 21:16:26 +0000 (+0000) Subject: global_dof_index change for fe_face.h and fe_face.cc X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62a81e88204f4a95d8bdc5d4b6f7216893779f0;p=dealii-svn.git global_dof_index change for fe_face.h and fe_face.cc git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_3@28031 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/files b/deal.II/files index c70f154734..9e14aeb1ef 100644 --- a/deal.II/files +++ b/deal.II/files @@ -71,7 +71,7 @@ source/fe/fe_dgp_monomial.cc source/fe/fe_dgp_nonparametric.cc source/fe/fe_dgq.cc source/fe/fe_dg_vector.cc -source/fe/fe_face.cc +KAINAN source/fe/fe_face.cc source/fe/fe_nedelec.cc source/fe/fe_nothing.cc source/fe/fe_poly.cc @@ -293,7 +293,7 @@ GK include/deal.II/fe/fe_dgp_nonparametric.h GK include/deal.II/fe/fe_dgq.h GK include/deal.II/fe/fe_dg_vector.h GK include/deal.II/fe/fe_dg_vector.templates.h -GK include/deal.II/fe/fe_face.h +GK/KAINAN include/deal.II/fe/fe_face.h GK include/deal.II/fe/fe.h GK include/deal.II/fe/fe_nedelec.h GK include/deal.II/fe/fe_nothing.h diff --git a/deal.II/include/deal.II/fe/fe_face.h b/deal.II/include/deal.II/fe/fe_face.h index 936c0a286b..6e6e033775 100644 --- a/deal.II/include/deal.II/fe/fe_face.h +++ b/deal.II/include/deal.II/fe/fe_face.h @@ -83,8 +83,8 @@ public: * interface in * FiniteElement */ - virtual bool has_support_on_face (const unsigned int shape_index, - const unsigned int face_index) const; + virtual bool has_support_on_face (const types::global_dof_index shape_index, + const types::global_dof_index face_index) const; private: /** diff --git a/deal.II/source/fe/fe_face.cc b/deal.II/source/fe/fe_face.cc index 85812d966c..68617b06fb 100644 --- a/deal.II/source/fe/fe_face.cc +++ b/deal.II/source/fe/fe_face.cc @@ -85,8 +85,8 @@ FE_FaceQ::get_name () const template bool FE_FaceQ::has_support_on_face ( - const unsigned int shape_index, - const unsigned int face_index) const + const types::global_dof_index shape_index, + const types::global_dof_index face_index) const { return (face_index == (shape_index/this->dofs_per_face)); }