From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Mon, 9 Sep 2013 20:09:17 +0000 (+0000)
Subject: Rename a bunch of classes.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82fe50c3e5204857eefa7cc5e503d101fb9a27d6;p=dealii-svn.git

Rename a bunch of classes.

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

diff --git a/deal.II/include/deal.II/hp/dof_faces.h b/deal.II/include/deal.II/hp/dof_faces.h
index bcb99615b2..0f3f2cbb0e 100644
--- a/deal.II/include/deal.II/hp/dof_faces.h
+++ b/deal.II/include/deal.II/hp/dof_faces.h
@@ -101,7 +101,7 @@ namespace internal
      * @author Tobias Leicht, 2006
      */
     template <int structdim>
-    class DoFObjects
+    class DoFIndicesOnFacesOrEdges
     {
     public:
       /**
@@ -274,7 +274,7 @@ namespace internal
      * @author Tobias Leicht, 2006
      */
     template<int dim>
-    class DoFFaces;
+    class DoFIndicesOnFaces;
 
 
     /**
@@ -285,7 +285,7 @@ namespace internal
      * @author Tobias Leicht, 2006
      */
     template<>
-    class DoFFaces<1>
+    class DoFIndicesOnFaces<1>
     {
     public:
       /**
@@ -303,13 +303,13 @@ namespace internal
      * @author Tobias Leicht, 2006
      */
     template<>
-    class DoFFaces<2>
+    class DoFIndicesOnFaces<2>
     {
     public:
       /**
        * Indices of DoFs on the lines that bound cells.
        */
-      internal::hp::DoFObjects<1> lines;
+      internal::hp::DoFIndicesOnFacesOrEdges<1> lines;
 
       /**
        * Determine an estimate for the
@@ -327,18 +327,18 @@ namespace internal
      * @author Tobias Leicht, 2006
      */
     template<>
-    class DoFFaces<3>
+    class DoFIndicesOnFaces<3>
     {
     public:
       /**
        * Indices of DoFs on the lines that form the edges of cells.
        */
-      internal::hp::DoFObjects<1> lines;
+      internal::hp::DoFIndicesOnFacesOrEdges<1> lines;
 
       /**
        * Indices of DoFs on the quads that bound cells.
        */
-      internal::hp::DoFObjects<2> quads;
+      internal::hp::DoFIndicesOnFacesOrEdges<2> quads;
 
       /**
        * Determine an estimate for the
@@ -355,7 +355,7 @@ namespace internal
     template <int dim, int spacedim>
     inline
     types::global_dof_index
-    DoFObjects<structdim>::
+    DoFIndicesOnFacesOrEdges<structdim>::
     get_dof_index (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
                    const unsigned int                obj_index,
                    const unsigned int                fe_index,
@@ -416,7 +416,7 @@ namespace internal
     template <int dim, int spacedim>
     inline
     void
-    DoFObjects<structdim>::
+    DoFIndicesOnFacesOrEdges<structdim>::
     set_dof_index (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
                    const unsigned int                obj_index,
                    const unsigned int                fe_index,
@@ -480,7 +480,7 @@ namespace internal
     template <int dim, int spacedim>
     inline
     unsigned int
-    DoFObjects<structdim>::
+    DoFIndicesOnFacesOrEdges<structdim>::
     n_active_fe_indices (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
                          const unsigned int                obj_index) const
     {
@@ -528,7 +528,7 @@ namespace internal
     template <int dim, int spacedim>
     inline
     types::global_dof_index
-    DoFObjects<structdim>::
+    DoFIndicesOnFacesOrEdges<structdim>::
     nth_active_fe_index (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
                          const unsigned int                obj_level,
                          const unsigned int                obj_index,
@@ -589,7 +589,7 @@ namespace internal
     template <int dim, int spacedim>
     inline
     bool
-    DoFObjects<structdim>::
+    DoFIndicesOnFacesOrEdges<structdim>::
     fe_index_is_active (const dealii::hp::DoFHandler<dim,spacedim> &dof_handler,
                         const unsigned int                obj_index,
                         const unsigned int                fe_index,
diff --git a/deal.II/include/deal.II/hp/dof_handler.h b/deal.II/include/deal.II/hp/dof_handler.h
index cf416021fd..4ee8bab130 100644
--- a/deal.II/include/deal.II/hp/dof_handler.h
+++ b/deal.II/include/deal.II/hp/dof_handler.h
@@ -39,8 +39,8 @@ namespace internal
   namespace hp
   {
     class DoFLevel;
-    template <int> class DoFFaces;
-    template <int> class DoFObjects;
+    template <int> class DoFIndicesOnFaces;
+    template <int> class DoFIndicesOnFacesOrEdges;
 
     namespace DoFHandler
     {
@@ -799,7 +799,7 @@ namespace hp
      * <tt>faces</tt> pointer of
      * the Triangulation objects.
      */
-    dealii::internal::hp::DoFFaces<dim> *faces;
+    dealii::internal::hp::DoFIndicesOnFaces<dim> *faces;
 
     /**
      * A structure that contains all
@@ -900,7 +900,7 @@ namespace hp
      * the functions that set and
      * retrieve vertex dof indices.
      */
-    template <int> friend class dealii::internal::hp::DoFObjects;
+    template <int> friend class dealii::internal::hp::DoFIndicesOnFacesOrEdges;
     friend struct dealii::internal::hp::DoFHandler::Implementation;
   };
 
diff --git a/deal.II/source/hp/dof_faces.cc b/deal.II/source/hp/dof_faces.cc
index cde80599b1..f7a531311f 100644
--- a/deal.II/source/hp/dof_faces.cc
+++ b/deal.II/source/hp/dof_faces.cc
@@ -27,7 +27,7 @@ namespace internal
 
     template <int structdim>
     std::size_t
-    DoFObjects<structdim>::memory_consumption () const
+    DoFIndicesOnFacesOrEdges<structdim>::memory_consumption () const
     {
       return (MemoryConsumption::memory_consumption (dofs) +
               MemoryConsumption::memory_consumption (dof_offsets));
@@ -37,21 +37,21 @@ namespace internal
     // explicit instantiations
     template
     std::size_t
-    DoFObjects<1>::memory_consumption () const;
+    DoFIndicesOnFacesOrEdges<1>::memory_consumption () const;
 
     template
     std::size_t
-    DoFObjects<2>::memory_consumption () const;
+    DoFIndicesOnFacesOrEdges<2>::memory_consumption () const;
 
     template
     std::size_t
-    DoFObjects<3>::memory_consumption () const;
+    DoFIndicesOnFacesOrEdges<3>::memory_consumption () const;
 
 
 // ---------------------- DoFFaces ----------------------------
 
     std::size_t
-    DoFFaces<1>::memory_consumption () const
+    DoFIndicesOnFaces<1>::memory_consumption () const
     {
       return 0;
     }
@@ -59,7 +59,7 @@ namespace internal
 
 
     std::size_t
-    DoFFaces<2>::memory_consumption () const
+    DoFIndicesOnFaces<2>::memory_consumption () const
     {
       return MemoryConsumption::memory_consumption (lines);
     }
@@ -67,7 +67,7 @@ namespace internal
 
 
     std::size_t
-    DoFFaces<3>::memory_consumption () const
+    DoFIndicesOnFaces<3>::memory_consumption () const
     {
       return (MemoryConsumption::memory_consumption (lines) +
               MemoryConsumption::memory_consumption (quads) );
diff --git a/deal.II/source/hp/dof_handler.cc b/deal.II/source/hp/dof_handler.cc
index 0eec20bccc..eeec5b43e1 100644
--- a/deal.II/source/hp/dof_handler.cc
+++ b/deal.II/source/hp/dof_handler.cc
@@ -671,7 +671,7 @@ namespace internal
                 std::swap (active_fe_backup[level],
                            dof_handler.levels[level]->active_fe_indices);
               }
-            dof_handler.faces = new internal::hp::DoFFaces<2>;
+            dof_handler.faces = new internal::hp::DoFIndicesOnFaces<2>;
           }
 
 
@@ -1036,7 +1036,7 @@ namespace internal
                 std::swap (active_fe_backup[level],
                            dof_handler.levels[level]->active_fe_indices);
               }
-            dof_handler.faces = new internal::hp::DoFFaces<3>;
+            dof_handler.faces = new internal::hp::DoFIndicesOnFaces<3>;
           }