From ff77abe0fa8359066c8745195f10b4e0f1e4f15d Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Mon, 29 Jun 2020 09:48:36 +0200 Subject: [PATCH] Remove DoFHandlerType from internal::DoFHandlerImplementation::Iterators --- include/deal.II/dofs/dof_accessor.h | 8 ++-- include/deal.II/dofs/dof_accessor.templates.h | 38 +++++++++---------- include/deal.II/dofs/dof_handler.h | 8 ++-- include/deal.II/dofs/dof_iterator_selector.h | 32 ++++++++-------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/deal.II/dofs/dof_accessor.h b/include/deal.II/dofs/dof_accessor.h index 21241cf7dc..3f3d90c53c 100644 --- a/include/deal.II/dofs/dof_accessor.h +++ b/include/deal.II/dofs/dof_accessor.h @@ -356,7 +356,7 @@ public: * function returns an iterator to itself. */ typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::line_iterator + Iterators::line_iterator line(const unsigned int i) const; /** @@ -365,7 +365,7 @@ public: * function returns an iterator to itself. */ typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::quad_iterator + Iterators::quad_iterator quad(const unsigned int i) const; /** @@ -907,7 +907,7 @@ public: * an exception. */ typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::line_iterator + Iterators<1, spacedim, level_dof_access>::line_iterator line(const unsigned int i) const; /** @@ -917,7 +917,7 @@ public: * an exception. */ typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::quad_iterator + Iterators<1, spacedim, level_dof_access>::quad_iterator quad(const unsigned int i) const; /** diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index d9628adfba..830fd3ca35 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -1598,7 +1598,7 @@ DoFAccessor::set_mg_dof_indices( template inline typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::line_iterator + Iterators::line_iterator DoFAccessor::line( const unsigned int i) const { @@ -1610,12 +1610,12 @@ inline typename dealii::internal::DoFHandlerImplementation:: Assert(i == 0, ExcMessage("You can only ask for line zero if the " "current object is a line itself.")); - return typename dealii::internal::DoFHandlerImplementation::Iterators< - DoFHandler, - level_dof_access>::cell_iterator(&this->get_triangulation(), - this->level(), - this->index(), - &this->get_dof_handler()); + return typename dealii::internal::DoFHandlerImplementation:: + Iterators::cell_iterator( + &this->get_triangulation(), + this->level(), + this->index(), + &this->get_dof_handler()); } // otherwise we need to be in structdim>=2 @@ -1624,7 +1624,7 @@ inline typename dealii::internal::DoFHandlerImplementation:: // checking of 'i' happens in line_index(i) return typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::line_iterator( + Iterators::line_iterator( this->tria, 0, // only sub-objects are allowed, which have no level this->line_index(i), @@ -1634,7 +1634,7 @@ inline typename dealii::internal::DoFHandlerImplementation:: template inline typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::quad_iterator + Iterators::quad_iterator DoFAccessor::quad( const unsigned int i) const { @@ -1648,11 +1648,11 @@ inline typename dealii::internal::DoFHandlerImplementation:: Assert(i == 0, ExcMessage("You can only ask for quad zero if the " "current object is a quad itself.")); - return typename dealii::internal::DoFHandlerImplementation::Iterators< - DoFHandler>::cell_iterator(&this->get_triangulation(), - this->level(), - this->index(), - &this->get_dof_handler()); + return typename dealii::internal::DoFHandlerImplementation:: + Iterators::cell_iterator(&this->get_triangulation(), + this->level(), + this->index(), + &this->get_dof_handler()); } // otherwise we need to be in structdim>=3 @@ -1661,7 +1661,7 @@ inline typename dealii::internal::DoFHandlerImplementation:: // checking of 'i' happens in quad_index(i) return typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::quad_iterator( + Iterators::quad_iterator( this->tria, 0, // only sub-objects are allowed, which have no level this->quad_index(i), @@ -1951,26 +1951,26 @@ DoFAccessor<0, 1, spacedim, level_dof_access>::child( template inline typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::line_iterator + Iterators<1, spacedim, level_dof_access>::line_iterator DoFAccessor<0, 1, spacedim, level_dof_access>::line( const unsigned int /*c*/) const { Assert(false, ExcNotImplemented()); return typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::line_iterator(); + Iterators<1, spacedim, level_dof_access>::line_iterator(); } template inline typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::quad_iterator + Iterators<1, spacedim, level_dof_access>::quad_iterator DoFAccessor<0, 1, spacedim, level_dof_access>::quad( const unsigned int /*c*/) const { Assert(false, ExcNotImplemented()); return typename dealii::internal::DoFHandlerImplementation:: - Iterators, level_dof_access>::quad_iterator(); + Iterators<1, spacedim, level_dof_access>::quad_iterator(); } diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index 0f3ca22a91..c770bc8678 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -218,10 +218,10 @@ namespace parallel template class DoFHandler : public Subscriptor { - using ActiveSelector = dealii::internal::DoFHandlerImplementation:: - Iterators, false>; - using LevelSelector = dealii::internal::DoFHandlerImplementation:: - Iterators, true>; + using ActiveSelector = + dealii::internal::DoFHandlerImplementation::Iterators; + using LevelSelector = + dealii::internal::DoFHandlerImplementation::Iterators; public: /** diff --git a/include/deal.II/dofs/dof_iterator_selector.h b/include/deal.II/dofs/dof_iterator_selector.h index 6fe09c553c..0894e289e1 100644 --- a/include/deal.II/dofs/dof_iterator_selector.h +++ b/include/deal.II/dofs/dof_iterator_selector.h @@ -31,6 +31,9 @@ class DoFAccessor; template class DoFCellAccessor; +template +class DoFHandler; + template class TriaRawIterator; template @@ -43,7 +46,7 @@ namespace internal { namespace DoFHandlerImplementation { - template + template struct Iterators; @@ -56,12 +59,11 @@ namespace internal * @ref Iterators * module for more information. */ - template