use the generally used and more accurate structdim instead of celldim

git-svn-id: https://svn.dealii.org/trunk@21058 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h
index d5266997dc452d344e0d49d5e3c07c549b4fac95..dcddcae4b4ff107581544490bc181485d0985c6d 100644 (file)
--- a/deal.II/deal.II/include/dofs/dof_accessor.h
+++ b/deal.II/deal.II/include/dofs/dof_accessor.h
@@ -66,11 +66,11 @@ namespace internal
 /**
  * This is a switch class which only declares a @p typedef. It is meant to
  * determine which class a DoFAccessor class is to be derived from. By
- * default, <tt>DoFAccessor@<celldim,dim,spacedim@></tt> derives from the
+ * default, <tt>DoFAccessor@<structdim,dim,spacedim@></tt> derives from the
  * typedef in the general
- * <tt>Inheritance@<celldim,dim,spacedim@></tt> class, which is
- * <tt>TriaAccessor@<celldim,dim,spacedim@></tt>, but if
- * <tt>celldim==dim</tt>, then the specialization
+ * <tt>Inheritance@<structdim,dim,spacedim@></tt> class, which is
+ * <tt>TriaAccessor@<structdim,dim,spacedim@></tt>, but if
+ * <tt>structdim==dim</tt>, then the specialization
  * <tt>Inheritance@<dim,dim,spacedim@></tt> is used which declares
  * its local type to be <tt>CellAccessor@<dim,spacedim@></tt>. Therefore, the
  * inheritance is automatically chosen to be from CellAccessor if the object
@@ -80,7 +80,7 @@ namespace internal
  * @ingroup Accessors 
  * @author Wolfgang Bangerth, 1999
  */
-    template <int celldim, int dim, int spacedim>
+    template <int structdim, int dim, int spacedim>
     struct Inheritance 
     {
                                         /**
@@ -88,7 +88,7 @@ namespace internal
                                          * See the full documentation for
                                          * more information.
                                          */
-       typedef dealii::TriaAccessor<celldim,dim,spacedim> BaseClass;
+       typedef dealii::TriaAccessor<structdim,dim,spacedim> BaseClass;
     };
 
 

diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h
index 9c4657b98068a121b49fc618065c48450a9d9787..705777b361ef305ec0ee15e4213a9c571847cea3 100644 (file)
--- a/deal.II/deal.II/include/grid/tria_accessor.h
+++ b/deal.II/deal.II/include/grid/tria_accessor.h
@@ -113,7 +113,7 @@ namespace internal
 
   }
 }
-template <int celldim, int dim, int spacedim>  class TriaAccessor;
+template <int structdim, int dim, int spacedim>        class TriaAccessor;
 template <int dim, int spacedim>               class TriaAccessor<0, dim, spacedim>;
 
 // note: the file tria_accessor.templates.h is included at the end of
@@ -1045,7 +1045,7 @@ class TriaAccessor : public TriaAccessorBase<structdim, dim, spacedim>
                                      * boundary. Obviously, the use of this
                                      * function is only possible for
                                      * <tt>dim@>structdim</tt>; however, for
-                                     * <tt>dim==celldim</tt>, an object is a
+                                     * <tt>dim==structdim</tt>, an object is a
                                      * cell and the CellAccessor class offers
                                      * another possibility to determine
                                      * whether a cell is at the boundary or
@@ -1322,7 +1322,7 @@ class TriaAccessor : public TriaAccessorBase<structdim, dim, spacedim>
                                      *
                                      * It is only possible to set the
                                      * line_orientation of faces in 3d
