From: Wolfgang Bangerth Date: Tue, 20 Dec 2005 05:24:45 +0000 (+0000) Subject: Move a few functions around. X-Git-Tag: v8.0.0~12763 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94a9a302a5d9ff8c4b9c580693801f2b4d17d0c0;p=dealii.git Move a few functions around. git-svn-id: https://svn.dealii.org/trunk@11892 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/dofs/dof_accessor.templates.h b/deal.II/deal.II/include/dofs/dof_accessor.templates.h index ed06a2af09..7c68f5e8c3 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -1027,56 +1027,6 @@ DoFObjectAccessor<3,dim,DH>::operator != (const DoFObjectAccessor<3,dim,DH> &a) } -/*------------------------- Functions: DoFCellAccessor -----------------------*/ - -template class DH> -inline -DoFCellAccessor:: -DoFCellAccessor (const Triangulation *tria, - const int level, - const int index, - const AccessorData *local_data) - : - DoFObjectAccessor (tria,level,index,local_data) -{} - - -template class DH> -inline -TriaIterator > -DoFCellAccessor::neighbor (const unsigned int i) const -{ - TriaIterator > q (this->tria, - this->neighbor_level (i), - this->neighbor_index (i), - this->dof_handler); - -#ifdef DEBUG - if (q.state() != IteratorState::past_the_end) - Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsNeighbor()); -#endif - return q; -} - - -template class DH> -inline -TriaIterator > -DoFCellAccessor::child (const unsigned int i) const -{ - TriaIterator > q (this->tria, - this->present_level+1, - this->child_index (i), - this->dof_handler); - -#ifdef DEBUG - if (q.state() != IteratorState::past_the_end) - Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsChild()); -#endif - return q; -} - - /*--------------- Functions: DoFObjectAccessor<1,dim,hpDoFHandler> -----------*/ template <> @@ -1625,4 +1575,55 @@ DoFObjectAccessor<3,3,hpDoFHandler>::set_active_fe_index (const unsigned int i) } +/*------------------------- Functions: DoFCellAccessor -----------------------*/ + +template class DH> +inline +DoFCellAccessor:: +DoFCellAccessor (const Triangulation *tria, + const int level, + const int index, + const AccessorData *local_data) + : + DoFObjectAccessor (tria,level,index,local_data) +{} + + +template class DH> +inline +TriaIterator > +DoFCellAccessor::neighbor (const unsigned int i) const +{ + TriaIterator > q (this->tria, + this->neighbor_level (i), + this->neighbor_index (i), + this->dof_handler); + +#ifdef DEBUG + if (q.state() != IteratorState::past_the_end) + Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsNeighbor()); +#endif + return q; +} + + +template class DH> +inline +TriaIterator > +DoFCellAccessor::child (const unsigned int i) const +{ + TriaIterator > q (this->tria, + this->present_level+1, + this->child_index (i), + this->dof_handler); + +#ifdef DEBUG + if (q.state() != IteratorState::past_the_end) + Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsChild()); +#endif + return q; +} + + + #endif