From e574e675a86bb72cf8e1da938d1591d028e34530 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 26 Aug 1998 09:28:36 +0000 Subject: [PATCH] Some reformatting. This was needed since otherwise kdoc didn't get the return type of the functions right if it was written on the previous line. git-svn-id: https://svn.dealii.org/trunk@524 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_handler.h | 66 +++++++----------- deal.II/deal.II/include/dofs/mg_dof_handler.h | 67 +++++++------------ .../include/multigrid/mg_dof_handler.h | 67 +++++++------------ 3 files changed, 71 insertions(+), 129 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index c8937443c5..5d32e8b88b 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -513,9 +513,9 @@ class DoFHandler : public DoFDimensionInfo { * See the general documentation of this * class for more details. */ - virtual void renumber_dofs (const RenumberingMethod method, - const bool use_constraints = false, - const vector &starting_points = vector()); + void renumber_dofs (const RenumberingMethod method, + const bool use_constraints = false, + const vector &starting_points = vector()); /** * Make up the constraint matrix which @@ -1028,22 +1028,19 @@ class DoFHandler : public DoFDimensionInfo { * has no lines, a past-the-end iterator * is returned. */ - raw_line_iterator - begin_raw_line (const unsigned int level = 0) const; + raw_line_iterator begin_raw_line (const unsigned int level = 0) const; /** * Return iterator to the first used line * on level #level#. */ - line_iterator - begin_line (const unsigned int level = 0) const; + line_iterator begin_line (const unsigned int level = 0) const; /** * Return iterator to the first active * line on level #level#. */ - active_line_iterator - begin_active_line(const unsigned int level = 0) const; + active_line_iterator begin_active_line(const unsigned int level = 0) const; /** * Return iterator past the end; this @@ -1051,8 +1048,7 @@ class DoFHandler : public DoFDimensionInfo { * iterators with past-the-end or * before-the-beginning states. */ - raw_line_iterator - end_line () const; + raw_line_iterator end_line () const; /** * Return an iterator which is the first @@ -1083,44 +1079,38 @@ class DoFHandler : public DoFDimensionInfo { * Return an iterator pointing to the * last line, used or not. */ - raw_line_iterator - last_raw_line () const; + raw_line_iterator last_raw_line () const; /** * Return an iterator pointing to the last * line of the level #level#, used or not. */ - raw_line_iterator - last_raw_line (const unsigned int level) const; + raw_line_iterator last_raw_line (const unsigned int level) const; /** * Return an iterator pointing to the last * used line. */ - line_iterator - last_line () const; + line_iterator last_line () const; /** * Return an iterator pointing to the last * used line on level #level#. */ - line_iterator - last_line (const unsigned int level) const; + line_iterator last_line (const unsigned int level) const; /** * Return an iterator pointing to the last * active line. */ - active_line_iterator - last_active_line () const; + active_line_iterator last_active_line () const; /** * Return an iterator pointing to the last * active line on level #level#. */ - active_line_iterator - last_active_line (const unsigned int level) const; + active_line_iterator last_active_line (const unsigned int level) const; /*@}*/ /*---------------------------------------*/ @@ -1135,22 +1125,19 @@ class DoFHandler : public DoFDimensionInfo { * has no quads, a past-the-end iterator * is returned. */ - raw_quad_iterator - begin_raw_quad (const unsigned int level = 0) const; + raw_quad_iterator begin_raw_quad (const unsigned int level = 0) const; /** * Return iterator to the first used quad * on level #level#. */ - quad_iterator - begin_quad (const unsigned int level = 0) const; + quad_iterator begin_quad (const unsigned int level = 0) const; /** * Return iterator to the first active * quad on level #level#. */ - active_quad_iterator - begin_active_quad(const unsigned int level = 0) const; + active_quad_iterator begin_active_quad(const unsigned int level = 0) const; /** * Return iterator past the end; this @@ -1158,8 +1145,7 @@ class DoFHandler : public DoFDimensionInfo { * iterators with past-the-end or * before-the-beginning states. */ - raw_quad_iterator - end_quad () const; + raw_quad_iterator end_quad () const; /** * Return an iterator which is the first @@ -1190,44 +1176,38 @@ class DoFHandler : public DoFDimensionInfo { * Return an iterator pointing to the * last quad, used or not. */ - raw_quad_iterator - last_raw_quad () const; + raw_quad_iterator last_raw_quad () const; /** * Return an iterator pointing to the last * quad of the level #level#, used or not. */ - raw_quad_iterator - last_raw_quad (const unsigned int level) const; + raw_quad_iterator last_raw_quad (const unsigned int level) const; /** * Return an iterator pointing to the last * used quad. */ - quad_iterator - last_quad () const; + quad_iterator last_quad () const; /** * Return an iterator pointing to the last * used quad on level #level#. */ - quad_iterator - last_quad (const unsigned int level) const; + quad_iterator last_quad (const unsigned int level) const; /** * Return an iterator pointing to the last * active quad. */ - active_quad_iterator - last_active_quad () const; + active_quad_iterator last_active_quad () const; /** * Return an iterator pointing to the last * active quad on level #level#. */ - active_quad_iterator - last_active_quad (const unsigned int level) const; + active_quad_iterator last_active_quad (const unsigned int level) const; /*@}*/ /*---------------------------------------*/ diff --git a/deal.II/deal.II/include/dofs/mg_dof_handler.h b/deal.II/deal.II/include/dofs/mg_dof_handler.h index 34840ddd18..eeeea98ecc 100644 --- a/deal.II/deal.II/include/dofs/mg_dof_handler.h +++ b/deal.II/deal.II/include/dofs/mg_dof_handler.h @@ -152,9 +152,10 @@ class MGDoFHandler : public DoFHandler { * See the general documentation of the * #DoFHandler# class for more details. */ - virtual void renumber_dofs (const RenumberingMethod method, - const bool use_constraints = false, - const vector &starting_points = vector()); + void renumber_dofs (const unsigned int level, + const RenumberingMethod method, + const bool use_constraints = false, + const vector &starting_points = vector()); /** * Write the sparsity structure of the @@ -440,22 +441,19 @@ class MGDoFHandler : public DoFHandler { * has no lines, a past-the-end iterator * is returned. */ - raw_line_iterator - begin_raw_line (const unsigned int level = 0) const; + raw_line_iterator begin_raw_line (const unsigned int level = 0) const; /** * Return iterator to the first used line * on level #level#. */ - line_iterator - begin_line (const unsigned int level = 0) const; + line_iterator begin_line (const unsigned int level = 0) const; /** * Return iterator to the first active * line on level #level#. */ - active_line_iterator - begin_active_line(const unsigned int level = 0) const; + active_line_iterator begin_active_line(const unsigned int level = 0) const; /** * Return iterator past the end; this @@ -463,8 +461,7 @@ class MGDoFHandler : public DoFHandler { * iterators with past-the-end or * before-the-beginning states. */ - raw_line_iterator - end_line () const; + raw_line_iterator end_line () const; /** * Return an iterator which is the first @@ -495,44 +492,38 @@ class MGDoFHandler : public DoFHandler { * Return an iterator pointing to the * last line, used or not. */ - raw_line_iterator - last_raw_line () const; + raw_line_iterator last_raw_line () const; /** * Return an iterator pointing to the last * line of the level #level#, used or not. */ - raw_line_iterator - last_raw_line (const unsigned int level) const; + raw_line_iterator last_raw_line (const unsigned int level) const; /** * Return an iterator pointing to the last * used line. */ - line_iterator - last_line () const; + line_iterator last_line () const; /** * Return an iterator pointing to the last * used line on level #level#. */ - line_iterator - last_line (const unsigned int level) const; + line_iterator last_line (const unsigned int level) const; /** * Return an iterator pointing to the last * active line. */ - active_line_iterator - last_active_line () const; + active_line_iterator last_active_line () const; /** * Return an iterator pointing to the last * active line on level #level#. */ - active_line_iterator - last_active_line (const unsigned int level) const; + active_line_iterator last_active_line (const unsigned int level) const; /*@}*/ /*---------------------------------------*/ @@ -547,22 +538,19 @@ class MGDoFHandler : public DoFHandler { * has no quads, a past-the-end iterator * is returned. */ - raw_quad_iterator - begin_raw_quad (const unsigned int level = 0) const; + raw_quad_iterator begin_raw_quad (const unsigned int level = 0) const; /** * Return iterator to the first used quad * on level #level#. */ - quad_iterator - begin_quad (const unsigned int level = 0) const; + quad_iterator begin_quad (const unsigned int level = 0) const; /** * Return iterator to the first active * quad on level #level#. */ - active_quad_iterator - begin_active_quad(const unsigned int level = 0) const; + active_quad_iterator begin_active_quad(const unsigned int level = 0) const; /** * Return iterator past the end; this @@ -570,8 +558,7 @@ class MGDoFHandler : public DoFHandler { * iterators with past-the-end or * before-the-beginning states. */ - raw_quad_iterator - end_quad () const; + raw_quad_iterator end_quad () const; /** * Return an iterator which is the first @@ -602,44 +589,38 @@ class MGDoFHandler : public DoFHandler { * Return an iterator pointing to the * last quad, used or not. */ - raw_quad_iterator - last_raw_quad () const; + raw_quad_iterator last_raw_quad () const; /** * Return an iterator pointing to the last * quad of the level #level#, used or not. */ - raw_quad_iterator - last_raw_quad (const unsigned int level) const; + raw_quad_iterator last_raw_quad (const unsigned int level) const; /** * Return an iterator pointing to the last * used quad. */ - quad_iterator - last_quad () const; + quad_iterator last_quad () const; /** * Return an iterator pointing to the last * used quad on level #level#. */ - quad_iterator - last_quad (const unsigned int level) const; + quad_iterator last_quad (const unsigned int level) const; /** * Return an iterator pointing to the last * active quad. */ - active_quad_iterator - last_active_quad () const; + active_quad_iterator last_active_quad () const; /** * Return an iterator pointing to the last * active quad on level #level#. */ - active_quad_iterator - last_active_quad (const unsigned int level) const; + active_quad_iterator last_active_quad (const unsigned int level) const; /*@}*/ /*---------------------------------------*/ diff --git a/deal.II/deal.II/include/multigrid/mg_dof_handler.h b/deal.II/deal.II/include/multigrid/mg_dof_handler.h index 34840ddd18..eeeea98ecc 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_handler.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_handler.h @@ -152,9 +152,10 @@ class MGDoFHandler : public DoFHandler { * See the general documentation of the * #DoFHandler# class for more details. */ - virtual void renumber_dofs (const RenumberingMethod method, - const bool use_constraints = false, - const vector &starting_points = vector()); + void renumber_dofs (const unsigned int level, + const RenumberingMethod method, + const bool use_constraints = false, + const vector &starting_points = vector()); /** * Write the sparsity structure of the @@ -440,22 +441,19 @@ class MGDoFHandler : public DoFHandler { * has no lines, a past-the-end iterator * is returned. */ - raw_line_iterator - begin_raw_line (const unsigned int level = 0) const; + raw_line_iterator begin_raw_line (const unsigned int level = 0) const; /** * Return iterator to the first used line * on level #level#. */ - line_iterator - begin_line (const unsigned int level = 0) const; + line_iterator begin_line (const unsigned int level = 0) const; /** * Return iterator to the first active * line on level #level#. */ - active_line_iterator - begin_active_line(const unsigned int level = 0) const; + active_line_iterator begin_active_line(const unsigned int level = 0) const; /** * Return iterator past the end; this @@ -463,8 +461,7 @@ class MGDoFHandler : public DoFHandler { * iterators with past-the-end or * before-the-beginning states. */ - raw_line_iterator - end_line () const; + raw_line_iterator end_line () const; /** * Return an iterator which is the first @@ -495,44 +492,38 @@ class MGDoFHandler : public DoFHandler { * Return an iterator pointing to the * last line, used or not. */ - raw_line_iterator - last_raw_line () const; + raw_line_iterator last_raw_line () const; /** * Return an iterator pointing to the last * line of the level #level#, used or not. */ - raw_line_iterator - last_raw_line (const unsigned int level) const; + raw_line_iterator last_raw_line (const unsigned int level) const; /** * Return an iterator pointing to the last * used line. */ - line_iterator - last_line () const; + line_iterator last_line () const; /** * Return an iterator pointing to the last * used line on level #level#. */ - line_iterator - last_line (const unsigned int level) const; + line_iterator last_line (const unsigned int level) const; /** * Return an iterator pointing to the last * active line. */ - active_line_iterator - last_active_line () const; + active_line_iterator last_active_line () const; /** * Return an iterator pointing to the last * active line on level #level#. */ - active_line_iterator - last_active_line (const unsigned int level) const; + active_line_iterator last_active_line (const unsigned int level) const; /*@}*/ /*---------------------------------------*/ @@ -547,22 +538,19 @@ class MGDoFHandler : public DoFHandler { * has no quads, a past-the-end iterator * is returned. */ - raw_quad_iterator - begin_raw_quad (const unsigned int level = 0) const; + raw_quad_iterator begin_raw_quad (const unsigned int level = 0) const; /** * Return iterator to the first used quad * on level #level#. */ - quad_iterator - begin_quad (const unsigned int level = 0) const; + quad_iterator begin_quad (const unsigned int level = 0) const; /** * Return iterator to the first active * quad on level #level#. */ - active_quad_iterator - begin_active_quad(const unsigned int level = 0) const; + active_quad_iterator begin_active_quad(const unsigned int level = 0) const; /** * Return iterator past the end; this @@ -570,8 +558,7 @@ class MGDoFHandler : public DoFHandler { * iterators with past-the-end or * before-the-beginning states. */ - raw_quad_iterator - end_quad () const; + raw_quad_iterator end_quad () const; /** * Return an iterator which is the first @@ -602,44 +589,38 @@ class MGDoFHandler : public DoFHandler { * Return an iterator pointing to the * last quad, used or not. */ - raw_quad_iterator - last_raw_quad () const; + raw_quad_iterator last_raw_quad () const; /** * Return an iterator pointing to the last * quad of the level #level#, used or not. */ - raw_quad_iterator - last_raw_quad (const unsigned int level) const; + raw_quad_iterator last_raw_quad (const unsigned int level) const; /** * Return an iterator pointing to the last * used quad. */ - quad_iterator - last_quad () const; + quad_iterator last_quad () const; /** * Return an iterator pointing to the last * used quad on level #level#. */ - quad_iterator - last_quad (const unsigned int level) const; + quad_iterator last_quad (const unsigned int level) const; /** * Return an iterator pointing to the last * active quad. */ - active_quad_iterator - last_active_quad () const; + active_quad_iterator last_active_quad () const; /** * Return an iterator pointing to the last * active quad on level #level#. */ - active_quad_iterator - last_active_quad (const unsigned int level) const; + active_quad_iterator last_active_quad (const unsigned int level) const; /*@}*/ /*---------------------------------------*/ -- 2.39.5