From: Wolfgang Bangerth Date: Mon, 5 Jan 2004 22:18:30 +0000 (+0000) Subject: Adjust to our usual coding styles. X-Git-Tag: v8.0.0~15947 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5d39713a1c5008e01eb7ba0e4457bc6ae658433;p=dealii.git Adjust to our usual coding styles. git-svn-id: https://svn.dealii.org/trunk@8280 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/dofs/dof_constraints.templates.h b/deal.II/deal.II/include/dofs/dof_constraints.templates.h index 560e053e2f..1d94667def 100644 --- a/deal.II/deal.II/include/dofs/dof_constraints.templates.h +++ b/deal.II/deal.II/include/dofs/dof_constraints.templates.h @@ -160,6 +160,11 @@ ConstraintMatrix::condense (SparseMatrix &uncondensed) const Assert (sparsity.is_compressed() == true, ExcMatrixNotClosed()); Assert (sparsity.n_rows() == sparsity.n_cols(), ExcMatrixNotSquare()); + + double average_diagonal = 0; + for (unsigned int i=0; i &uncondensed) const .entries[q].second); uncondensed.global_entry(j) = (row == sparsity.get_column_numbers()[j] ? - 1. : 0. ); + average_diagonal : 0. ); }; }; }; @@ -292,6 +297,12 @@ ConstraintMatrix::condense (BlockSparseMatrix &uncondensed) const Assert (sparsity.get_column_indices() == sparsity.get_row_indices(), ExcMatrixNotSquare()); + double average_diagonal = 0; + for (unsigned int b=0; b &uncondensed) const lines[distribute[global_col]].entries[q].second); uncondensed.block(block_row,block_col).global_entry(j) - = (row == global_col ? 1. : 0. ); + = (row == global_col ? average_diagonal : 0. ); }; }; }; diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index 0ed0a4c468..db8c06f0bb 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -52,77 +52,88 @@ DoFHandler::~DoFHandler () template <> DoFHandler<1>::raw_cell_iterator -DoFHandler<1>::begin_raw (const unsigned int level) const { +DoFHandler<1>::begin_raw (const unsigned int level) const +{ return begin_raw_line (level); } template <> DoFHandler<1>::cell_iterator -DoFHandler<1>::begin (const unsigned int level) const { +DoFHandler<1>::begin (const unsigned int level) const +{ return begin_line (level); } template <> DoFHandler<1>::active_cell_iterator -DoFHandler<1>::begin_active (const unsigned int level) const { +DoFHandler<1>::begin_active (const unsigned int level) const +{ return begin_active_line (level); } template <> DoFHandler<1>::raw_cell_iterator -DoFHandler<1>::end () const { +DoFHandler<1>::end () const +{ return end_line (); } template <> DoFHandler<1>::raw_cell_iterator -DoFHandler<1>::last_raw () const { +DoFHandler<1>::last_raw () const +{ return last_raw_line (); } template <> DoFHandler<1>::raw_cell_iterator -DoFHandler<1>::last_raw (const unsigned int level) const { +DoFHandler<1>::last_raw (const unsigned int level) const +{ return last_raw_line (level); } template <> DoFHandler<1>::cell_iterator -DoFHandler<1>::last () const { +DoFHandler<1>::last () const +{ return last_line (); } template <> DoFHandler<1>::cell_iterator -DoFHandler<1>::last (const unsigned int level) const { +DoFHandler<1>::last (const unsigned int level) const +{ return last_line (level); } template <> DoFHandler<1>::active_cell_iterator -DoFHandler<1>::last_active () const { +DoFHandler<1>::last_active () const +{ return last_active_line (); } template <> DoFHandler<1>::active_cell_iterator -DoFHandler<1>::last_active (const unsigned int level) const { +DoFHandler<1>::last_active (const unsigned int level) const +{ return last_active_line (level); } template <> DoFDimensionInfo<1>::raw_face_iterator -DoFHandler<1>::begin_raw_face (const unsigned int) const { +DoFHandler<1>::begin_raw_face (const unsigned int) const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -130,7 +141,8 @@ DoFHandler<1>::begin_raw_face (const unsigned int) const { template <> DoFDimensionInfo<1>::face_iterator -DoFHandler<1>::begin_face (const unsigned int) const { +DoFHandler<1>::begin_face (const unsigned int) const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -138,7 +150,8 @@ DoFHandler<1>::begin_face (const unsigned int) const { template <> DoFDimensionInfo<1>::active_face_iterator -DoFHandler<1>::begin_active_face (const unsigned int) const { +DoFHandler<1>::begin_active_face (const unsigned int) const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -146,7 +159,8 @@ DoFHandler<1>::begin_active_face (const unsigned int) const { template <> DoFDimensionInfo<1>::raw_face_iterator -DoFHandler<1>::end_face () const { +DoFHandler<1>::end_face () const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -154,7 +168,8 @@ DoFHandler<1>::end_face () const { template <> DoFDimensionInfo<1>::raw_face_iterator -DoFHandler<1>::last_raw_face () const { +DoFHandler<1>::last_raw_face () const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -162,7 +177,8 @@ DoFHandler<1>::last_raw_face () const { template <> DoFDimensionInfo<1>::raw_face_iterator -DoFHandler<1>::last_raw_face (const unsigned int) const { +DoFHandler<1>::last_raw_face (const unsigned int) const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -170,7 +186,8 @@ DoFHandler<1>::last_raw_face (const unsigned int) const { template <> DoFDimensionInfo<1>::face_iterator -DoFHandler<1>::last_face () const { +DoFHandler<1>::last_face () const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -178,7 +195,8 @@ DoFHandler<1>::last_face () const { template <> DoFDimensionInfo<1>::face_iterator -DoFHandler<1>::last_face (const unsigned int) const { +DoFHandler<1>::last_face (const unsigned int) const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -186,7 +204,8 @@ DoFHandler<1>::last_face (const unsigned int) const { template <> DoFDimensionInfo<1>::active_face_iterator -DoFHandler<1>::last_active_face () const { +DoFHandler<1>::last_active_face () const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -194,7 +213,8 @@ DoFHandler<1>::last_active_face () const { template <> DoFDimensionInfo<1>::active_face_iterator -DoFHandler<1>::last_active_face (const unsigned int) const { +DoFHandler<1>::last_active_face (const unsigned int) const +{ Assert (false, ExcFunctionNotUseful()); return 0; } @@ -202,7 +222,8 @@ DoFHandler<1>::last_active_face (const unsigned int) const { template <> DoFHandler<1>::raw_quad_iterator -DoFHandler<1>::begin_raw_quad (const unsigned int) const { +DoFHandler<1>::begin_raw_quad (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -210,7 +231,8 @@ DoFHandler<1>::begin_raw_quad (const unsigned int) const { template <> DoFHandler<1>::quad_iterator -DoFHandler<1>::begin_quad (const unsigned int) const { +DoFHandler<1>::begin_quad (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -218,7 +240,8 @@ DoFHandler<1>::begin_quad (const unsigned int) const { template <> DoFHandler<1>::active_quad_iterator -DoFHandler<1>::begin_active_quad (const unsigned int) const { +DoFHandler<1>::begin_active_quad (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -226,7 +249,8 @@ DoFHandler<1>::begin_active_quad (const unsigned int) const { template <> DoFHandler<1>::raw_quad_iterator -DoFHandler<1>::end_quad () const { +DoFHandler<1>::end_quad () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -234,7 +258,8 @@ DoFHandler<1>::end_quad () const { template <> DoFHandler<1>::raw_quad_iterator -DoFHandler<1>::last_raw_quad (const unsigned int) const { +DoFHandler<1>::last_raw_quad (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -242,7 +267,8 @@ DoFHandler<1>::last_raw_quad (const unsigned int) const { template <> DoFHandler<1>::quad_iterator -DoFHandler<1>::last_quad (const unsigned int) const { +DoFHandler<1>::last_quad (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -250,7 +276,8 @@ DoFHandler<1>::last_quad (const unsigned int) const { template <> DoFHandler<1>::active_quad_iterator -DoFHandler<1>::last_active_quad (const unsigned int) const { +DoFHandler<1>::last_active_quad (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -258,7 +285,8 @@ DoFHandler<1>::last_active_quad (const unsigned int) const { template <> DoFHandler<1>::raw_quad_iterator -DoFHandler<1>::last_raw_quad () const { +DoFHandler<1>::last_raw_quad () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -266,7 +294,8 @@ DoFHandler<1>::last_raw_quad () const { template <> DoFHandler<1>::quad_iterator -DoFHandler<1>::last_quad () const { +DoFHandler<1>::last_quad () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -274,7 +303,8 @@ DoFHandler<1>::last_quad () const { template <> DoFHandler<1>::active_quad_iterator -DoFHandler<1>::last_active_quad () const { +DoFHandler<1>::last_active_quad () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -282,7 +312,8 @@ DoFHandler<1>::last_active_quad () const { template <> DoFHandler<1>::raw_hex_iterator -DoFHandler<1>::begin_raw_hex (const unsigned int) const { +DoFHandler<1>::begin_raw_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -290,7 +321,8 @@ DoFHandler<1>::begin_raw_hex (const unsigned int) const { template <> DoFHandler<1>::hex_iterator -DoFHandler<1>::begin_hex (const unsigned int) const { +DoFHandler<1>::begin_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -298,7 +330,8 @@ DoFHandler<1>::begin_hex (const unsigned int) const { template <> DoFHandler<1>::active_hex_iterator -DoFHandler<1>::begin_active_hex (const unsigned int) const { +DoFHandler<1>::begin_active_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -306,7 +339,8 @@ DoFHandler<1>::begin_active_hex (const unsigned int) const { template <> DoFHandler<1>::raw_hex_iterator -DoFHandler<1>::end_hex () const { +DoFHandler<1>::end_hex () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -314,7 +348,8 @@ DoFHandler<1>::end_hex () const { template <> DoFHandler<1>::raw_hex_iterator -DoFHandler<1>::last_raw_hex (const unsigned int) const { +DoFHandler<1>::last_raw_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -322,7 +357,8 @@ DoFHandler<1>::last_raw_hex (const unsigned int) const { template <> DoFHandler<1>::raw_hex_iterator -DoFHandler<1>::last_raw_hex () const { +DoFHandler<1>::last_raw_hex () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -330,7 +366,8 @@ DoFHandler<1>::last_raw_hex () const { template <> DoFHandler<1>::hex_iterator -DoFHandler<1>::last_hex (const unsigned int) const { +DoFHandler<1>::last_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -338,7 +375,8 @@ DoFHandler<1>::last_hex (const unsigned int) const { template <> DoFHandler<1>::hex_iterator -DoFHandler<1>::last_hex () const { +DoFHandler<1>::last_hex () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -346,7 +384,8 @@ DoFHandler<1>::last_hex () const { template <> DoFHandler<1>::active_hex_iterator -DoFHandler<1>::last_active_hex (const unsigned int) const { +DoFHandler<1>::last_active_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -354,7 +393,8 @@ DoFHandler<1>::last_active_hex (const unsigned int) const { template <> DoFHandler<1>::active_hex_iterator -DoFHandler<1>::last_active_hex () const { +DoFHandler<1>::last_active_hex () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -366,147 +406,168 @@ DoFHandler<1>::last_active_hex () const { template <> DoFHandler<2>::raw_cell_iterator -DoFHandler<2>::begin_raw (const unsigned int level) const { +DoFHandler<2>::begin_raw (const unsigned int level) const +{ return begin_raw_quad (level); } template <> DoFHandler<2>::cell_iterator -DoFHandler<2>::begin (const unsigned int level) const { +DoFHandler<2>::begin (const unsigned int level) const +{ return begin_quad (level); } template <> DoFHandler<2>::active_cell_iterator -DoFHandler<2>::begin_active (const unsigned int level) const { +DoFHandler<2>::begin_active (const unsigned int level) const +{ return begin_active_quad (level); } template <> DoFHandler<2>::raw_cell_iterator -DoFHandler<2>::end () const { +DoFHandler<2>::end () const +{ return end_quad (); } template <> DoFHandler<2>::raw_cell_iterator -DoFHandler<2>::last_raw () const { +DoFHandler<2>::last_raw () const +{ return last_raw_quad (); } template <> DoFHandler<2>::raw_cell_iterator -DoFHandler<2>::last_raw (const unsigned int level) const { +DoFHandler<2>::last_raw (const unsigned int level) const +{ return last_raw_quad (level); } template <> DoFHandler<2>::cell_iterator -DoFHandler<2>::last () const { +DoFHandler<2>::last () const +{ return last_quad (); } template <> DoFHandler<2>::cell_iterator -DoFHandler<2>::last (const unsigned int level) const { +DoFHandler<2>::last (const unsigned int level) const +{ return last_quad (level); } template <> DoFHandler<2>::active_cell_iterator -DoFHandler<2>::last_active () const { +DoFHandler<2>::last_active () const +{ return last_active_quad (); } template <> DoFHandler<2>::active_cell_iterator -DoFHandler<2>::last_active (const unsigned int level) const { +DoFHandler<2>::last_active (const unsigned int level) const +{ return last_active_quad (level); } template <> DoFDimensionInfo<2>::raw_face_iterator -DoFHandler<2>::begin_raw_face (const unsigned int level) const { +DoFHandler<2>::begin_raw_face (const unsigned int level) const +{ return begin_raw_line (level); } template <> DoFDimensionInfo<2>::face_iterator -DoFHandler<2>::begin_face (const unsigned int level) const { +DoFHandler<2>::begin_face (const unsigned int level) const +{ return begin_line (level); } template <> DoFDimensionInfo<2>::active_face_iterator -DoFHandler<2>::begin_active_face (const unsigned int level) const { +DoFHandler<2>::begin_active_face (const unsigned int level) const +{ return begin_active_line (level); } template <> DoFDimensionInfo<2>::raw_face_iterator -DoFHandler<2>::end_face () const { +DoFHandler<2>::end_face () const +{ return end_line (); } template <> DoFDimensionInfo<2>::raw_face_iterator -DoFHandler<2>::last_raw_face () const { +DoFHandler<2>::last_raw_face () const +{ return last_raw_line (); } template <> DoFDimensionInfo<2>::raw_face_iterator -DoFHandler<2>::last_raw_face (const unsigned int level) const { +DoFHandler<2>::last_raw_face (const unsigned int level) const +{ return last_raw_line (level); } template <> DoFDimensionInfo<2>::face_iterator -DoFHandler<2>::last_face () const { +DoFHandler<2>::last_face () const +{ return last_line (); } template <> DoFDimensionInfo<2>::face_iterator -DoFHandler<2>::last_face (const unsigned int level) const { +DoFHandler<2>::last_face (const unsigned int level) const +{ return last_line (level); } template <> DoFDimensionInfo<2>::active_face_iterator -DoFHandler<2>::last_active_face () const { +DoFHandler<2>::last_active_face () const +{ return last_active_line (); } template <> DoFDimensionInfo<2>::active_face_iterator -DoFHandler<2>::last_active_face (const unsigned int level) const { +DoFHandler<2>::last_active_face (const unsigned int level) const +{ return last_active_line (level); } template <> DoFHandler<2>::raw_hex_iterator -DoFHandler<2>::begin_raw_hex (const unsigned int) const { +DoFHandler<2>::begin_raw_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -514,7 +575,8 @@ DoFHandler<2>::begin_raw_hex (const unsigned int) const { template <> DoFHandler<2>::hex_iterator -DoFHandler<2>::begin_hex (const unsigned int) const { +DoFHandler<2>::begin_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -522,7 +584,8 @@ DoFHandler<2>::begin_hex (const unsigned int) const { template <> DoFHandler<2>::active_hex_iterator -DoFHandler<2>::begin_active_hex (const unsigned int) const { +DoFHandler<2>::begin_active_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -530,7 +593,8 @@ DoFHandler<2>::begin_active_hex (const unsigned int) const { template <> DoFHandler<2>::raw_hex_iterator -DoFHandler<2>::end_hex () const { +DoFHandler<2>::end_hex () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -538,7 +602,8 @@ DoFHandler<2>::end_hex () const { template <> DoFHandler<2>::raw_hex_iterator -DoFHandler<2>::last_raw_hex (const unsigned int) const { +DoFHandler<2>::last_raw_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -546,7 +611,8 @@ DoFHandler<2>::last_raw_hex (const unsigned int) const { template <> DoFHandler<2>::raw_hex_iterator -DoFHandler<2>::last_raw_hex () const { +DoFHandler<2>::last_raw_hex () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -554,7 +620,8 @@ DoFHandler<2>::last_raw_hex () const { template <> DoFHandler<2>::hex_iterator -DoFHandler<2>::last_hex (const unsigned int) const { +DoFHandler<2>::last_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -562,7 +629,8 @@ DoFHandler<2>::last_hex (const unsigned int) const { template <> DoFHandler<2>::hex_iterator -DoFHandler<2>::last_hex () const { +DoFHandler<2>::last_hex () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -570,7 +638,8 @@ DoFHandler<2>::last_hex () const { template <> DoFHandler<2>::active_hex_iterator -DoFHandler<2>::last_active_hex (const unsigned int) const { +DoFHandler<2>::last_active_hex (const unsigned int) const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -578,7 +647,8 @@ DoFHandler<2>::last_active_hex (const unsigned int) const { template <> DoFHandler<2>::active_hex_iterator -DoFHandler<2>::last_active_hex () const { +DoFHandler<2>::last_active_hex () const +{ Assert (false, ExcNotImplemented()); return 0; } @@ -591,140 +661,160 @@ DoFHandler<2>::last_active_hex () const { template <> DoFHandler<3>::raw_cell_iterator -DoFHandler<3>::begin_raw (const unsigned int level) const { +DoFHandler<3>::begin_raw (const unsigned int level) const +{ return begin_raw_hex (level); } template <> DoFHandler<3>::cell_iterator -DoFHandler<3>::begin (const unsigned int level) const { +DoFHandler<3>::begin (const unsigned int level) const +{ return begin_hex (level); } template <> DoFHandler<3>::active_cell_iterator -DoFHandler<3>::begin_active (const unsigned int level) const { +DoFHandler<3>::begin_active (const unsigned int level) const +{ return begin_active_hex (level); } template <> DoFHandler<3>::raw_cell_iterator -DoFHandler<3>::end () const { +DoFHandler<3>::end () const +{ return end_hex (); } template <> DoFHandler<3>::raw_cell_iterator -DoFHandler<3>::last_raw () const { +DoFHandler<3>::last_raw () const +{ return last_raw_hex (); } template <> DoFHandler<3>::raw_cell_iterator -DoFHandler<3>::last_raw (const unsigned int level) const { +DoFHandler<3>::last_raw (const unsigned int level) const +{ return last_raw_hex (level); } template <> DoFHandler<3>::cell_iterator -DoFHandler<3>::last () const { +DoFHandler<3>::last () const +{ return last_hex (); } template <> DoFHandler<3>::cell_iterator -DoFHandler<3>::last (const unsigned int level) const { +DoFHandler<3>::last (const unsigned int level) const +{ return last_hex (level); } template <> DoFHandler<3>::active_cell_iterator -DoFHandler<3>::last_active () const { +DoFHandler<3>::last_active () const +{ return last_active_hex (); } template <> DoFHandler<3>::active_cell_iterator -DoFHandler<3>::last_active (const unsigned int level) const { +DoFHandler<3>::last_active (const unsigned int level) const +{ return last_active_hex (level); } template <> DoFHandler<3>::raw_face_iterator -DoFHandler<3>::begin_raw_face (const unsigned int level) const { +DoFHandler<3>::begin_raw_face (const unsigned int level) const +{ return begin_raw_quad (level); } template <> DoFHandler<3>::face_iterator -DoFHandler<3>::begin_face (const unsigned int level) const { +DoFHandler<3>::begin_face (const unsigned int level) const +{ return begin_quad (level); } template <> DoFHandler<3>::active_face_iterator -DoFHandler<3>::begin_active_face (const unsigned int level) const { +DoFHandler<3>::begin_active_face (const unsigned int level) const +{ return begin_active_quad (level); } template <> DoFHandler<3>::raw_face_iterator -DoFHandler<3>::end_face () const { +DoFHandler<3>::end_face () const +{ return end_quad (); } template <> DoFHandler<3>::raw_face_iterator -DoFHandler<3>::last_raw_face () const { +DoFHandler<3>::last_raw_face () const +{ return last_raw_quad (); } template <> DoFHandler<3>::raw_face_iterator -DoFHandler<3>::last_raw_face (const unsigned int level) const { +DoFHandler<3>::last_raw_face (const unsigned int level) const +{ return last_raw_quad (level); } template <> DoFHandler<3>::face_iterator -DoFHandler<3>::last_face () const { +DoFHandler<3>::last_face () const +{ return last_quad (); } template <> DoFHandler<3>::face_iterator -DoFHandler<3>::last_face (const unsigned int level) const { +DoFHandler<3>::last_face (const unsigned int level) const +{ return last_quad (level); } template <> DoFHandler<3>::active_face_iterator -DoFHandler<3>::last_active_face () const { +DoFHandler<3>::last_active_face () const +{ return last_active_quad (); } template <> DoFHandler<3>::active_face_iterator -DoFHandler<3>::last_active_face (const unsigned int level) const { +DoFHandler<3>::last_active_face (const unsigned int level) const +{ return last_active_quad (level); } @@ -734,7 +824,8 @@ DoFHandler<3>::last_active_face (const unsigned int level) const { template typename DoFHandler::raw_line_iterator -DoFHandler::begin_raw_line (const unsigned int level) const { +DoFHandler::begin_raw_line (const unsigned int level) const +{ return raw_line_iterator (tria, tria->begin_raw_line(level)->level(), tria->begin_raw_line(level)->index(), @@ -744,7 +835,8 @@ DoFHandler::begin_raw_line (const unsigned int level) const { template typename DoFHandler::line_iterator -DoFHandler::begin_line (const unsigned int level) const { +DoFHandler::begin_line (const unsigned int level) const +{ return line_iterator (tria, tria->begin_line(level)->level(), tria->begin_line(level)->index(), @@ -754,7 +846,8 @@ DoFHandler::begin_line (const unsigned int level) const { template typename DoFHandler::active_line_iterator -DoFHandler::begin_active_line (const unsigned int level) const { +DoFHandler::begin_active_line (const unsigned int level) const +{ return active_line_iterator (tria, tria->begin_active_line(level)->level(), tria->begin_active_line(level)->index(), @@ -764,7 +857,8 @@ DoFHandler::begin_active_line (const unsigned int level) const { template typename DoFHandler::raw_quad_iterator -DoFHandler::begin_raw_quad (const unsigned int level) const { +DoFHandler::begin_raw_quad (const unsigned int level) const +{ return raw_quad_iterator (tria, tria->begin_raw_quad(level)->level(), tria->begin_raw_quad(level)->index(), @@ -774,7 +868,8 @@ DoFHandler::begin_raw_quad (const unsigned int level) const { template typename DoFHandler::quad_iterator -DoFHandler::begin_quad (const unsigned int level) const { +DoFHandler::begin_quad (const unsigned int level) const +{ return quad_iterator (tria, tria->begin_quad(level)->level(), tria->begin_quad(level)->index(), @@ -784,7 +879,8 @@ DoFHandler::begin_quad (const unsigned int level) const { template typename DoFHandler::active_quad_iterator -DoFHandler::begin_active_quad (const unsigned int level) const { +DoFHandler::begin_active_quad (const unsigned int level) const +{ return active_quad_iterator (tria, tria->begin_active_quad(level)->level(), tria->begin_active_quad(level)->index(), @@ -794,7 +890,8 @@ DoFHandler::begin_active_quad (const unsigned int level) const { template typename DoFHandler::raw_hex_iterator -DoFHandler::begin_raw_hex (const unsigned int level) const { +DoFHandler::begin_raw_hex (const unsigned int level) const +{ return raw_hex_iterator (tria, tria->begin_raw_hex(level)->level(), tria->begin_raw_hex(level)->index(), @@ -804,7 +901,8 @@ DoFHandler::begin_raw_hex (const unsigned int level) const { template typename DoFHandler::hex_iterator -DoFHandler::begin_hex (const unsigned int level) const { +DoFHandler::begin_hex (const unsigned int level) const +{ return hex_iterator (tria, tria->begin_hex(level)->level(), tria->begin_hex(level)->index(), @@ -814,7 +912,8 @@ DoFHandler::begin_hex (const unsigned int level) const { template typename DoFHandler::active_hex_iterator -DoFHandler::begin_active_hex (const unsigned int level) const { +DoFHandler::begin_active_hex (const unsigned int level) const +{ return active_hex_iterator (tria, tria->begin_active_hex(level)->level(), tria->begin_active_hex(level)->index(), @@ -824,28 +923,32 @@ DoFHandler::begin_active_hex (const unsigned int level) const { template typename DoFHandler::raw_line_iterator -DoFHandler::end_line () const { +DoFHandler::end_line () const +{ return raw_line_iterator (tria, -1, -1, this); } template typename DoFHandler::raw_quad_iterator -DoFHandler::end_quad () const { +DoFHandler::end_quad () const +{ return raw_quad_iterator (tria, -1, -1, this); } template typename DoFHandler::raw_hex_iterator -DoFHandler::end_hex () const { +DoFHandler::end_hex () const +{ return raw_hex_iterator (tria, -1, -1, this); } template typename DoFDimensionInfo::raw_cell_iterator -DoFHandler::end_raw (const unsigned int level) const { +DoFHandler::end_raw (const unsigned int level) const +{ return (level == levels.size()-1 ? end() : begin_raw (level+1)); @@ -854,7 +957,8 @@ DoFHandler::end_raw (const unsigned int level) const { template typename DoFDimensionInfo::cell_iterator -DoFHandler::end (const unsigned int level) const { +DoFHandler::end (const unsigned int level) const +{ return (level == levels.size()-1 ? cell_iterator(end()) : begin (level+1)); @@ -863,7 +967,8 @@ DoFHandler::end (const unsigned int level) const { template typename DoFDimensionInfo::active_cell_iterator -DoFHandler::end_active (const unsigned int level) const { +DoFHandler::end_active (const unsigned int level) const +{ return (level == levels.size()-1 ? active_cell_iterator(end()) : begin_active (level+1)); @@ -872,7 +977,8 @@ DoFHandler::end_active (const unsigned int level) const { template typename DoFDimensionInfo::raw_face_iterator -DoFHandler::end_raw_face (const unsigned int level) const { +DoFHandler::end_raw_face (const unsigned int level) const +{ return (level == levels.size()-1 ? end_face() : begin_raw_face (level+1)); @@ -881,7 +987,8 @@ DoFHandler::end_raw_face (const unsigned int level) const { template typename DoFDimensionInfo::face_iterator -DoFHandler::end_face (const unsigned int level) const { +DoFHandler::end_face (const unsigned int level) const +{ return (level == levels.size()-1 ? face_iterator(end_face()) : begin_face (level+1)); @@ -890,7 +997,8 @@ DoFHandler::end_face (const unsigned int level) const { template typename DoFDimensionInfo::active_face_iterator -DoFHandler::end_active_face (const unsigned int level) const { +DoFHandler::end_active_face (const unsigned int level) const +{ return (level == levels.size()-1 ? active_face_iterator(end_face()) : begin_active_face (level+1)); @@ -899,7 +1007,8 @@ DoFHandler::end_active_face (const unsigned int level) const { template typename DoFDimensionInfo::raw_line_iterator -DoFHandler::end_raw_line (const unsigned int level) const { +DoFHandler::end_raw_line (const unsigned int level) const +{ return (level == levels.size()-1 ? end_line() : begin_raw_line (level+1)); @@ -908,7 +1017,8 @@ DoFHandler::end_raw_line (const unsigned int level) const { template typename DoFDimensionInfo::line_iterator -DoFHandler::end_line (const unsigned int level) const { +DoFHandler::end_line (const unsigned int level) const +{ return (level == levels.size()-1 ? line_iterator(end_line()) : begin_line (level+1)); @@ -917,7 +1027,8 @@ DoFHandler::end_line (const unsigned int level) const { template typename DoFDimensionInfo::active_line_iterator -DoFHandler::end_active_line (const unsigned int level) const { +DoFHandler::end_active_line (const unsigned int level) const +{ return (level == levels.size()-1 ? active_line_iterator(end_line()) : begin_active_line (level+1)); @@ -926,7 +1037,8 @@ DoFHandler::end_active_line (const unsigned int level) const { template typename DoFDimensionInfo::raw_quad_iterator -DoFHandler::end_raw_quad (const unsigned int level) const { +DoFHandler::end_raw_quad (const unsigned int level) const +{ return (level == levels.size()-1 ? end_quad() : begin_raw_quad (level+1)); @@ -935,7 +1047,8 @@ DoFHandler::end_raw_quad (const unsigned int level) const { template typename DoFDimensionInfo::quad_iterator -DoFHandler::end_quad (const unsigned int level) const { +DoFHandler::end_quad (const unsigned int level) const +{ return (level == levels.size()-1 ? quad_iterator(end_quad()) : begin_quad (level+1)); @@ -944,7 +1057,8 @@ DoFHandler::end_quad (const unsigned int level) const { template typename DoFDimensionInfo::active_quad_iterator -DoFHandler::end_active_quad (const unsigned int level) const { +DoFHandler::end_active_quad (const unsigned int level) const +{ return (level == levels.size()-1 ? active_quad_iterator(end_quad()) : begin_active_quad (level+1)); @@ -953,7 +1067,8 @@ DoFHandler::end_active_quad (const unsigned int level) const { template typename DoFDimensionInfo::raw_hex_iterator -DoFHandler::end_raw_hex (const unsigned int level) const { +DoFHandler::end_raw_hex (const unsigned int level) const +{ return (level == levels.size()-1 ? end_hex() : begin_raw_hex (level+1)); @@ -962,7 +1077,8 @@ DoFHandler::end_raw_hex (const unsigned int level) const { template typename DoFDimensionInfo::hex_iterator -DoFHandler::end_hex (const unsigned int level) const { +DoFHandler::end_hex (const unsigned int level) const +{ return (level == levels.size()-1 ? hex_iterator(end_hex()) : begin_hex (level+1)); @@ -971,7 +1087,8 @@ DoFHandler::end_hex (const unsigned int level) const { template typename DoFDimensionInfo::active_hex_iterator -DoFHandler::end_active_hex (const unsigned int level) const { +DoFHandler::end_active_hex (const unsigned int level) const +{ return (level == levels.size()-1 ? active_hex_iterator(end_hex()) : begin_active_hex (level+1)); @@ -980,7 +1097,8 @@ DoFHandler::end_active_hex (const unsigned int level) const { template typename DoFHandler::raw_line_iterator -DoFHandler::last_raw_line (const unsigned int level) const { +DoFHandler::last_raw_line (const unsigned int level) const +{ return raw_line_iterator (tria, tria->last_raw_line(level)->level(), tria->last_raw_line(level)->index(), @@ -990,7 +1108,8 @@ DoFHandler::last_raw_line (const unsigned int level) const { template typename DoFHandler::line_iterator -DoFHandler::last_line (const unsigned int level) const { +DoFHandler::last_line (const unsigned int level) const +{ return line_iterator (tria, tria->last_line(level)->level(), tria->last_line(level)->index(), @@ -1000,7 +1119,8 @@ DoFHandler::last_line (const unsigned int level) const { template typename DoFHandler::active_line_iterator -DoFHandler::last_active_line (const unsigned int level) const { +DoFHandler::last_active_line (const unsigned int level) const +{ return active_line_iterator (tria, tria->last_active_line(level)->level(), tria->last_active_line(level)->index(), @@ -1010,7 +1130,8 @@ DoFHandler::last_active_line (const unsigned int level) const { template typename DoFHandler::raw_quad_iterator -DoFHandler::last_raw_quad (const unsigned int level) const { +DoFHandler::last_raw_quad (const unsigned int level) const +{ return raw_quad_iterator (tria, tria->last_raw_quad(level)->level(), tria->last_raw_quad(level)->index(), @@ -1020,7 +1141,8 @@ DoFHandler::last_raw_quad (const unsigned int level) const { template typename DoFHandler::quad_iterator -DoFHandler::last_quad (const unsigned int level) const { +DoFHandler::last_quad (const unsigned int level) const +{ return quad_iterator (tria, tria->last_quad(level)->level(), tria->last_quad(level)->index(), @@ -1030,7 +1152,8 @@ DoFHandler::last_quad (const unsigned int level) const { template typename DoFHandler::active_quad_iterator -DoFHandler::last_active_quad (const unsigned int level) const { +DoFHandler::last_active_quad (const unsigned int level) const +{ return active_quad_iterator (tria, tria->last_active_quad(level)->level(), tria->last_active_quad(level)->index(), @@ -1040,7 +1163,8 @@ DoFHandler::last_active_quad (const unsigned int level) const { template typename DoFHandler::raw_hex_iterator -DoFHandler::last_raw_hex (const unsigned int level) const { +DoFHandler::last_raw_hex (const unsigned int level) const +{ return raw_hex_iterator (tria, tria->last_raw_hex(level)->level(), tria->last_raw_hex(level)->index(), @@ -1050,7 +1174,8 @@ DoFHandler::last_raw_hex (const unsigned int level) const { template typename DoFHandler::hex_iterator -DoFHandler::last_hex (const unsigned int level) const { +DoFHandler::last_hex (const unsigned int level) const +{ return hex_iterator (tria, tria->last_hex(level)->level(), tria->last_hex(level)->index(), @@ -1060,7 +1185,8 @@ DoFHandler::last_hex (const unsigned int level) const { template typename DoFHandler::active_hex_iterator -DoFHandler::last_active_hex (const unsigned int level) const { +DoFHandler::last_active_hex (const unsigned int level) const +{ return active_hex_iterator (tria, tria->last_active_hex(level)->level(), tria->last_active_hex(level)->index(), @@ -1070,63 +1196,72 @@ DoFHandler::last_active_hex (const unsigned int level) const { template typename DoFHandler::raw_line_iterator -DoFHandler::last_raw_line () const { +DoFHandler::last_raw_line () const +{ return last_raw_line (levels.size()-1); } template typename DoFHandler::raw_quad_iterator -DoFHandler::last_raw_quad () const { +DoFHandler::last_raw_quad () const +{ return last_raw_quad (levels.size()-1); } template typename DoFHandler::raw_hex_iterator -DoFHandler::last_raw_hex () const { +DoFHandler::last_raw_hex () const +{ return last_raw_hex (levels.size()-1); } template typename DoFHandler::line_iterator -DoFHandler::last_line () const { +DoFHandler::last_line () const +{ return last_line (levels.size()-1); } template typename DoFHandler::quad_iterator -DoFHandler::last_quad () const { +DoFHandler::last_quad () const +{ return last_quad (levels.size()-1); } template typename DoFHandler::hex_iterator -DoFHandler::last_hex () const { +DoFHandler::last_hex () const +{ return last_hex (levels.size()-1); } template typename DoFHandler::active_line_iterator -DoFHandler::last_active_line () const { +DoFHandler::last_active_line () const +{ return last_active_line (levels.size()-1); } template typename DoFHandler::active_quad_iterator -DoFHandler::last_active_quad () const { +DoFHandler::last_active_quad () const +{ return last_active_quad (levels.size()-1); } template typename DoFHandler::active_hex_iterator -DoFHandler::last_active_hex () const { +DoFHandler::last_active_hex () const +{ return last_active_hex (levels.size()-1); }