From 4ceba2f55f972a0c3e16ea8e6f736a367bd36979 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 2 Mar 2007 17:18:35 +0000 Subject: [PATCH] Move exceptions out of TriaAccessor. This has always been a source of complications because then they became dependent on the space dimension. This is also a first step to making TriaAccessor different for cells and faces/edges, because only the former need level information. git-svn-id: https://svn.dealii.org/trunk@14517 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/dofs/dof_accessor.templates.h | 6 +- deal.II/deal.II/include/grid/tria_accessor.h | 124 +++++++++--------- .../include/grid/tria_accessor.templates.h | 100 +++++++------- deal.II/deal.II/source/grid/tria_accessor.cc | 95 ++++++-------- .../source/multigrid/mg_dof_accessor.cc | 6 +- 5 files changed, 157 insertions(+), 174 deletions(-) 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 4660850f7a..d4f3a92c30 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -147,7 +147,7 @@ DoFAccessor::child (const unsigned int i) const Assert ((q.state() == IteratorState::past_the_end) || q->used(), - typename TriaAccessor::ExcUnusedCellAsChild()); + TriaAccessorExceptions::ExcUnusedCellAsChild()); return q; } @@ -668,7 +668,7 @@ DoFCellAccessor::neighbor (const unsigned int i) const #ifdef DEBUG if (q.state() != IteratorState::past_the_end) - Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsNeighbor()); + Assert (q->used(), TriaAccessorExceptions::ExcUnusedCellAsNeighbor()); #endif return q; } @@ -686,7 +686,7 @@ DoFCellAccessor::child (const unsigned int i) const #ifdef DEBUG if (q.state() != IteratorState::past_the_end) - Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsChild()); + Assert (q->used(), TriaAccessorExceptions::ExcUnusedCellAsChild()); #endif return q; } diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index e19b1b4b60..a898b047e0 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -60,6 +60,69 @@ template class TriaObjectAccessor<3, dim>; // so is now on by default. +/** + * A namespace that contains exception classes used by the accessor classes. + */ +namespace TriaAccessorExceptions +{ + /** + * @ingroup Exceptions + */ + DeclException0 (ExcCellNotUsed); + /** + * @ingroup Exceptions + */ + DeclException1 (ExcInvalidNeighbor, + int, + << "Neighbor indices must be between 0 and 2^dim-1, but " + << "yours was " << arg1); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcCellHasNoChildren); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcUnusedCellAsChild); + /** + * @ingroup Exceptions + */ + DeclException1 (ExcCantSetChildren, + int, + << "You can only set the child index if the cell has no " + << "children, or clear it. The given " + << "index was " << arg1 << " (-1 means: clear children)"); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcUnusedCellAsNeighbor); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcUncaughtCase); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcDereferenceInvalidObject); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcCantCompareIterators); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcNeighborIsCoarser); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcNeighborIsNotCoarser); + /** + * @ingroup Exceptions + */ + DeclException0 (ExcFacesHaveNoLevel); +} + + /** * Implements the accessor class used by TriaRawIterator and derived * classes. @@ -242,67 +305,6 @@ class TriaAccessor const Triangulation & get_triangulation () const; /*@}*/ - - /**@name Exceptions for derived classes - */ - /*@{*/ - /** - * @ingroup Exceptions - */ - DeclException0 (ExcCellNotUsed); - /** - * @ingroup Exceptions - */ - DeclException1 (ExcInvalidNeighbor, - int, - << "Neighbor indices must be between 0 and 2^dim-1, but " - << "yours was " << arg1); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcCellHasNoChildren); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcUnusedCellAsChild); - /** - * @ingroup Exceptions - */ - DeclException1 (ExcCantSetChildren, - int, - << "You can only set the child index if the cell has no " - << "children, or clear it. The given " - << "index was " << arg1 << " (-1 means: clear children)"); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcUnusedCellAsNeighbor); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcUncaughtCase); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcDereferenceInvalidObject); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcCantCompareIterators); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcNeighborIsCoarser); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcNeighborIsNotCoarser); - /** - * @ingroup Exceptions - */ - DeclException0 (ExcFacesHaveNoLevel); - /*@}*/ - protected: /** * Used to store the level 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 ca3258bd5b..6482a58718 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.templates.h +++ b/deal.II/deal.II/include/grid/tria_accessor.templates.h @@ -60,7 +60,7 @@ inline bool TriaAccessor::operator == (const TriaAccessor &a) const { - Assert (tria == a.tria, ExcCantCompareIterators()); + Assert (tria == a.tria, TriaAccessorExceptions::ExcCantCompareIterators()); return ((present_index == a.present_index) && (present_level == a.present_level)); } @@ -72,7 +72,7 @@ inline bool TriaAccessor::operator != (const TriaAccessor &a) const { - Assert (tria == a.tria, ExcCantCompareIterators()); + Assert (tria == a.tria, TriaAccessorExceptions::ExcCantCompareIterators()); return ((present_index != a.present_index) || (present_level != a.present_level)); } @@ -169,7 +169,7 @@ inline int TriaObjectAccessor<1,dim>::level () const { - Assert(dim==1, typename TriaAccessor::ExcFacesHaveNoLevel()); + Assert(dim==1, TriaAccessorExceptions::ExcFacesHaveNoLevel()); return TriaAccessor::level(); } @@ -181,7 +181,7 @@ bool TriaObjectAccessor<1,dim>::used () const { Assert (this->state() == IteratorState::valid, - typename TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); return lines().used[this->present_index]; } @@ -192,7 +192,7 @@ inline bool TriaObjectAccessor<1,dim>::user_flag_set () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return lines().user_flags[this->present_index]; } @@ -203,7 +203,7 @@ inline void TriaObjectAccessor<1,dim>::set_user_flag () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); lines().user_flags[this->present_index] = true; } @@ -214,7 +214,7 @@ inline void TriaObjectAccessor<1,dim>::clear_user_flag () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); lines().user_flags[this->present_index] = false; } @@ -226,7 +226,7 @@ bool TriaObjectAccessor<1,dim>::has_children () const { Assert (this->state() == IteratorState::valid, - typename TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); return (lines().children[this->present_index] != -1); } @@ -238,7 +238,7 @@ int TriaObjectAccessor<1,dim>::child_index (unsigned const int i) const { Assert (i<2, ExcIndexRange(i,0,2)); - Assert (has_children(), typename TriaAccessor::ExcCellHasNoChildren()); + Assert (has_children(), TriaAccessorExceptions::ExcCellHasNoChildren()); return lines().children[this->present_index]+i; } @@ -260,7 +260,7 @@ TriaObjectAccessor<1,dim>::child (const unsigned int i) const q (this->tria, next_level, child_index (i)); Assert ((q.state() == IteratorState::past_the_end) || q->used(), - typename TriaAccessor::ExcUnusedCellAsChild()); + TriaAccessorExceptions::ExcUnusedCellAsChild()); return q; } @@ -272,7 +272,7 @@ inline unsigned int TriaObjectAccessor<1,dim>::n_children () const { - Assert (has_children()==true, TriaAccessor<1>::ExcCellHasNoChildren()); + Assert (has_children()==true, TriaAccessorExceptions::ExcCellHasNoChildren()); return GeometryInfo<1>::children_per_cell; } @@ -459,7 +459,7 @@ inline int TriaObjectAccessor<2,dim>::level () const { - Assert(dim==2, typename TriaAccessor::ExcFacesHaveNoLevel()); + Assert(dim==2, TriaAccessorExceptions::ExcFacesHaveNoLevel()); return TriaAccessor::level(); } @@ -471,7 +471,7 @@ bool TriaObjectAccessor<2,dim>::used () const { Assert (this->state() == IteratorState::valid, - typename TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); return quads().used[this->present_index]; } @@ -482,7 +482,7 @@ inline bool TriaObjectAccessor<2,dim>::user_flag_set () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return quads().user_flags[this->present_index]; } @@ -493,7 +493,7 @@ inline void TriaObjectAccessor<2,dim>::set_user_flag () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); quads().user_flags[this->present_index] = true; } @@ -504,7 +504,7 @@ inline void TriaObjectAccessor<2,dim>::clear_user_flag () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); quads().user_flags[this->present_index] = false; } @@ -543,7 +543,7 @@ bool TriaObjectAccessor<2,dim>::has_children () const { Assert (this->state() == IteratorState::valid, - typename TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); return (quads().children[this->present_index] != -1); } @@ -554,7 +554,7 @@ inline int TriaObjectAccessor<2,dim>::child_index (const unsigned int i) const { Assert (i<4, ExcIndexRange(i,0,4)); - Assert (has_children(), typename TriaAccessor::ExcCellHasNoChildren()); + Assert (has_children(), TriaAccessorExceptions::ExcCellHasNoChildren()); return quads().children[this->present_index]+i; } @@ -576,7 +576,7 @@ TriaObjectAccessor<2,dim>::child (const unsigned int i) const q (this->tria, next_level, child_index (i)); Assert ((q.state() == IteratorState::past_the_end) || q->used(), - typename TriaAccessor::ExcUnusedCellAsChild()); + TriaAccessorExceptions::ExcUnusedCellAsChild()); return q; } @@ -588,7 +588,7 @@ inline unsigned int TriaObjectAccessor<2,dim>::n_children () const { - Assert (has_children()==true, TriaAccessor<2>::ExcCellHasNoChildren()); + Assert (has_children()==true, TriaAccessorExceptions::ExcCellHasNoChildren()); return GeometryInfo<2>::children_per_cell; } @@ -644,12 +644,11 @@ inline bool TriaObjectAccessor<2,3>::line_orientation (const unsigned int line) const { - // we cannot usae the quads() function here, + // we cannot use the quads() function here, // since it returns a reference to // TriaObjects, but we need a // (reference to) TriaObjectsQuad3D - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (line::lines_per_cell, ExcIndexRange (line, 0, GeometryInfo<2>::lines_per_cell)); Assert (this->present_index * GeometryInfo<2>::lines_per_cell + line @@ -774,9 +773,8 @@ inline bool TriaObjectAccessor<3,3>::used () const { - const int dim=3; Assert (this->state() == IteratorState::valid, - TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); return this->tria->levels[this->present_level]->hexes.used[this->present_index]; } @@ -787,9 +785,8 @@ inline bool TriaObjectAccessor<3,3>::user_flag_set () const { - const int dim=3; - Assert (this->used(), TriaAccessor::ExcCellNotUsed()); - return this->tria->levels[this->present_level]->hexes.user_flags[this->present_index]; + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); + return this->tria->levels[this->present_level]->hexes.user_flags[this->present_index]; } @@ -799,9 +796,8 @@ inline void TriaObjectAccessor<3,3>::set_user_flag () const { - const int dim=3; - Assert (this->used(), TriaAccessor::ExcCellNotUsed()); - this->tria->levels[this->present_level]->hexes.user_flags[this->present_index] = true; + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); + this->tria->levels[this->present_level]->hexes.user_flags[this->present_index] = true; } @@ -810,9 +806,8 @@ template <> inline void TriaObjectAccessor<3,3>::clear_user_flag () const { - const int dim=3; - Assert (this->used(), TriaAccessor::ExcCellNotUsed()); - this->tria->levels[this->present_level]->hexes.user_flags[this->present_index] = false; + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); + this->tria->levels[this->present_level]->hexes.user_flags[this->present_index] = false; } @@ -822,7 +817,7 @@ inline TriaIterator > TriaObjectAccessor<3,dim>::line (const unsigned int i) const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return TriaIterator > ( @@ -839,7 +834,7 @@ inline TriaIterator > TriaObjectAccessor<3,dim>::quad (const unsigned int i) const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return TriaIterator > ( @@ -917,9 +912,8 @@ inline bool TriaObjectAccessor<3,3>::has_children () const { - const int dim=3; Assert (this->state() == IteratorState::valid, - TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); return (this->tria->levels[this->present_level]->hexes.children[this->present_index] != -1); } @@ -928,9 +922,8 @@ template <> inline int TriaObjectAccessor<3,3>::child_index (const unsigned int i) const { - const int dim=3; Assert (i<8, ExcIndexRange(i,0,8)); - Assert (has_children(), TriaAccessor::ExcCellHasNoChildren()); + Assert (has_children(), TriaAccessorExceptions::ExcCellHasNoChildren()); return this->tria->levels[this->present_level]->hexes.children[this->present_index]+i; } @@ -947,7 +940,7 @@ TriaObjectAccessor<3,3>::child (const unsigned int i) const TriaIterator > q (this->tria, this->present_level+1, child_index (i)); Assert ((q.state() == IteratorState::past_the_end) || q->used(), - TriaAccessor::ExcUnusedCellAsChild()); + TriaAccessorExceptions::ExcUnusedCellAsChild()); return q; } @@ -959,7 +952,7 @@ inline unsigned int TriaObjectAccessor<3,dim>::n_children () const { - Assert (has_children()==true, TriaAccessor<3>::ExcCellHasNoChildren()); + Assert (has_children()==true, TriaAccessorExceptions::ExcCellHasNoChildren()); return GeometryInfo<3>::children_per_cell; } @@ -994,8 +987,7 @@ bool TriaObjectAccessor<3, 3>:: face_orientation (const unsigned int face) const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (face::faces_per_cell, ExcIndexRange (face, 0, GeometryInfo<3>::faces_per_cell)); Assert (this->present_index * GeometryInfo<3>::faces_per_cell + face @@ -1016,8 +1008,7 @@ bool TriaObjectAccessor<3, 3>:: face_flip (const unsigned int face) const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (face::faces_per_cell, ExcIndexRange (face, 0, GeometryInfo<3>::faces_per_cell)); Assert (this->present_index * GeometryInfo<3>::faces_per_cell + face @@ -1038,8 +1029,7 @@ bool TriaObjectAccessor<3, 3>:: face_rotation (const unsigned int face) const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (face::faces_per_cell, ExcIndexRange (face, 0, GeometryInfo<3>::faces_per_cell)); Assert (this->present_index * GeometryInfo<3>::faces_per_cell + face @@ -1061,7 +1051,7 @@ TriaObjectAccessor<3, 3>:: line_orientation (const unsigned int line) const { const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (line::lines_per_cell, ExcIndexRange (line, 0, GeometryInfo<3>::lines_per_cell)); @@ -1248,7 +1238,7 @@ int CellAccessor::neighbor_index (const unsigned int i) const { Assert (i::faces_per_cell, - typename TriaAccessor::ExcInvalidNeighbor(i)); + TriaAccessorExceptions::ExcInvalidNeighbor(i)); return this->tria->levels[this->present_level]-> neighbors[this->present_index*GeometryInfo::faces_per_cell+i].second; } @@ -1261,7 +1251,7 @@ int CellAccessor::neighbor_level (const unsigned int i) const { Assert (i::faces_per_cell, - typename TriaAccessor::ExcInvalidNeighbor(i)); + TriaAccessorExceptions::ExcInvalidNeighbor(i)); return this->tria->levels[this->present_level]-> neighbors[this->present_index*GeometryInfo::faces_per_cell+i].first; } @@ -1273,7 +1263,7 @@ inline bool CellAccessor::refine_flag_set () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); // cells flagged for refinement must be active // (the @p set_refine_flag function checks this, // but activity may change when refinement is @@ -1316,7 +1306,7 @@ inline bool CellAccessor::coarsen_flag_set () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); // cells flagged for coarsening must be active // (the @p set_refine_flag function checks this, // but activity may change when refinement is @@ -1362,7 +1352,7 @@ CellAccessor::neighbor (const unsigned int i) const q (this->tria, neighbor_level (i), neighbor_index (i)); Assert ((q.state() == IteratorState::past_the_end) || q->used(), - typename TriaAccessor::ExcUnusedCellAsNeighbor()); + TriaAccessorExceptions::ExcUnusedCellAsNeighbor()); return q; } @@ -1378,7 +1368,7 @@ CellAccessor::child (const unsigned int i) const q (this->tria, this->present_level+1, this->child_index (i)); Assert ((q.state() == IteratorState::past_the_end) || q->used(), - typename TriaAccessor::ExcUnusedCellAsChild()); + TriaAccessorExceptions::ExcUnusedCellAsChild()); return q; } diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index c10307c352..2eb7f3e7c0 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -68,7 +68,7 @@ template void TriaObjectAccessor<1, dim>::set_used_flag () const { Assert (this->state() == IteratorState::valid, - typename TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); lines().used[this->present_index] = true; } @@ -78,7 +78,7 @@ template void TriaObjectAccessor<1, dim>::clear_used_flag () const { Assert (this->state() == IteratorState::valid, - typename TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); lines().used[this->present_index] = false; } @@ -111,7 +111,7 @@ void TriaObjectAccessor<1, dim>::recursively_clear_user_flag () const template void TriaObjectAccessor<1, dim>::set_user_pointer (void *p) const { - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); lines().user_pointers[this->present_index] = p; } @@ -120,7 +120,7 @@ void TriaObjectAccessor<1, dim>::set_user_pointer (void *p) const template void TriaObjectAccessor<1, dim>::clear_user_pointer () const { - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); lines().user_pointers[this->present_index] = 0; } @@ -129,7 +129,7 @@ void TriaObjectAccessor<1, dim>::clear_user_pointer () const template void * TriaObjectAccessor<1, dim>::user_pointer () const { - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); return lines().user_pointers[this->present_index]; } @@ -164,10 +164,10 @@ TriaObjectAccessor<1, dim>::recursively_clear_user_pointer () const template void TriaObjectAccessor<1, dim>::set_children (const int index) const { - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert ((index==-1) || (!has_children() && (index>=0)), - typename TriaAccessor::ExcCantSetChildren(index)); + TriaAccessorExceptions::ExcCantSetChildren(index)); lines().children[this->present_index] = index; } @@ -186,7 +186,7 @@ template unsigned char TriaObjectAccessor<1, dim>::boundary_indicator () const { Assert (dim>=2, ExcImpossibleInDim(dim)); - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); return lines().material_id[this->present_index]; } @@ -197,7 +197,7 @@ template void TriaObjectAccessor<1, dim>::set_boundary_indicator (const unsigned char boundary_ind) const { Assert (dim>=2, ExcImpossibleInDim(dim)); - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); lines().material_id[this->present_index] = boundary_ind; } @@ -312,7 +312,7 @@ void TriaObjectAccessor<2, dim>::set_used_flag () const { Assert (this->state() == IteratorState::valid, - typename TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); quads().used[this->present_index] = true; } @@ -322,7 +322,7 @@ template void TriaObjectAccessor<2, dim>::clear_used_flag () const { Assert (this->state() == IteratorState::valid, - typename TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); quads().used[this->present_index] = false; } @@ -355,7 +355,7 @@ void TriaObjectAccessor<2, dim>::recursively_clear_user_flag () const template void TriaObjectAccessor<2, dim>::set_user_pointer (void *p) const { - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); quads().user_pointers[this->present_index] = p; } @@ -364,7 +364,7 @@ void TriaObjectAccessor<2, dim>::set_user_pointer (void *p) const template void TriaObjectAccessor<2, dim>::clear_user_pointer () const { - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); quads().user_pointers[this->present_index] = 0; } @@ -373,7 +373,7 @@ void TriaObjectAccessor<2, dim>::clear_user_pointer () const template void * TriaObjectAccessor<2, dim>::user_pointer () const { - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); return quads().user_pointers[this->present_index]; } @@ -409,10 +409,10 @@ template void TriaObjectAccessor<2, dim>::set_children (const int index) const { Assert (used(), - typename TriaAccessor::ExcCellNotUsed()); + TriaAccessorExceptions::ExcCellNotUsed()); Assert ((index==-1) || (!has_children() && (index>=0)), - typename TriaAccessor::ExcCantSetChildren(index)); + TriaAccessorExceptions::ExcCantSetChildren(index)); quads().children[this->present_index] = index; } @@ -431,7 +431,7 @@ template unsigned char TriaObjectAccessor<2, dim>::boundary_indicator () const { Assert (dim>2, ExcImpossibleInDim(dim)); - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); return quads().material_id[this->present_index]; } @@ -442,7 +442,7 @@ template void TriaObjectAccessor<2, dim>::set_boundary_indicator (const unsigned char boundary_ind) const { Assert (dim>2, ExcImpossibleInDim(dim)); - Assert (used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); quads().material_id[this->present_index] = boundary_ind; } @@ -708,7 +708,7 @@ set_line_orientation (const unsigned int line, const bool orientation) const { const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (line::lines_per_face, ExcIndexRange (line, 0, GeometryInfo<3>::lines_per_face)); Assert (this->present_index * GeometryInfo::lines_per_face + line @@ -782,9 +782,8 @@ TriaObjectAccessor<3, dim>::vertex (const unsigned int i) const template <> void TriaObjectAccessor<3, 3>::set_used_flag () const { - const int dim=3; Assert (this->state() == IteratorState::valid, - TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); this->tria->levels[this->present_level]->hexes.used[this->present_index] = true; } @@ -792,9 +791,8 @@ void TriaObjectAccessor<3, 3>::set_used_flag () const template <> void TriaObjectAccessor<3, 3>::clear_used_flag () const { - const int dim=3; Assert (this->state() == IteratorState::valid, - TriaAccessor::ExcDereferenceInvalidObject()); + TriaAccessorExceptions::ExcDereferenceInvalidObject()); this->tria->levels[this->present_level]->hexes.used[this->present_index] = false; } @@ -829,8 +827,7 @@ void TriaObjectAccessor<3, dim>::recursively_clear_user_flag () const template <> void TriaObjectAccessor<3, 3>::set_user_pointer (void *p) const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); this->tria->levels[this->present_level]->hexes.user_pointers[this->present_index] = p; } @@ -838,8 +835,7 @@ void TriaObjectAccessor<3, 3>::set_user_pointer (void *p) const template <> void TriaObjectAccessor<3, 3>::clear_user_pointer () const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); this->tria->levels[this->present_level]->hexes.user_pointers[this->present_index] = 0; } @@ -847,8 +843,7 @@ void TriaObjectAccessor<3, 3>::clear_user_pointer () const template <> void * TriaObjectAccessor<3, 3>::user_pointer () const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); return this->tria->levels[this->present_level]->hexes.user_pointers[this->present_index]; } @@ -885,11 +880,10 @@ TriaObjectAccessor<3, dim>::recursively_clear_user_pointer () const template <> void TriaObjectAccessor<3, 3>::set_children (const int index) const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert ((index==-1) || (!has_children() && (index>=0)), - TriaAccessor::ExcCantSetChildren(index)); + TriaAccessorExceptions::ExcCantSetChildren(index)); this->tria->levels[this->present_level]->hexes.children[this->present_index] = index; } @@ -1670,8 +1664,7 @@ TriaObjectAccessor<3, 3>:: set_face_orientation (const unsigned int face, const bool orientation) const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (face::faces_per_cell, ExcIndexRange (face, 0, GeometryInfo<3>::faces_per_cell)); Assert (this->present_index * GeometryInfo<3>::faces_per_cell + face @@ -1693,8 +1686,7 @@ TriaObjectAccessor<3, 3>:: set_face_flip (const unsigned int face, const bool flip) const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (face::faces_per_cell, ExcIndexRange (face, 0, GeometryInfo<3>::faces_per_cell)); Assert (this->present_index * GeometryInfo<3>::faces_per_cell + face @@ -1716,8 +1708,7 @@ TriaObjectAccessor<3, 3>:: set_face_rotation (const unsigned int face, const bool rotation) const { - const int dim=3; - Assert (used(), TriaAccessor::ExcCellNotUsed()); + Assert (used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (face::faces_per_cell, ExcIndexRange (face, 0, GeometryInfo<3>::faces_per_cell)); Assert (this->present_index * GeometryInfo<3>::faces_per_cell + face @@ -1773,7 +1764,7 @@ bool CellAccessor<1>::at_boundary () const template <> unsigned char CellAccessor<1>::material_id () const { - Assert (this->used(), TriaAccessor<1>::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return lines().material_id[this->present_index]; } @@ -1782,7 +1773,7 @@ unsigned char CellAccessor<1>::material_id () const template <> void CellAccessor<1>::set_material_id (const unsigned char mat_id) const { - Assert (this->used(), TriaAccessor<1>::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); lines().material_id[this->present_index] = mat_id; } @@ -1837,7 +1828,7 @@ bool CellAccessor<2>::at_boundary () const template <> unsigned char CellAccessor<2>::material_id () const { - Assert (this->used(), TriaAccessor<2>::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return quads().material_id[this->present_index]; } @@ -1846,7 +1837,7 @@ unsigned char CellAccessor<2>::material_id () const template <> void CellAccessor<2>::set_material_id (const unsigned char mat_id) const { - Assert (this->used(), TriaAccessor<2>::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); quads().material_id[this->present_index] = mat_id; } @@ -1940,14 +1931,14 @@ bool CellAccessor<3>::at_boundary () const template <> unsigned char CellAccessor<3>::material_id () const { - Assert (this->used(), TriaAccessor<3>::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return this->tria->levels[this->present_level]->hexes.material_id[this->present_index]; } template <> void CellAccessor<3>::set_material_id (const unsigned char mat_id) const { - Assert (this->used(), TriaAccessor<3>::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); this->tria->levels[this->present_level]->hexes.material_id[this->present_index] = mat_id; } @@ -2012,7 +2003,7 @@ bool CellAccessor<3>::point_inside (const Point<3> &p) const template unsigned int CellAccessor::subdomain_id () const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); return this->tria->levels[this->present_level]->subdomain_ids[this->present_index]; } @@ -2022,7 +2013,7 @@ template void CellAccessor::set_subdomain_id (const unsigned int new_subdomain_id) const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); this->tria->levels[this->present_level]->subdomain_ids[this->present_index] = new_subdomain_id; } @@ -2034,7 +2025,7 @@ void CellAccessor::set_neighbor (const unsigned int i, const TriaIterator > &pointer) const { Assert (i::faces_per_cell, - typename TriaAccessor::ExcInvalidNeighbor(i)); + TriaAccessorExceptions::ExcInvalidNeighbor(i)); if (pointer.state() == IteratorState::valid) { @@ -2064,9 +2055,9 @@ unsigned int CellAccessor::neighbor_of_neighbor (const unsigned int neighbo // make sure that the neighbor is // not on a coarser level Assert (neighbor_level(neighbor) == this->present_level, - typename TriaAccessor::ExcNeighborIsCoarser()); + TriaAccessorExceptions::ExcNeighborIsCoarser()); Assert (neighbor < GeometryInfo::faces_per_cell, - typename TriaAccessor::ExcInvalidNeighbor(neighbor)); + TriaAccessorExceptions::ExcInvalidNeighbor(neighbor)); const TriaIterator > neighbor_cell = this->neighbor(neighbor); @@ -2117,9 +2108,9 @@ CellAccessor::neighbor_of_coarser_neighbor (const unsigned int neighbor) co // make sure that the neighbor is // on a coarser level Assert (neighbor_level(neighbor) < this->present_level, - typename TriaAccessor::ExcNeighborIsNotCoarser()); + TriaAccessorExceptions::ExcNeighborIsNotCoarser()); Assert (neighbor < GeometryInfo::faces_per_cell, - typename TriaAccessor::ExcInvalidNeighbor(neighbor)); + TriaAccessorExceptions::ExcInvalidNeighbor(neighbor)); const TriaIterator > this_face=face(neighbor); const TriaIterator > neighbor_cell = this->neighbor(neighbor); @@ -2178,7 +2169,7 @@ CellAccessor::neighbor_of_coarser_neighbor (const unsigned int neighbor) co template bool CellAccessor::at_boundary (const unsigned int i) const { - Assert (this->used(), typename TriaAccessor::ExcCellNotUsed()); + Assert (this->used(), TriaAccessorExceptions::ExcCellNotUsed()); Assert (i::faces_per_cell, ExcIndexRange (i,0,GeometryInfo::faces_per_cell)); diff --git a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc index d281a0daec..1e0ba45598 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc @@ -176,7 +176,7 @@ MGDoFAccessor::child (const unsigned int i) const Assert ((q.state() == IteratorState::past_the_end) || q->used(), - typename TriaAccessor::ExcUnusedCellAsChild()); + TriaAccessorExceptions::ExcUnusedCellAsChild()); return q; } @@ -550,7 +550,7 @@ MGDoFCellAccessor::neighbor (const unsigned int i) const #ifdef DEBUG if (q.state() != IteratorState::past_the_end) - Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsNeighbor()); + Assert (q->used(), TriaAccessorExceptions::ExcUnusedCellAsNeighbor()); #endif return q; } @@ -567,7 +567,7 @@ MGDoFCellAccessor::child (const unsigned int i) const #ifdef DEBUG if (q.state() != IteratorState::past_the_end) - Assert (q->used(), typename TriaAccessor::ExcUnusedCellAsChild()); + Assert (q->used(), TriaAccessorExceptions::ExcUnusedCellAsChild()); #endif return q; } -- 2.39.5