]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make more conforming to our coding style. Move some functions to inlined rather than...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 17 Oct 2003 15:36:27 +0000 (15:36 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 17 Oct 2003 15:36:27 +0000 (15:36 +0000)
git-svn-id: https://svn.dealii.org/trunk@8100 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/dofs/dof_accessor.h
deal.II/deal.II/include/dofs/dof_accessor.templates.h
deal.II/deal.II/include/grid/tria_accessor.h

index a41663021eba77ef97fcc0418ad03300f64308cc..ba7f4edcc8a122b05fa0582457e394dd7bb47e24 100644 (file)
@@ -269,9 +269,7 @@ class DoFObjectAccessor : public DoFAccessor<dim>,
     DoFObjectAccessor (const Triangulation<dim> *tria,
                       const int                 level,
                       const int                 index,
-                      const AccessorData       *local_data) :
-                   DoFAccessor<dim> (local_data),
-      DoFObjectAccessor_Inheritance<celldim,dim>::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<dim>,
     DoFObjectAccessor (const Triangulation<dim> *tria,
                       const int                 level,
                       const int                 index,
-                      const AccessorData       *local_data) :
-                   DoFAccessor<dim> (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<dim>,
     DoFObjectAccessor (const Triangulation<dim> *tria,
                       const int                 level,
                       const int                 index,
-                      const AccessorData       *local_data) :
-                   DoFAccessor<dim> (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<dim>,
     DoFObjectAccessor (const Triangulation<dim> *tria,
                       const int                 level,
                       const int                 index,
-                      const AccessorData       *local_data) :
-                   DoFAccessor<dim> (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<dim, dim>
     DoFCellAccessor (const Triangulation<dim> *tria,
                     const int                 level,
                     const int                 index,
-                    const AccessorData       *local_data) :
-                   DoFObjectAccessor<dim, dim> (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<dim, dim>
                                      * class returns a cell accessor without
                                      * access to the DoF data.
                                      */
-    TriaIterator<dim,DoFCellAccessor<dim> > neighbor (const unsigned int) const;
+    TriaIterator<dim,DoFCellAccessor<dim> >
+    neighbor (const unsigned int) const;
 
                                     /**
                                      * Return the @p{i}th child as a DoF cell
@@ -1129,7 +1121,8 @@ class DoFCellAccessor :  public DoFObjectAccessor<dim, dim>
                                      * class returns a cell accessor without
                                      * access to the DoF data.
                                      */
-    TriaIterator<dim,DoFCellAccessor<dim> > child (const unsigned int) const;
+    TriaIterator<dim,DoFCellAccessor<dim> >
+    child (const unsigned int) const;
 
                                     /**
                                      * Return an iterator to the @p{i}th face
@@ -1138,7 +1131,8 @@ class DoFCellAccessor :  public DoFObjectAccessor<dim, dim>
                                      * This function is not implemented in 1D,
                                      * and maps to DoFObjectAccessor<2, dim>::line in 2D.
                                      */
-    TriaIterator<dim, DoFObjectAccessor<dim-1, dim> > face (const unsigned int i) const;
+    TriaIterator<dim, DoFObjectAccessor<dim-1, dim> >
+    face (const unsigned int i) const;
 
                                     /**
                                      * Return the interpolation of the given
index b430ab0a917558fc837b83250d1f0e53c845f2c0..c7102e908e8ee430817889d222c1ac7f677f316d 100644 (file)
@@ -88,6 +88,24 @@ DoFAccessor<dim>::operator = (const DoFAccessor<dim> &da)
 
 /*------------------------- Functions: DoFObjectAccessor<1,dim> -----------------------*/
 
+
+
+template <int dim>
+inline
+DoFObjectAccessor<1,dim>::
+DoFObjectAccessor (const Triangulation<dim> *tria,
+                   const int                 level,
+                   const int                 index,
+                   const AccessorData       *local_data)
+                :
+                DoFAccessor<dim> (local_data),
+                DoFObjectAccessor_Inheritance<1,dim>::BaseClass (tria,
+                                                                 level,
+                                                                 index)
+{}
+
+
+
 template <int dim>
 inline
 unsigned int
@@ -116,6 +134,7 @@ DoFObjectAccessor<1,dim>::dof_index (const unsigned int i) const
 }
 
 
+
 template <int dim>
 inline
 unsigned int
@@ -146,6 +165,7 @@ DoFObjectAccessor<1,dim>::vertex_dof_index (const unsigned int vertex,
 }
 
 
+
 template <int dim>
 inline
 void
@@ -192,6 +212,7 @@ DoFObjectAccessor<1,dim>::get_dof_indices (std::vector<unsigned int> &dof_indice
 }
 
 
+
 template <int dim>
 inline
 TriaIterator<dim,DoFObjectAccessor<1,dim> >
@@ -210,6 +231,7 @@ DoFObjectAccessor<1,dim>::child (const unsigned int i) const
 }
 
 
+
 template <int dim>
 inline
 void
@@ -222,6 +244,22 @@ DoFObjectAccessor<1,dim>::copy_from (const DoFObjectAccessor<1,dim> &a)
 
 /*------------------------- Functions: DoFObjectAccessor<2,dim> -----------------------*/
 
+template <int dim>
+inline
+DoFObjectAccessor<2,dim>::
+DoFObjectAccessor (const Triangulation<dim> *tria,
+                   const int                 level,
+                   const int                 index,
+                   const AccessorData       *local_data)
+                :
+                DoFAccessor<dim> (local_data),
+                DoFObjectAccessor_Inheritance<2,dim>::BaseClass (tria,
+                                                                 level,
+                                                                 index)
+{}
+
+
+
 template <int dim>
 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<unsigned int> &dof_indice
 }
 
 
+
 template <int dim>
 inline
 TriaIterator<dim,DoFObjectAccessor<1,dim> >
@@ -322,6 +361,7 @@ DoFObjectAccessor<2,dim>::line (const unsigned int i) const
 }
 
 
+
 template <int dim>
 inline
 TriaIterator<dim,DoFObjectAccessor<2,dim> >
@@ -340,6 +380,7 @@ DoFObjectAccessor<2,dim>::child (const unsigned int i) const
 }
 
 
