From 6d39cc16c9ff2417a8aa415862d52cfdbdccb938 Mon Sep 17 00:00:00 2001 From: wolf Date: Fri, 17 Oct 2003 15:36:27 +0000 Subject: [PATCH] Make more conforming to our coding style. Move some functions to inlined rather than in-class. git-svn-id: https://svn.dealii.org/trunk@8100 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_accessor.h | 28 +++---- .../include/dofs/dof_accessor.templates.h | 74 +++++++++++++++++++ deal.II/deal.II/include/grid/tria_accessor.h | 7 +- 3 files changed, 88 insertions(+), 21 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index a41663021e..ba7f4edcc8 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -269,9 +269,7 @@ class DoFObjectAccessor : public DoFAccessor, DoFObjectAccessor (const Triangulation *tria, const int level, const int index, - const AccessorData *local_data) : - DoFAccessor (local_data), - DoFObjectAccessor_Inheritance::BaseClass (tria,level,index) {}; + const AccessorData *local_data); /** * Index of the @p{i}th degree @@ -523,9 +521,7 @@ class DoFObjectAccessor<1, dim> : public DoFAccessor, DoFObjectAccessor (const Triangulation *tria, const int level, const int index, - const AccessorData *local_data) : - DoFAccessor (local_data), - DoFObjectAccessor_Inheritance<1,dim>::BaseClass (tria,level,index) {}; + const AccessorData *local_data); /** * Return the index of the @p{i}th degree @@ -711,9 +707,7 @@ class DoFObjectAccessor<2, dim> : public DoFAccessor, DoFObjectAccessor (const Triangulation *tria, const int level, const int index, - const AccessorData *local_data) : - DoFAccessor (local_data), - DoFObjectAccessor_Inheritance<2,dim>::BaseClass (tria,level,index) {}; + const AccessorData *local_data); /** * Return the index of the @p{i}th degree @@ -908,9 +902,7 @@ class DoFObjectAccessor<3, dim> : public DoFAccessor, DoFObjectAccessor (const Triangulation *tria, const int level, const int index, - const AccessorData *local_data) : - DoFAccessor (local_data), - DoFObjectAccessor_Inheritance<3,dim>::BaseClass (tria,level,index) {}; + const AccessorData *local_data); /** * Return the index of the @p{i}th degree @@ -1110,8 +1102,7 @@ class DoFCellAccessor : public DoFObjectAccessor DoFCellAccessor (const Triangulation *tria, const int level, const int index, - const AccessorData *local_data) : - DoFObjectAccessor (tria,level,index,local_data) {}; + const AccessorData *local_data); /** * Return the @p{i}th neighbor as a DoF cell @@ -1120,7 +1111,8 @@ class DoFCellAccessor : public DoFObjectAccessor * class returns a cell accessor without * access to the DoF data. */ - TriaIterator > neighbor (const unsigned int) const; + TriaIterator > + neighbor (const unsigned int) const; /** * Return the @p{i}th child as a DoF cell @@ -1129,7 +1121,8 @@ class DoFCellAccessor : public DoFObjectAccessor * class returns a cell accessor without * access to the DoF data. */ - TriaIterator > child (const unsigned int) const; + TriaIterator > + child (const unsigned int) const; /** * Return an iterator to the @p{i}th face @@ -1138,7 +1131,8 @@ class DoFCellAccessor : public DoFObjectAccessor * This function is not implemented in 1D, * and maps to DoFObjectAccessor<2, dim>::line in 2D. */ - TriaIterator > face (const unsigned int i) const; + TriaIterator > + face (const unsigned int i) const; /** * Return the interpolation of the given 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 b430ab0a91..c7102e908e 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -88,6 +88,24 @@ DoFAccessor::operator = (const DoFAccessor &da) /*------------------------- Functions: DoFObjectAccessor<1,dim> -----------------------*/ + + +template +inline +DoFObjectAccessor<1,dim>:: +DoFObjectAccessor (const Triangulation *tria, + const int level, + const int index, + const AccessorData *local_data) + : + DoFAccessor (local_data), + DoFObjectAccessor_Inheritance<1,dim>::BaseClass (tria, + level, + index) +{} + + + template inline unsigned int @@ -116,6 +134,7 @@ DoFObjectAccessor<1,dim>::dof_index (const unsigned int i) const } + template inline unsigned int @@ -146,6 +165,7 @@ DoFObjectAccessor<1,dim>::vertex_dof_index (const unsigned int vertex, } + template inline void @@ -192,6 +212,7 @@ DoFObjectAccessor<1,dim>::get_dof_indices (std::vector &dof_indice } + template inline TriaIterator > @@ -210,6 +231,7 @@ DoFObjectAccessor<1,dim>::child (const unsigned int i) const } + template inline void @@ -222,6 +244,22 @@ DoFObjectAccessor<1,dim>::copy_from (const DoFObjectAccessor<1,dim> &a) /*------------------------- Functions: DoFObjectAccessor<2,dim> -----------------------*/ +template +inline +DoFObjectAccessor<2,dim>:: +DoFObjectAccessor (const Triangulation *tria, + const int level, + const int index, + const AccessorData *local_data) + : + DoFAccessor (local_data), + DoFObjectAccessor_Inheritance<2,dim>::BaseClass (tria, + level, + index) +{} + + + template inline unsigned int DoFObjectAccessor<2,dim>::dof_index (const unsigned int i) const @@ -305,6 +343,7 @@ DoFObjectAccessor<2,dim>::get_dof_indices (std::vector &dof_indice } + template inline TriaIterator > @@ -322,6 +361,7 @@ DoFObjectAccessor<2,dim>::line (const unsigned int i) const } + template inline TriaIterator > @@ -340,6 +380,7 @@ DoFObjectAccessor<2,dim>::child (const unsigned int i) const } + template inline void @@ -353,6 +394,22 @@ DoFObjectAccessor<2,dim>::copy_from (const DoFObjectAccessor<2,dim> &a) /*------------------------- Functions: DoFObjectAccessor<3,dim> -----------------------*/ +template +inline +DoFObjectAccessor<3,dim>:: +DoFObjectAccessor (const Triangulation *tria, + const int level, + const int index, + const AccessorData *local_data) + : + DoFAccessor (local_data), + DoFObjectAccessor_Inheritance<3,dim>::BaseClass (tria, + level, + index) +{} + + + template inline unsigned int @@ -372,6 +429,7 @@ DoFObjectAccessor<3,dim>::dof_index (const unsigned int i) const } + template inline unsigned int @@ -393,6 +451,7 @@ DoFObjectAccessor<3,dim>::vertex_dof_index (const unsigned int vertex, } + template inline void @@ -457,6 +516,7 @@ DoFObjectAccessor<3,dim>::line (const unsigned int i) const } + template inline TriaIterator > @@ -474,6 +534,7 @@ DoFObjectAccessor<3,dim>::quad (const unsigned int i) const } + template inline TriaIterator > @@ -492,6 +553,7 @@ DoFObjectAccessor<3,dim>::child (const unsigned int i) const } + template void DoFObjectAccessor<3,dim>::copy_from (const DoFObjectAccessor<3,dim> &a) { @@ -503,6 +565,18 @@ void DoFObjectAccessor<3,dim>::copy_from (const DoFObjectAccessor<3,dim> &a) /*------------------------- Functions: DoFCellAccessor -----------------------*/ +template +inline +DoFCellAccessor<1,dim>:: +DoFCellAccessor (const Triangulation *tria, + const int level, + const int index, + const AccessorData *local_data) + : + DoFObjectAccessor (tria,level,index,local_data) +{} + + template inline TriaIterator > diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index 38fa731872..90e15c5789 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -147,7 +147,7 @@ class TriaAccessor * way, no matter what the type of * number of these parameters is. */ - typedef void* LocalData; + typedef void * LocalData; /**@ name Iterator address and state */ @@ -2354,7 +2354,7 @@ class CellAccessor : public TriaObjectAccessor * boundary is defined by one * face being on the * boundary. Note that this does - * not catches where only one + * not catch cases where only one * vertex of a quad or of a hex * is at the boundary, or where * only one line of a hex is at @@ -2362,7 +2362,7 @@ class CellAccessor : public TriaObjectAccessor * interiors of all faces are in * the interior of the * domain. For the latter case, - * the @p{Has_boundary_lines} + * the @p{has_boundary_lines} * function is the right one to * ask. */ @@ -2402,7 +2402,6 @@ class CellAccessor : public TriaObjectAccessor */ void clear_refine_flag () const; - /** * Return whether the coarsen flag * is set or not. -- 2.39.5