-                                     * (i.e. <code>celldim==2 &&
+                                     * (i.e. <code>structdim==2 &&
                                      * dim==3</code>).
                                       */
     void set_line_orientation (const unsigned int line,
@@ -1357,7 +1357,7 @@ class TriaAccessor : public TriaAccessorBase<structdim, dim, spacedim>
                                      *
                                      * It is only possible to set the
                                      * face_orientation of cells in 3d
-                                     * (i.e. <code>celldim==3 &&
+                                     * (i.e. <code>structdim==3 &&
                                      * dim==3</code>).
                                       */
     void set_face_flip (const unsigned int face,
@@ -1370,7 +1370,7 @@ class TriaAccessor : public TriaAccessorBase<structdim, dim, spacedim>
                                      *
                                      * It is only possible to set the
                                      * face_orientation of cells in 3d
-                                     * (i.e. <code>celldim==3 &&
+                                     * (i.e. <code>structdim==3 &&
                                      * dim==3</code>).
                                       */
     void set_face_rotation (const unsigned int face,
@@ -1394,7 +1394,7 @@ class TriaAccessor : public TriaAccessorBase<structdim, dim, spacedim>
                                      * Set the @p RefinementCase<dim> this
                                      * TriaObject is refined with.
                                      * Not defined for
-                                     * <tt>celldim=1</tt> as lines
+                                     * <tt>structdim=1</tt> as lines
                                      * are always refined resulting
                                      * in 2 children lines (isotropic
                                      * refinement).

diff --git a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h
index 01a42d0fa0511526157695d9a34474f2db6d9af2..12f2feffedada1e260de8918f09516abddfadcb4 100644 (file)
--- a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h
+++ b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h
@@ -22,7 +22,7 @@ DEAL_II_NAMESPACE_OPEN
 
 template <int dim, int spacedim> class MGDoFHandler;
 
-template <int celldim, int dim, int spacedim=dim> class MGDoFAccessor;
+template <int structdim, int dim, int spacedim=dim> class MGDoFAccessor;
 
 namespace internal
 {
@@ -44,17 +44,17 @@ namespace internal
 /**
  * This is a switch class which only declares a @p typedef. It is meant to
  * determine which class aMGDoFAccessor class is to be derived
- * from. By default, <tt>MGDoFAccessor<celldim,dim></tt> derives from
- * the @p typedef in the general <tt>MGDoFAccessor_Inheritance<celldim,dim></tt>
- * class, which is <tt>DoFAccessor<celldim,dim></tt>,
- * but if <tt>celldim==dim</tt>, then the specialization <tt>MGDoFAccessor_Inheritance<dim,dim></tt>
+ * from. By default, <tt>MGDoFAccessor<structdim,dim></tt> derives from
+ * the @p typedef in the general <tt>MGDoFAccessor_Inheritance<structdim,dim></tt>
+ * class, which is <tt>DoFAccessor<structdim,dim></tt>,
+ * but if <tt>structdim==dim</tt>, then the specialization <tt>MGDoFAccessor_Inheritance<dim,dim></tt>
  * is used which declares its local type to be <tt>DoFCellAccessor<dim></tt>. Therefore,
  * the inheritance is automatically chosen to be from @p DoFCellAccessor if the
  * object under consideration has full dimension, i.e. constitutes a cell.
  *
  * @author Wolfgang Bangerth, 1999
  */
-    template <int celldim, int dim, int spacedim>
+    template <int structdim, int dim, int spacedim>
     struct Inheritance
     {
                                         /**
@@ -62,7 +62,7 @@ namespace internal
                                          * See the full documentation for
                                          * more information.
                                          */
-       typedef dealii::DoFAccessor<celldim, dealii::DoFHandler<dim,spacedim> > BaseClass;
+       typedef dealii::DoFAccessor<structdim, dealii::DoFHandler<dim,spacedim> > BaseClass;
     };
 
 
@@ -71,9 +71,9 @@ namespace internal
  * meant to determine which class a DoFAccessor class is to be
  * derived from. By default, DoFAccessor<structdim,dim>
  * derives from the @p typedef in the general
- * <tt>DoFAccessor_Inheritance<celldim,dim></tt> class, which is
- * <tt>TriaAccessor<celldim,dim></tt>, but if
- * <tt>celldim==dim</tt>, then the specialization
+ * <tt>DoFAccessor_Inheritance<structdim,dim></tt> class, which is
+ * <tt>TriaAccessor<structdim,dim></tt>, but if
+ * <tt>structdim==dim</tt>, then the specialization
  * <tt>TriaAccessor<dim,dim></tt> is used which declares its
  * local type to be <tt>CellAccessor<dim></tt>. Therefore, the
  * inheritance is automatically chosen to be from @p CellAccessor if

diff --git a/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h b/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h
index 2d4a59941078b79887bd740bc61ea9eb1c8c171e..bcbdc8fbfc4f6b23803cb3bf88891e296232207e 100644 (file)
--- a/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h
+++ b/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h
@@ -19,7 +19,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template <int celldim, int dim, int spacedim> class MGDoFAccessor;
+template <int structdim, int dim, int spacedim> class MGDoFAccessor;
 template <int dim, int spacedim> class MGDoFCellAccessor;
 template <int, int, int> class InvalidAccessor;