+
 template <int dim>
 inline
 void
@@ -353,6 +394,22 @@ DoFObjectAccessor<2,dim>::copy_from (const DoFObjectAccessor<2,dim> &a)
 /*------------------------- Functions: DoFObjectAccessor<3,dim> -----------------------*/
 
 
+template <int dim>
+inline
+DoFObjectAccessor<3,dim>::
+DoFObjectAccessor (const Triangulation<dim> *tria,
+                   const int                 level,
+                   const int                 index,
+                   const AccessorData       *local_data)
+                :
+                DoFAccessor<dim> (local_data),
+                DoFObjectAccessor_Inheritance<3,dim>::BaseClass (tria,
+                                                                 level,
+                                                                 index)
+{}
+
+
+
 template <int dim>
 inline
 unsigned int
@@ -372,6 +429,7 @@ DoFObjectAccessor<3,dim>::dof_index (const unsigned int i) const
 }
 
 
+
 template <int dim>
 inline
 unsigned int
@@ -393,6 +451,7 @@ DoFObjectAccessor<3,dim>::vertex_dof_index (const unsigned int vertex,
 }
 
 
+
 template <int dim>
 inline
 void
@@ -457,6 +516,7 @@ DoFObjectAccessor<3,dim>::line (const unsigned int i) const
 }
 
 
+
 template <int dim>
 inline
 TriaIterator<dim,DoFObjectAccessor<2,dim> >
@@ -474,6 +534,7 @@ DoFObjectAccessor<3,dim>::quad (const unsigned int i) const
 }
 
 
+
 template <int dim>
 inline
 TriaIterator<dim,DoFObjectAccessor<3,dim> >
@@ -492,6 +553,7 @@ DoFObjectAccessor<3,dim>::child (const unsigned int i) const
 }
 
 
+
 template <int dim>
 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 <int dim>
+inline
+DoFCellAccessor<1,dim>::
+DoFCellAccessor (const Triangulation<dim> *tria,
+                 const int                 level,
+                 const int                 index,
+                 const AccessorData       *local_data)
+                :
+                DoFObjectAccessor<dim, dim> (tria,level,index,local_data)
+{}
+
+
 template <int dim>
 inline
 TriaIterator<dim,DoFCellAccessor<dim> >
index 38fa7318729a4d60a00886f984f5f6ec84fc9375..90e15c57893bd76d64bac6780ba7b86c529bf547 100644 (file)
@@ -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<dim,dim>
                                      *  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<dim,dim>
                                      *  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<dim,dim>
                                      */
     void clear_refine_flag () const;
 
-
                                     /**
                                      *  Return whether the coarsen flag
                                      *  is set or not.

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.