From 18fcfb92406a8773e94e9ed1013c01e5088415a3 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 13 Dec 1999 15:37:11 +0000 Subject: [PATCH] Make things simpler for out documentation tools. git-svn-id: https://svn.dealii.org/trunk@2052 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/logstream.h | 2 +- .../include/dofs/dof_accessor.templates.h | 64 ++++---- deal.II/deal.II/include/grid/tria_accessor.h | 2 +- .../include/grid/tria_accessor.templates.h | 138 +++++++++--------- deal.II/deal.II/include/multigrid/mg_base.h | 4 +- deal.II/lac/include/lac/block_vector.h | 68 ++++----- .../lac/include/lac/block_vector.templates.h | 98 ++++++------- deal.II/lac/include/lac/mgbase.h | 4 +- deal.II/lac/include/lac/precondition.h | 28 ++-- deal.II/lac/include/lac/precondition_block.h | 2 +- .../lac/precondition_block.templates.h | 22 +-- .../lac/include/lac/precondition_selector.h | 12 +- 12 files changed, 225 insertions(+), 219 deletions(-) diff --git a/deal.II/base/include/base/logstream.h b/deal.II/base/include/base/logstream.h index 3eeb490e18..14cc58019f 100644 --- a/deal.II/base/include/base/logstream.h +++ b/deal.II/base/include/base/logstream.h @@ -163,7 +163,7 @@ class LogStream */ template LogStream & operator << (const T &t); - + /** * Output a function. This really is not * to output the function, but calls the 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 0ecbae29e5..161b79d683 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -23,7 +23,7 @@ template inline -int DoFObjectAccessor<1, dim>::dof_index (const unsigned int i) const { +int DoFObjectAccessor<1,dim>::dof_index (const unsigned int i) const { Assert (dof_handler != 0, ExcInvalidObject()); // make sure a FE has been selected // and enough room was reserved @@ -40,7 +40,7 @@ int DoFObjectAccessor<1, dim>::dof_index (const unsigned int i) const { template inline -int DoFObjectAccessor<1, dim>::vertex_dof_index (const unsigned int vertex, +int DoFObjectAccessor<1,dim>::vertex_dof_index (const unsigned int vertex, const unsigned int i) const { Assert (dof_handler != 0, ExcInvalidObject()); Assert (dof_handler->selected_fe != 0, ExcInvalidObject()); @@ -59,7 +59,7 @@ int DoFObjectAccessor<1, dim>::vertex_dof_index (const unsigned int vertex, template inline void -DoFObjectAccessor<1, dim>::get_dof_indices (vector &dof_indices) const { +DoFObjectAccessor<1,dim>::get_dof_indices (vector &dof_indices) const { Assert (dof_handler != 0, ExcInvalidObject()); Assert (dof_handler->selected_fe != 0, ExcInvalidObject()); Assert (dof_indices.size() == (2*dof_handler->get_fe().dofs_per_vertex + @@ -80,9 +80,9 @@ DoFObjectAccessor<1, dim>::get_dof_indices (vector &dof_indices) const { template inline -TriaIterator > -DoFObjectAccessor<1, dim>::child (const unsigned int i) const { - TriaIterator > q (tria, +TriaIterator > +DoFObjectAccessor<1,dim>::child (const unsigned int i) const { + TriaIterator > q (tria, present_level+1, child_index (i), dof_handler); @@ -99,7 +99,7 @@ DoFObjectAccessor<1, dim>::child (const unsigned int i) const { template inline void -DoFObjectAccessor<1, dim>::copy_from (const DoFObjectAccessor<1, dim> &a) { +DoFObjectAccessor<1,dim>::copy_from (const DoFObjectAccessor<1,dim> &a) { BaseClass::copy_from (a); set_dof_handler (a.dof_handler); }; @@ -107,11 +107,11 @@ DoFObjectAccessor<1, dim>::copy_from (const DoFObjectAccessor<1, dim> &a) { -/*------------------------- Functions: DoFObjectAccessor<2, dim> -----------------------*/ +/*------------------------- Functions: DoFObjectAccessor<2,dim> -----------------------*/ template inline -int DoFObjectAccessor<2, dim>::dof_index (const unsigned int i) const { +int DoFObjectAccessor<2,dim>::dof_index (const unsigned int i) const { Assert (dof_handler != 0, ExcInvalidObject()); // make sure a FE has been selected // and enough room was reserved @@ -127,7 +127,7 @@ int DoFObjectAccessor<2, dim>::dof_index (const unsigned int i) const { template inline -int DoFObjectAccessor<2, dim>::vertex_dof_index (const unsigned int vertex, +int DoFObjectAccessor<2,dim>::vertex_dof_index (const unsigned int vertex, const unsigned int i) const { Assert (dof_handler != 0, ExcInvalidObject()); Assert (dof_handler->selected_fe != 0, ExcInvalidObject()); @@ -146,7 +146,7 @@ int DoFObjectAccessor<2, dim>::vertex_dof_index (const unsigned int vertex, template inline void -DoFObjectAccessor<2, dim>::get_dof_indices (vector &dof_indices) const { +DoFObjectAccessor<2,dim>::get_dof_indices (vector &dof_indices) const { Assert (dof_handler != 0, ExcInvalidObject()); Assert (dof_handler->selected_fe != 0, ExcInvalidObject()); Assert (dof_indices.size() == (4*dof_handler->get_fe().dofs_per_vertex + @@ -172,11 +172,11 @@ DoFObjectAccessor<2, dim>::get_dof_indices (vector &dof_indices) const { template inline -TriaIterator > -DoFObjectAccessor<2, dim>::line (const unsigned int i) const { +TriaIterator > +DoFObjectAccessor<2,dim>::line (const unsigned int i) const { Assert (i<4, ExcIndexRange (i, 0, 4)); - return TriaIterator > + return TriaIterator > ( tria, present_level, @@ -189,9 +189,9 @@ DoFObjectAccessor<2, dim>::line (const unsigned int i) const { template inline -TriaIterator > -DoFObjectAccessor<2, dim>::child (const unsigned int i) const { - TriaIterator > q (tria, +TriaIterator > +DoFObjectAccessor<2,dim>::child (const unsigned int i) const { + TriaIterator > q (tria, present_level+1, child_index (i), dof_handler); @@ -208,7 +208,7 @@ DoFObjectAccessor<2, dim>::child (const unsigned int i) const { template inline void -DoFObjectAccessor<2, dim>::copy_from (const DoFObjectAccessor<2, dim> &a) { +DoFObjectAccessor<2,dim>::copy_from (const DoFObjectAccessor<2,dim> &a) { BaseClass::copy_from (a); set_dof_handler (a.dof_handler); }; @@ -221,7 +221,7 @@ DoFObjectAccessor<2, dim>::copy_from (const DoFObjectAccessor<2, dim> &a) { template inline -int DoFObjectAccessor<3, dim>::dof_index (const unsigned int i) const { +int DoFObjectAccessor<3,dim>::dof_index (const unsigned int i) const { Assert (dof_handler != 0, ExcInvalidObject()); // make sure a FE has been selected // and enough room was reserved @@ -237,7 +237,7 @@ int DoFObjectAccessor<3, dim>::dof_index (const unsigned int i) const { template inline -int DoFObjectAccessor<3, dim>::vertex_dof_index (const unsigned int vertex, +int DoFObjectAccessor<3,dim>::vertex_dof_index (const unsigned int vertex, const unsigned int i) const { Assert (dof_handler != 0, ExcInvalidObject()); Assert (dof_handler->selected_fe != 0, ExcInvalidObject()); @@ -256,7 +256,7 @@ int DoFObjectAccessor<3, dim>::vertex_dof_index (const unsigned int vertex, template inline void -DoFObjectAccessor<3, dim>::get_dof_indices (vector &dof_indices) const { +DoFObjectAccessor<3,dim>::get_dof_indices (vector &dof_indices) const { Assert (dof_handler != 0, ExcInvalidObject()); Assert (dof_handler->selected_fe != 0, ExcInvalidObject()); Assert (dof_indices.size() == (8*dof_handler->get_fe().dofs_per_vertex + @@ -287,10 +287,10 @@ DoFObjectAccessor<3, dim>::get_dof_indices (vector &dof_indices) const { template inline -TriaIterator > -DoFObjectAccessor<3, dim>::line (const unsigned int i) const { - TriaIterator > l = BaseClass::line(i); - return TriaIterator > +TriaIterator > +DoFObjectAccessor<3,dim>::line (const unsigned int i) const { + TriaIterator > l = BaseClass::line(i); + return TriaIterator > ( tria, present_level, @@ -303,11 +303,11 @@ DoFObjectAccessor<3, dim>::line (const unsigned int i) const { template inline -TriaIterator > -DoFObjectAccessor<3, dim>::quad (const unsigned int i) const { +TriaIterator > +DoFObjectAccessor<3,dim>::quad (const unsigned int i) const { Assert (i<6, ExcIndexRange (i, 0, 6)); - return TriaIterator > + return TriaIterator > ( tria, present_level, @@ -320,9 +320,9 @@ DoFObjectAccessor<3, dim>::quad (const unsigned int i) const { template inline -TriaIterator > -DoFObjectAccessor<3, dim>::child (const unsigned int i) const { - TriaIterator > q (tria, +TriaIterator > +DoFObjectAccessor<3,dim>::child (const unsigned int i) const { + TriaIterator > q (tria, present_level+1, child_index (i), dof_handler); @@ -337,7 +337,7 @@ DoFObjectAccessor<3, dim>::child (const unsigned int i) const { template -void DoFObjectAccessor<3, dim>::copy_from (const DoFObjectAccessor<3, dim> &a) { +void DoFObjectAccessor<3,dim>::copy_from (const DoFObjectAccessor<3,dim> &a) { BaseClass::copy_from (a); set_dof_handler (a.dof_handler); }; diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index e3bf65f933..6d87bb6143 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -408,7 +408,7 @@ class TriaObjectAccessor : public TriaAccessor * Pointer to the #i#th * child. */ - TriaIterator > + TriaIterator > child (const unsigned int i) const; /** diff --git a/deal.II/deal.II/include/grid/tria_accessor.templates.h b/deal.II/deal.II/include/grid/tria_accessor.templates.h index f1f5dcec9e..d36f8cea2d 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.templates.h +++ b/deal.II/deal.II/include/grid/tria_accessor.templates.h @@ -102,7 +102,7 @@ TriaAccessor::get_triangulation () const template inline bool -TriaObjectAccessor<1, dim>::used () const { +TriaObjectAccessor<1,dim>::used () const { Assert (state() == valid, ExcDereferenceInvalidObject()); return tria->levels[present_level]->lines.used[present_index]; }; @@ -113,7 +113,7 @@ TriaObjectAccessor<1, dim>::used () const { template inline bool -TriaObjectAccessor<1, dim>::user_flag_set () const { +TriaObjectAccessor<1,dim>::user_flag_set () const { Assert (used(), ExcCellNotUsed()); return tria->levels[present_level]->lines.user_flags[present_index]; }; @@ -123,7 +123,7 @@ TriaObjectAccessor<1, dim>::user_flag_set () const { template inline void -TriaObjectAccessor<1, dim>::set_user_flag () const { +TriaObjectAccessor<1,dim>::set_user_flag () const { Assert (used(), ExcCellNotUsed()); tria->levels[present_level]->lines.user_flags[present_index] = true; }; @@ -133,7 +133,7 @@ TriaObjectAccessor<1, dim>::set_user_flag () const { template inline void -TriaObjectAccessor<1, dim>::clear_user_flag () const { +TriaObjectAccessor<1,dim>::clear_user_flag () const { Assert (used(), ExcCellNotUsed()); tria->levels[present_level]->lines.user_flags[present_index] = false; }; @@ -143,11 +143,11 @@ TriaObjectAccessor<1, dim>::clear_user_flag () const { template inline -TriaIterator > -TriaObjectAccessor<1, dim>::child (const unsigned int i) const { +TriaIterator > +TriaObjectAccessor<1,dim>::child (const unsigned int i) const { Assert (i<2, ExcIndexRange(i,0,2)); - TriaIterator > q (tria, present_level+1, child_index (i)); + TriaIterator > q (tria, present_level+1, child_index (i)); #ifdef DEBUG if (q.state() != past_the_end) @@ -161,7 +161,7 @@ TriaObjectAccessor<1, dim>::child (const unsigned int i) const { template inline int -TriaObjectAccessor<1, dim>::child_index (unsigned int i) const { +TriaObjectAccessor<1,dim>::child_index (unsigned int i) const { Assert (i<2, ExcIndexRange(i,0,2)); return tria->levels[present_level]->lines.children[present_index]+i; }; @@ -172,7 +172,7 @@ TriaObjectAccessor<1, dim>::child_index (unsigned int i) const { template inline bool -TriaObjectAccessor<1, dim>::has_children () const { +TriaObjectAccessor<1,dim>::has_children () const { Assert (state() == valid, ExcDereferenceInvalidObject()); return (tria->levels[present_level]->lines.children[present_index] != -1); } @@ -182,7 +182,7 @@ TriaObjectAccessor<1, dim>::has_children () const { template inline unsigned int -TriaObjectAccessor<1, dim>::max_refinement_depth () const +TriaObjectAccessor<1,dim>::max_refinement_depth () const { if (!has_children()) return 0; @@ -198,7 +198,7 @@ TriaObjectAccessor<1, dim>::max_refinement_depth () const template inline void -TriaObjectAccessor<1, dim>::operator ++ () { +TriaObjectAccessor<1,dim>::operator ++ () { ++present_index; // is index still in the range of // the vector? @@ -225,7 +225,7 @@ TriaObjectAccessor<1, dim>::operator ++ () { template inline void -TriaObjectAccessor<1, dim>::operator -- () { +TriaObjectAccessor<1,dim>::operator -- () { --present_index; // is index still in the range of // the vector? @@ -255,7 +255,7 @@ TriaObjectAccessor<1, dim>::operator -- () { template inline bool -TriaObjectAccessor<2, dim>::used () const { +TriaObjectAccessor<2,dim>::used () const { Assert (state() == valid, ExcDereferenceInvalidObject()); return tria->levels[present_level]->quads.used[present_index]; }; @@ -266,7 +266,7 @@ TriaObjectAccessor<2, dim>::used () const { template inline bool -TriaObjectAccessor<2, dim>::user_flag_set () const { +TriaObjectAccessor<2,dim>::user_flag_set () const { Assert (used(), ExcCellNotUsed()); return tria->levels[present_level]->quads.user_flags[present_index]; }; @@ -276,7 +276,7 @@ TriaObjectAccessor<2, dim>::user_flag_set () const { template inline void -TriaObjectAccessor<2, dim>::set_user_flag () const { +TriaObjectAccessor<2,dim>::set_user_flag () const { Assert (used(), ExcCellNotUsed()); tria->levels[present_level]->quads.user_flags[present_index] = true; }; @@ -286,7 +286,7 @@ TriaObjectAccessor<2, dim>::set_user_flag () const { template inline void -TriaObjectAccessor<2, dim>::clear_user_flag () const { +TriaObjectAccessor<2,dim>::clear_user_flag () const { Assert (used(), ExcCellNotUsed()); tria->levels[present_level]->quads.user_flags[present_index] = false; }; @@ -296,10 +296,10 @@ TriaObjectAccessor<2, dim>::clear_user_flag () const { template inline -TriaIterator > -TriaObjectAccessor<2, dim>::line (const unsigned int i) const { +TriaIterator > +TriaObjectAccessor<2,dim>::line (const unsigned int i) const { return - TriaIterator > + TriaIterator > ( tria, present_level, @@ -312,7 +312,7 @@ TriaObjectAccessor<2, dim>::line (const unsigned int i) const { template inline unsigned int -TriaObjectAccessor<2, dim>::line_index (unsigned int i) const { +TriaObjectAccessor<2,dim>::line_index (unsigned int i) const { Assert (i<4, ExcIndexRange(i,0,4)); return tria->levels[present_level]->quads.quads[present_index].line(i); @@ -322,11 +322,11 @@ TriaObjectAccessor<2, dim>::line_index (unsigned int i) const { template inline -TriaIterator > -TriaObjectAccessor<2, dim>::child (const unsigned int i) const { +TriaIterator > +TriaObjectAccessor<2,dim>::child (const unsigned int i) const { Assert (i<4, ExcIndexRange(i,0,4)); - TriaIterator > q (tria, present_level+1, child_index (i)); + TriaIterator > q (tria, present_level+1, child_index (i)); #ifdef DEBUG if (q.state() != past_the_end) @@ -339,7 +339,7 @@ TriaObjectAccessor<2, dim>::child (const unsigned int i) const { template inline -int TriaObjectAccessor<2, dim>::child_index (unsigned int i) const { +int TriaObjectAccessor<2,dim>::child_index (unsigned int i) const { Assert (i<4, ExcIndexRange(i,0,4)); return tria->levels[present_level]->quads.children[present_index]+i; }; @@ -350,7 +350,7 @@ int TriaObjectAccessor<2, dim>::child_index (unsigned int i) const { template inline bool -TriaObjectAccessor<2, dim>::has_children () const { +TriaObjectAccessor<2,dim>::has_children () const { Assert (state() == valid, ExcDereferenceInvalidObject()); return (tria->levels[present_level]->quads.children[present_index] != -1); }; @@ -360,7 +360,7 @@ TriaObjectAccessor<2, dim>::has_children () const { template inline unsigned int -TriaObjectAccessor<2, dim>::max_refinement_depth () const +TriaObjectAccessor<2,dim>::max_refinement_depth () const { if (!has_children()) return 0; @@ -378,7 +378,7 @@ TriaObjectAccessor<2, dim>::max_refinement_depth () const template inline void -TriaObjectAccessor<2, dim>::operator ++ () { +TriaObjectAccessor<2,dim>::operator ++ () { ++present_index; // is index still in the range of // the vector? @@ -404,7 +404,7 @@ TriaObjectAccessor<2, dim>::operator ++ () { template inline void -TriaObjectAccessor<2, dim>::operator -- () { +TriaObjectAccessor<2,dim>::operator -- () { --present_index; // is index still in the range of // the vector? @@ -434,7 +434,7 @@ TriaObjectAccessor<2, dim>::operator -- () { template inline bool -TriaObjectAccessor<3, dim>::used () const { +TriaObjectAccessor<3,dim>::used () const { Assert (state() == valid, ExcDereferenceInvalidObject()); return tria->levels[present_level]->hexes.used[present_index]; }; @@ -444,7 +444,7 @@ TriaObjectAccessor<3, dim>::used () const { template inline bool -TriaObjectAccessor<3, dim>::user_flag_set () const { +TriaObjectAccessor<3,dim>::user_flag_set () const { Assert (used(), ExcCellNotUsed()); return tria->levels[present_level]->hexes.user_flags[present_index]; }; @@ -454,7 +454,7 @@ TriaObjectAccessor<3, dim>::user_flag_set () const { template inline void -TriaObjectAccessor<3, dim>::set_user_flag () const { +TriaObjectAccessor<3,dim>::set_user_flag () const { Assert (used(), ExcCellNotUsed()); tria->levels[present_level]->hexes.user_flags[present_index] = true; }; @@ -463,7 +463,7 @@ TriaObjectAccessor<3, dim>::set_user_flag () const { template inline -void TriaObjectAccessor<3, dim>::clear_user_flag () const { +void TriaObjectAccessor<3,dim>::clear_user_flag () const { Assert (used(), ExcCellNotUsed()); tria->levels[present_level]->hexes.user_flags[present_index] = false; }; @@ -473,8 +473,8 @@ void TriaObjectAccessor<3, dim>::clear_user_flag () const { template inline -TriaIterator > -TriaObjectAccessor<3, dim>::line (const unsigned int i) const { +TriaIterator > +TriaObjectAccessor<3,dim>::line (const unsigned int i) const { Assert (used(), ExcCellNotUsed()); Assert (i<12, ExcIndexRange (i,0,12)); @@ -504,18 +504,18 @@ TriaObjectAccessor<3, dim>::line (const unsigned int i) const { return this->quad(4)->line(3); }; Assert (false, ExcIndexRange(i,0,12)); - return TriaIterator >(tria, -1, -1, 0); + return TriaIterator >(tria, -1, -1, 0); }; template inline -TriaIterator > -TriaObjectAccessor<3, dim>::quad (const unsigned int i) const { +TriaIterator > +TriaObjectAccessor<3,dim>::quad (const unsigned int i) const { Assert (used(), ExcCellNotUsed()); return - TriaIterator > + TriaIterator > ( tria, present_level, @@ -528,7 +528,7 @@ TriaObjectAccessor<3, dim>::quad (const unsigned int i) const { template inline unsigned int -TriaObjectAccessor<3, dim>::line_index (unsigned int i) const { +TriaObjectAccessor<3,dim>::line_index (unsigned int i) const { Assert (i<12, ExcIndexRange(i,0,12)); if (i<4) @@ -557,7 +557,7 @@ TriaObjectAccessor<3, dim>::line_index (unsigned int i) const { template inline unsigned int -TriaObjectAccessor<3, dim>::quad_index (unsigned int i) const { +TriaObjectAccessor<3,dim>::quad_index (unsigned int i) const { Assert (i<6, ExcIndexRange(i,0,6)); return tria->levels[present_level]->hexes.hexes[present_index].quad(i); @@ -567,11 +567,11 @@ TriaObjectAccessor<3, dim>::quad_index (unsigned int i) const { template inline -TriaIterator > -TriaObjectAccessor<3, dim>::child (const unsigned int i) const { +TriaIterator > +TriaObjectAccessor<3,dim>::child (const unsigned int i) const { Assert (i<6, ExcIndexRange(i,0,6)); - TriaIterator > q (tria, present_level+1, child_index (i)); + TriaIterator > q (tria, present_level+1, child_index (i)); #ifdef DEBUG if (q.state() != past_the_end) @@ -584,7 +584,7 @@ TriaObjectAccessor<3, dim>::child (const unsigned int i) const { template inline -int TriaObjectAccessor<3, dim>::child_index (unsigned int i) const { +int TriaObjectAccessor<3,dim>::child_index (unsigned int i) const { Assert (i<8, ExcIndexRange(i,0,8)); return tria->levels[present_level]->hexes.children[present_index]+i; }; @@ -592,7 +592,7 @@ int TriaObjectAccessor<3, dim>::child_index (unsigned int i) const { template -bool TriaObjectAccessor<3, dim>::has_children () const { +bool TriaObjectAccessor<3,dim>::has_children () const { Assert (state() == valid, ExcDereferenceInvalidObject()); return (tria->levels[present_level]->hexes.children[present_index] != -1); }; @@ -602,7 +602,7 @@ bool TriaObjectAccessor<3, dim>::has_children () const { template inline unsigned int -TriaObjectAccessor<3, dim>::max_refinement_depth () const +TriaObjectAccessor<3,dim>::max_refinement_depth () const { if (!has_children()) return 0; @@ -626,7 +626,7 @@ TriaObjectAccessor<3, dim>::max_refinement_depth () const template inline void -TriaObjectAccessor<3, dim>::operator ++ () { +TriaObjectAccessor<3,dim>::operator ++ () { ++present_index; // is index still in the range of // the vector? @@ -652,7 +652,7 @@ TriaObjectAccessor<3, dim>::operator ++ () { template inline void -TriaObjectAccessor<3, dim>::operator -- () { +TriaObjectAccessor<3,dim>::operator -- () { --present_index; // is index still in the range of // the vector? @@ -682,7 +682,7 @@ TriaObjectAccessor<3, dim>::operator -- () { template inline bool -TriaObjectAccessor::used () const +TriaObjectAccessor::used () const { Assert (state() == valid, ExcDereferenceInvalidObject()); return tria->levels[present_level]->hexes.used[present_index]; @@ -693,7 +693,7 @@ TriaObjectAccessor::used () const template inline bool -TriaObjectAccessor::user_flag_set () const +TriaObjectAccessor::user_flag_set () const { Assert (used(), ExcCellNotUsed()); return tria->levels[present_level]->hexes.user_flags[present_index]; @@ -704,7 +704,7 @@ TriaObjectAccessor::user_flag_set () const template inline void -TriaObjectAccessor::set_user_flag () const +TriaObjectAccessor::set_user_flag () const { Assert (used(), ExcCellNotUsed()); tria->levels[present_level]->hexes.user_flags[present_index] = true; @@ -714,7 +714,7 @@ TriaObjectAccessor::set_user_flag () const template inline -void TriaObjectAccessor::clear_user_flag () const +void TriaObjectAccessor::clear_user_flag () const { Assert (used(), ExcCellNotUsed()); tria->levels[present_level]->hexes.user_flags[present_index] = false; @@ -725,8 +725,8 @@ void TriaObjectAccessor::clear_user_flag () const template inline -TriaIterator > -TriaObjectAccessor::line (const unsigned int i) const +TriaIterator > +TriaObjectAccessor::line (const unsigned int i) const { Assert (used(), ExcCellNotUsed()); Assert (i < GeometryInfo::lines_per_cell, @@ -736,7 +736,7 @@ TriaObjectAccessor::line (const unsigned int i) const { case 2: return - TriaIterator > + TriaIterator > ( tria, present_level, @@ -765,21 +765,21 @@ TriaObjectAccessor::line (const unsigned int i) const Assert(false, ExcNotImplemented()); } - return TriaIterator >(tria, -1, -1, 0); + return TriaIterator >(tria, -1, -1, 0); }; template inline -TriaIterator > -TriaObjectAccessor::quad (const unsigned int i) const +TriaIterator > +TriaObjectAccessor::quad (const unsigned int i) const { Assert (used(), ExcCellNotUsed()); Assert (i < GeometryInfo::quads_per_cell, ExcIndexRange(i,0,GeometryInfo::quads_per_cell)); return - TriaIterator > + TriaIterator > ( tria, present_level, @@ -792,7 +792,7 @@ TriaObjectAccessor::quad (const unsigned int i) const template inline unsigned int -TriaObjectAccessor::line_index (unsigned int i) const +TriaObjectAccessor::line_index (unsigned int i) const { Assert (i < GeometryInfo::lines_per_cell, ExcIndexRange(i,0,GeometryInfo::lines_per_cell)); @@ -832,7 +832,7 @@ TriaObjectAccessor::line_index (unsigned int i) const template inline unsigned int -TriaObjectAccessor::quad_index (unsigned int i) const +TriaObjectAccessor::quad_index (unsigned int i) const { Assert (i < GeometryInfo::quads_per_cell, ExcIndexRange(i,0,GeometryInfo::quads_per_cell)); @@ -844,13 +844,13 @@ TriaObjectAccessor::quad_index (unsigned int i) const template inline -TriaIterator > -TriaObjectAccessor::child (const unsigned int i) const +TriaIterator > +TriaObjectAccessor::child (const unsigned int i) const { Assert (i < GeometryInfo::children_per_cell, ExcIndexRange(i,0,GeometryInfo::children_per_cell)); - TriaIterator > q (tria, present_level+1, child_index (i)); + TriaIterator > q (tria, present_level+1, child_index (i)); #ifdef DEBUG if (q.state() != past_the_end) @@ -863,7 +863,7 @@ TriaObjectAccessor::child (const unsigned int i) const template inline -int TriaObjectAccessor::child_index (unsigned int i) const +int TriaObjectAccessor::child_index (unsigned int i) const { Assert (i < GeometryInfo::children_per_cell, ExcIndexRange(i,0,GeometryInfo::children_per_cell)); @@ -873,7 +873,7 @@ int TriaObjectAccessor::child_index (unsigned int i) const template -bool TriaObjectAccessor::has_children () const +bool TriaObjectAccessor::has_children () const { Assert (state() == valid, ExcDereferenceInvalidObject()); return (tria->levels[present_level]->hexes.children[present_index] != -1); @@ -884,7 +884,7 @@ bool TriaObjectAccessor::has_children () const template inline unsigned int -TriaObjectAccessor::max_refinement_depth () const +TriaObjectAccessor::max_refinement_depth () const { if (!has_children()) return 0; @@ -908,7 +908,7 @@ TriaObjectAccessor::max_refinement_depth () const template inline void -TriaObjectAccessor::operator ++ () { +TriaObjectAccessor::operator ++ () { ++present_index; // is index still in the range of // the vector? @@ -934,7 +934,7 @@ TriaObjectAccessor::operator ++ () { template inline void -TriaObjectAccessor::operator -- () +TriaObjectAccessor::operator -- () { --present_index; // is index still in the range of diff --git a/deal.II/deal.II/include/multigrid/mg_base.h b/deal.II/deal.II/include/multigrid/mg_base.h index baea5b2fec..3e92c8a903 100644 --- a/deal.II/deal.II/include/multigrid/mg_base.h +++ b/deal.II/deal.II/include/multigrid/mg_base.h @@ -625,7 +625,7 @@ MGMatrix::operator[](unsigned int i) const template -MGCoarseGridLACIteration:: +MGCoarseGridLACIteration:: MGCoarseGridLACIteration(SOLVER &s, const MATRIX &m, const PRECOND &p) @@ -639,7 +639,7 @@ MGCoarseGridLACIteration(SOLVER &s, template void -MGCoarseGridLACIteration:: +MGCoarseGridLACIteration:: operator() (const unsigned int /* level */, Vector &dst, const Vector &src) const diff --git a/deal.II/lac/include/lac/block_vector.h b/deal.II/lac/include/lac/block_vector.h index ae184b777e..3c5754e7bc 100644 --- a/deal.II/lac/include/lac/block_vector.h +++ b/deal.II/lac/include/lac/block_vector.h @@ -33,7 +33,7 @@ class BlockVector * that of V, all components are copied * from V */ - BlockVector (const BlockVector& V); + BlockVector (const BlockVector& V); // note: I disabled this function for the time being, since egcs1.1.2 @@ -86,25 +86,25 @@ class BlockVector /** * $U(0-N) = s$: fill all components. */ - BlockVector & operator= (const Number s); + BlockVector & operator= (const Number s); /** * $U = V$: copy all components. */ - BlockVector & - operator= (const BlockVector& V); + BlockVector & + operator= (const BlockVector& V); /** * $U = V$ for different types. */ template - BlockVector & + BlockVector & operator= (const BlockVector& V); /** * $U = U * V$: scalar product. */ - Number operator* (const BlockVector& V) const; + Number operator* (const BlockVector& V) const; /** * Return square of the $l_2$-norm. @@ -167,7 +167,7 @@ class BlockVector * this function is the same as calling * #reinit (V.size(), fast)#. */ - void reinit (const BlockVector &V, + void reinit (const BlockVector &V, const bool fast=false); /** @@ -241,15 +241,15 @@ class BlockVector * Addition operator. * Fast equivalent to #U.add(1, V)#. */ - BlockVector & - operator += (const BlockVector &V); + BlockVector & + operator += (const BlockVector &V); /** * Subtraction operator. * Fast equivalent to #U.add(-1, V)#. */ - BlockVector & - operator -= (const BlockVector &V); + BlockVector & + operator -= (const BlockVector &V); /** * $U(0-DIM)+=s$. @@ -263,49 +263,49 @@ class BlockVector * Simple vector addition, equal to the * #operator +=#. */ - void add (const BlockVector& V); + void add (const BlockVector& V); /** * U+=a*V. * Simple addition of a scaled vector. */ - void add (const Number a, const BlockVector& V); + void add (const Number a, const BlockVector& V); /** * U+=a*V+b*W. * Multiple addition of scaled vectors. */ - void add (const Number a, const BlockVector& V, - const Number b, const BlockVector& W); + void add (const Number a, const BlockVector& V, + const Number b, const BlockVector& W); /** * U=s*U+V. * Scaling and simple vector addition. */ - void sadd (const Number s, const BlockVector& V); + void sadd (const Number s, const BlockVector& V); /** * U=s*U+a*V. * Scaling and simple addition. */ - void sadd (const Number s, const Number a, const BlockVector& V); + void sadd (const Number s, const Number a, const BlockVector& V); /** * U=s*U+a*V+b*W. * Scaling and multiple addition. */ void sadd (const Number s, const Number a, - const BlockVector& V, - const Number b, const BlockVector& W); + const BlockVector& V, + const Number b, const BlockVector& W); /** * U=s*U+a*V+b*W+c*X. * Scaling and multiple addition. */ void sadd (const Number s, const Number a, - const BlockVector& V, - const Number b, const BlockVector& W, - const Number c, const BlockVector& X); + const BlockVector& V, + const Number b, const BlockVector& W, + const Number c, const BlockVector& X); /** * Scale each element of the vector by the @@ -319,14 +319,14 @@ class BlockVector /** * U=a*V. Replacing. */ - void equ (const Number a, const BlockVector& V); + void equ (const Number a, const BlockVector& V); /** * U=a*V+b*W. * Replacing by sum. */ - void equ (const Number a, const BlockVector& V, - const Number b, const BlockVector& W); + void equ (const Number a, const BlockVector& V, + const Number b, const BlockVector& W); //@} @@ -438,7 +438,7 @@ class BlockVector template inline -unsigned int BlockVector::size () const +unsigned int BlockVector::size () const { return start[n_blocks]; } @@ -447,7 +447,7 @@ unsigned int BlockVector::size () const // template // inline -// BlockVector::iterator BlockVector::begin () { +// BlockVector::iterator BlockVector::begin () { // return &val[0]; // }; @@ -455,7 +455,7 @@ unsigned int BlockVector::size () const // template // inline -// BlockVector::const_iterator BlockVector::begin () const { +// BlockVector::const_iterator BlockVector::begin () const { // return &val[0]; // }; @@ -463,7 +463,7 @@ unsigned int BlockVector::size () const // template // inline -// BlockVector::iterator BlockVector::end () { +// BlockVector::iterator BlockVector::end () { // return &val[dim]; // }; @@ -471,7 +471,7 @@ unsigned int BlockVector::size () const // template // inline -// BlockVector::const_iterator BlockVector::end () const { +// BlockVector::const_iterator BlockVector::end () const { // return &val[dim]; // }; @@ -479,7 +479,7 @@ unsigned int BlockVector::size () const template inline -Number BlockVector::operator() (const unsigned int i) const +Number BlockVector::operator() (const unsigned int i) const { // Assert (i::operator() (const unsigned int i) const template inline -Number& BlockVector::operator() (const unsigned int i) +Number& BlockVector::operator() (const unsigned int i) { // Assert (i::operator() (const unsigned int i) template inline Vector& -BlockVector::block(unsigned int i) +BlockVector::block(unsigned int i) { Assert(i::block(unsigned int i) template inline const Vector& -BlockVector::block(unsigned int i) const +BlockVector::block(unsigned int i) const { Assert(i -BlockVector::BlockVector () +BlockVector::BlockVector () { for (unsigned int i=0;i<=n_blocks;++i) start[n_blocks] = 0; @@ -28,7 +28,7 @@ BlockVector::BlockVector () template -BlockVector::BlockVector (const vector& n) +BlockVector::BlockVector (const vector& n) { Assert(n.size()==n_blocks, ExcDimensionMismatch(n.size(), n_blocks)); @@ -38,7 +38,7 @@ BlockVector::BlockVector (const vector& n) template -BlockVector::BlockVector (const BlockVector& v) +BlockVector::BlockVector (const BlockVector& v) { for (unsigned int i=0;i::BlockVector (const BlockVector& // // template // template -// BlockVector::Vector (const BlockVector& v) : +// BlockVector::Vector (const BlockVector& v) : // dim(v.size()), // maxdim(v.size()), // val(0) @@ -70,7 +70,7 @@ BlockVector::BlockVector (const BlockVector& template -void BlockVector::reinit (const vector& n, +void BlockVector::reinit (const vector& n, const bool fast) { Assert (n.size() == n_blocks, @@ -89,7 +89,7 @@ void BlockVector::reinit (const vector& n, template -void BlockVector::reinit (const BlockVector& v, +void BlockVector::reinit (const BlockVector& v, const bool fast) { for (unsigned int i=0;i::reinit (const BlockVector& template -BlockVector::~BlockVector () +BlockVector::~BlockVector () { } template -void BlockVector::clear () +void BlockVector::clear () { for (unsigned int i=0;i::clear () template -bool BlockVector::all_zero () const +bool BlockVector::all_zero () const { bool result = true; for (unsigned int i=0;i::all_zero () const template -Number BlockVector::operator * (const BlockVector& v) const +Number BlockVector::operator * (const BlockVector& v) const { Number sum = 0.; for (unsigned int i=0;i::operator * (const BlockVector -Number BlockVector::norm_sqr () const +Number BlockVector::norm_sqr () const { Number sum = 0.; for (unsigned int i=0;i::norm_sqr () const template -Number BlockVector::mean_value () const +Number BlockVector::mean_value () const { Number sum = 0.; for (unsigned int i=0;i::mean_value () const template -Number BlockVector::l1_norm () const +Number BlockVector::l1_norm () const { Number sum = 0.; for (unsigned int i=0;i::l1_norm () const template -Number BlockVector::l2_norm () const +Number BlockVector::l2_norm () const { return sqrt(norm_sqr()); } @@ -195,7 +195,7 @@ Number BlockVector::l2_norm () const template -Number BlockVector::linfty_norm () const +Number BlockVector::linfty_norm () const { Number sum = 0.; for (unsigned int i=0;i::linfty_norm () const template -BlockVector& BlockVector::operator += (const BlockVector& v) +BlockVector& BlockVector::operator += (const BlockVector& v) { add (v); return *this; @@ -221,7 +221,7 @@ BlockVector& BlockVector::operator += (const template -BlockVector& BlockVector::operator -= (const BlockVector& v) +BlockVector& BlockVector::operator -= (const BlockVector& v) { for (unsigned int i=0;i& BlockVector::operator -= (const template -void BlockVector::add (const Number v) +void BlockVector::add (const Number v) { for (unsigned int i=0;i::add (const Number v) template -void BlockVector::add (const BlockVector& v) +void BlockVector::add (const BlockVector& v) { for (unsigned int i=0;i::add (const BlockVector& v) template -void BlockVector::add (const Number a, - const BlockVector& v) +void BlockVector::add (const Number a, + const BlockVector& v) { for (unsigned int i=0;i::add (const Number a, template -void BlockVector::add (const Number a, - const BlockVector& v, +void BlockVector::add (const Number a, + const BlockVector& v, const Number b, - const BlockVector& w) + const BlockVector& w) { for (unsigned int i=0;i::add (const Number a, template -void BlockVector::sadd (const Number x, - const BlockVector& v) +void BlockVector::sadd (const Number x, + const BlockVector& v) { for (unsigned int i=0;i::sadd (const Number x, template -void BlockVector::sadd (const Number x, const Number a, - const BlockVector& v) +void BlockVector::sadd (const Number x, const Number a, + const BlockVector& v) { for (unsigned int i=0;i::sadd (const Number x, const Number a, template -void BlockVector::sadd (const Number x, const Number a, - const BlockVector& v, +void BlockVector::sadd (const Number x, const Number a, + const BlockVector& v, const Number b, - const BlockVector& w) + const BlockVector& w) { for (unsigned int i=0;i::sadd (const Number x, const Number a, template -void BlockVector::sadd (const Number x, const Number a, - const BlockVector& v, +void BlockVector::sadd (const Number x, const Number a, + const BlockVector& v, const Number b, - const BlockVector& w, + const BlockVector& w, const Number c, - const BlockVector& y) + const BlockVector& y) { for (unsigned int i=0;i::sadd (const Number x, const Number a, template -void BlockVector::scale (const Number factor) +void BlockVector::scale (const Number factor) { for (unsigned int i=0;i::scale (const Number factor) template -void BlockVector::equ (const Number a, - const BlockVector& v, +void BlockVector::equ (const Number a, + const BlockVector& v, const Number b, - const BlockVector& w) + const BlockVector& w) { for (unsigned int i=0;i::equ (const Number a, template -void BlockVector::equ (const Number a, - const BlockVector& v) +void BlockVector::equ (const Number a, + const BlockVector& v) { for (unsigned int i=0;i::equ (const Number a, template -BlockVector& BlockVector::operator = (const Number s) +BlockVector& BlockVector::operator = (const Number s) { for (unsigned int i=0;i& BlockVector::operator = (const template -BlockVector& -BlockVector::operator = (const BlockVector& v) +BlockVector& +BlockVector::operator = (const BlockVector& v) { for (unsigned int i=0;i::operator = (const BlockVector& template template -BlockVector& -BlockVector::operator = (const BlockVector& v) +BlockVector& +BlockVector::operator = (const BlockVector& v) { for (unsigned int i=0;i::operator = (const BlockVector& template -void BlockVector::print (ostream &out, +void BlockVector::print (ostream &out, unsigned int precision, bool scientific, bool across) const @@ -428,7 +428,7 @@ void BlockVector::print (ostream &out, template -void BlockVector::block_write (ostream &out) const +void BlockVector::block_write (ostream &out) const { for (unsigned int i=0;i::block_write (ostream &out) const template -void BlockVector::block_read (istream &in) +void BlockVector::block_read (istream &in) { for (unsigned int i=0;i::operator[](unsigned int i) const template -MGCoarseGridLACIteration:: +MGCoarseGridLACIteration:: MGCoarseGridLACIteration(SOLVER &s, const MATRIX &m, const PRECOND &p) @@ -639,7 +639,7 @@ MGCoarseGridLACIteration(SOLVER &s, template void -MGCoarseGridLACIteration:: +MGCoarseGridLACIteration:: operator() (const unsigned int /* level */, Vector &dst, const Vector &src) const diff --git a/deal.II/lac/include/lac/precondition.h b/deal.II/lac/include/lac/precondition.h index 6897d521cf..4f9410e246 100644 --- a/deal.II/lac/include/lac/precondition.h +++ b/deal.II/lac/include/lac/precondition.h @@ -1,9 +1,11 @@ -/*-------------------- precondition.h --------------------*/ -//$Id$ -// Guido Kanschat, University of Heidelberg, 1999 +/*---------------------------- precondition.h ---------------------------*/ +/* $Id$ */ +#ifndef __precondition_H +#define __precondition_H +/*---------------------------- precondition.h ---------------------------*/ + + -#ifndef __lac_precondition_h -#define __lac_precondition_h /** * No preconditioning. @@ -243,7 +245,7 @@ PreconditionIdentity::operator() (VECTOR& dst, const VECTOR& src) const } template -PreconditionUseMatrix::PreconditionUseMatrix(const MATRIX& M, +PreconditionUseMatrix::PreconditionUseMatrix(const MATRIX& M, function_ptr method) : matrix(M), precondition(method) @@ -252,14 +254,14 @@ PreconditionUseMatrix::PreconditionUseMatrix(const MATRIX& M, template void -PreconditionUseMatrix::operator() (VECTOR& dst, +PreconditionUseMatrix::operator() (VECTOR& dst, const VECTOR& src) const { (matrix.*precondition)(dst, src); } template -PreconditionRelaxation::PreconditionRelaxation(const MATRIX& M, +PreconditionRelaxation::PreconditionRelaxation(const MATRIX& M, function_ptr method, double omega) : @@ -269,7 +271,7 @@ PreconditionRelaxation::PreconditionRelaxation(const MATRIX& M, template void -PreconditionRelaxation::operator() (VECTOR& dst, +PreconditionRelaxation::operator() (VECTOR& dst, const VECTOR& src) const { (matrix.*precondition)(dst, src, omega); @@ -278,7 +280,7 @@ PreconditionRelaxation::operator() (VECTOR& dst, ////////////////////////////////////////////////////////////////////// template -PreconditionLACSolver +PreconditionLACSolver ::PreconditionLACSolver(SOLVER& solver, const MATRIX& matrix, const PRECONDITION& precondition) @@ -289,7 +291,7 @@ PreconditionLACSolver template template void -PreconditionLACSolver::operator() (VECTOR& dst, +PreconditionLACSolver::operator() (VECTOR& dst, const VECTOR& src) const { solver.solve(matrix, dst, src, precondition); @@ -297,4 +299,8 @@ PreconditionLACSolver::operator() (VECTOR& dst, + +/*---------------------------- precondition.h ---------------------------*/ +/* end of #ifndef __precondition_H */ #endif +/*---------------------------- precondition.h ---------------------------*/ diff --git a/deal.II/lac/include/lac/precondition_block.h b/deal.II/lac/include/lac/precondition_block.h index 75d33a9a93..beca0f1f7f 100644 --- a/deal.II/lac/include/lac/precondition_block.h +++ b/deal.II/lac/include/lac/precondition_block.h @@ -200,7 +200,7 @@ class PreconditionBlock: public Subscriptor */ template -class PreconditionBlockSOR : public PreconditionBlock +class PreconditionBlockSOR : public PreconditionBlock { public: /** diff --git a/deal.II/lac/include/lac/precondition_block.templates.h b/deal.II/lac/include/lac/precondition_block.templates.h index 4aad18d3a9..a7c147d60e 100644 --- a/deal.II/lac/include/lac/precondition_block.templates.h +++ b/deal.II/lac/include/lac/precondition_block.templates.h @@ -10,20 +10,20 @@ template -PreconditionBlock::PreconditionBlock (): +PreconditionBlock::PreconditionBlock (): blocksize(0), A(0) {}; template -PreconditionBlock::~PreconditionBlock () +PreconditionBlock::~PreconditionBlock () { if (inverse.size()!=0) inverse.erase(inverse.begin(), inverse.end()); } template -void PreconditionBlock::clear () +void PreconditionBlock::clear () { if (inverse.size()!=0) inverse.erase(inverse.begin(), inverse.end()); @@ -31,7 +31,7 @@ void PreconditionBlock::clear () } template -void PreconditionBlock::use_matrix( +void PreconditionBlock::use_matrix( const SparseMatrix &M) { A = &M; @@ -39,19 +39,19 @@ void PreconditionBlock::use_matrix( template -void PreconditionBlock::set_block_size(unsigned int bsize) { +void PreconditionBlock::set_block_size(unsigned int bsize) { blocksize=bsize; } template -unsigned int PreconditionBlock::block_size() const { +unsigned int PreconditionBlock::block_size() const { return blocksize; } template -void PreconditionBlock::invert_diagblocks() +void PreconditionBlock::invert_diagblocks() { Assert (A!=0, ExcNoMatrixGivenToUse()); const SparseMatrix &M=*A; @@ -115,18 +115,18 @@ void PreconditionBlock::invert_diagblocks() /*--------------------- PreconditionBlockSOR -----------------------*/ template -PreconditionBlockSOR::PreconditionBlockSOR(const number omega): +PreconditionBlockSOR::PreconditionBlockSOR(const number omega): omega(omega) {} template -PreconditionBlockSOR::~PreconditionBlockSOR(){} +PreconditionBlockSOR::~PreconditionBlockSOR(){} template template -void PreconditionBlockSOR::operator() (Vector &dst, - const Vector &src) const +void PreconditionBlockSOR::operator() (Vector &dst, + const Vector &src) const { Assert(A!=0, ExcNoMatrixGivenToUse()); const SparseMatrix &M=*A; diff --git a/deal.II/lac/include/lac/precondition_selector.h b/deal.II/lac/include/lac/precondition_selector.h index 72c08e56b3..0b321c392c 100644 --- a/deal.II/lac/include/lac/precondition_selector.h +++ b/deal.II/lac/include/lac/precondition_selector.h @@ -144,7 +144,7 @@ class PreconditionSelector template -PreconditionSelector +PreconditionSelector ::PreconditionSelector(string preconditioning, const typename Vector::value_type &omega) : preconditioning(preconditioning), @@ -152,7 +152,7 @@ PreconditionSelector template -PreconditionSelector::~PreconditionSelector() +PreconditionSelector::~PreconditionSelector() { // release the matrix A A=0; @@ -160,14 +160,14 @@ PreconditionSelector::~PreconditionSelector() template -void PreconditionSelector::use_matrix(const Matrix &M) +void PreconditionSelector::use_matrix(const Matrix &M) { A=&M; } template -void PreconditionSelector::operator() (Vector &dst, - const Vector &src) const +void PreconditionSelector::operator() (Vector &dst, + const Vector &src) const { if (preconditioning=="none") { @@ -196,7 +196,7 @@ void PreconditionSelector::operator() (Vector &dst, template -string PreconditionSelector::get_precondition_names() +string PreconditionSelector::get_precondition_names() { return "none|jacobi|sor|ssor"; } -- 2.39.5