]> https://gitweb.dealii.org/ - dealii.git/commitdiff
start simplification of DoFHandler; remove dimension-dependent names in DoFLevels
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 4 Sep 2012 21:02:17 +0000 (21:02 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Tue, 4 Sep 2012 21:02:17 +0000 (21:02 +0000)
git-svn-id: https://svn.dealii.org/trunk@26236 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/dofs/dof_accessor.templates.h
deal.II/include/deal.II/dofs/dof_levels.h
deal.II/include/deal.II/hp/dof_levels.h
deal.II/source/dofs/dof_handler.cc
deal.II/source/dofs/dof_handler_policy.cc
deal.II/source/dofs/dof_levels.cc
deal.II/source/hp/dof_handler.cc
deal.II/source/hp/dof_levels.cc
deal.II/source/multigrid/mg_dof_handler.cc

index dedeae99682708ba998074bf1de33ef6f734a8aa..3db0ddefe88551ed39cbe10abe11ad89e12663c7 100644 (file)
@@ -226,7 +226,7 @@ namespace internal
                        const unsigned int                      local_index,
                        dealii::internal::int2type<1>)
           {
-            return dof_handler.levels[obj_level]->lines.
+            return dof_handler.levels[obj_level]->dof_object.
               get_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -245,7 +245,7 @@ namespace internal
                        dealii::internal::int2type<1>,
                        const unsigned int              global_index)
           {
-            dof_handler.levels[obj_level]->lines.
+            dof_handler.levels[obj_level]->dof_object.
               set_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -306,7 +306,7 @@ namespace internal
                        const unsigned int              local_index,
                        dealii::internal::int2type<2>)
           {
-            return dof_handler.levels[obj_level]->quads.
+            return dof_handler.levels[obj_level]->dof_object.
               get_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -325,7 +325,7 @@ namespace internal
                        dealii::internal::int2type<2>,
                        const unsigned int              global_index)
           {
-            dof_handler.levels[obj_level]->quads.
+            dof_handler.levels[obj_level]->dof_object.
               set_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -430,7 +430,7 @@ namespace internal
                        const unsigned int              local_index,
                        dealii::internal::int2type<3>)
           {
-            return dof_handler.levels[obj_level]->hexes.
+            return dof_handler.levels[obj_level]->dof_object.
               get_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -449,7 +449,7 @@ namespace internal
                        dealii::internal::int2type<3>,
                        const unsigned int              global_index)
           {
-            dof_handler.levels[obj_level]->hexes.
+            dof_handler.levels[obj_level]->dof_object.
               set_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -468,7 +468,7 @@ namespace internal
                        const unsigned int       local_index,
                        const dealii::internal::int2type<1> &)
           {
-            return dof_handler.levels[obj_level]->lines.
+            return dof_handler.levels[obj_level]->dof_object.
               get_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -488,7 +488,7 @@ namespace internal
                        const dealii::internal::int2type<1> &,
                        const unsigned int       global_index)
           {
-            dof_handler.levels[obj_level]->lines.
+            dof_handler.levels[obj_level]->dof_object.
               set_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -548,7 +548,7 @@ namespace internal
                        const unsigned int       local_index,
                        const dealii::internal::int2type<2> &)
           {
-            return dof_handler.levels[obj_level]->quads.
+            return dof_handler.levels[obj_level]->dof_object.
               get_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -568,7 +568,7 @@ namespace internal
                        const dealii::internal::int2type<2> &,
                        const unsigned int       global_index)
           {
-            dof_handler.levels[obj_level]->quads.
+            dof_handler.levels[obj_level]->dof_object.
               set_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -668,7 +668,7 @@ namespace internal
                        const unsigned int       local_index,
                        const dealii::internal::int2type<3> &)
           {
-            return dof_handler.levels[obj_level]->hexes.
+            return dof_handler.levels[obj_level]->dof_object.
               get_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -688,7 +688,7 @@ namespace internal
                        const dealii::internal::int2type<3> &,
                        const unsigned int       global_index)
           {
-            dof_handler.levels[obj_level]->hexes.
+            dof_handler.levels[obj_level]->dof_object.
               set_dof_index (dof_handler,
                              obj_index,
                              fe_index,
@@ -821,7 +821,7 @@ namespace internal
                             const unsigned int fe_index,
                             const dealii::internal::int2type<1> &)
           {
-            return dof_handler.levels[obj_level]->lines.fe_index_is_active(dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.fe_index_is_active(dof_handler,
                                                                            obj_index,
                                                                            fe_index,
                                                                            obj_level);
@@ -836,7 +836,7 @@ namespace internal
                              const unsigned int obj_index,
                              const dealii::internal::int2type<1> &)
           {
-            return dof_handler.levels[obj_level]->lines.n_active_fe_indices (dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.n_active_fe_indices (dof_handler,
                                                                              obj_index);
           }
 
@@ -851,7 +851,7 @@ namespace internal
                              const unsigned int n,
                              const dealii::internal::int2type<1> &)
           {
-            return dof_handler.levels[obj_level]->lines.nth_active_fe_index (dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.nth_active_fe_index (dof_handler,
                                                                              obj_level,
                                                                              obj_index,
                                                                              n);
@@ -913,7 +913,7 @@ namespace internal
                             const unsigned int fe_index,
                             const dealii::internal::int2type<2> &)
           {
-            return dof_handler.levels[obj_level]->quads.fe_index_is_active(dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.fe_index_is_active(dof_handler,
                                                                            obj_index,
                                                                            fe_index,
                                                                            obj_level);
@@ -928,7 +928,7 @@ namespace internal
                              const unsigned int obj_index,
                              const dealii::internal::int2type<2> &)
           {
-            return dof_handler.levels[obj_level]->quads.n_active_fe_indices (dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.n_active_fe_indices (dof_handler,
                                                                              obj_index);
           }
 
@@ -943,7 +943,7 @@ namespace internal
                              const unsigned int n,
                              const dealii::internal::int2type<2> &)
           {
-            return dof_handler.levels[obj_level]->quads.nth_active_fe_index (dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.nth_active_fe_index (dof_handler,
                                                                              obj_level,
                                                                              obj_index,
                                                                              n);
@@ -1022,7 +1022,7 @@ namespace internal
                             const unsigned int fe_index,
                             const dealii::internal::int2type<3> &)
           {
-            return dof_handler.levels[obj_level]->hexes.fe_index_is_active(dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.fe_index_is_active(dof_handler,
                                                                            obj_index,
                                                                            fe_index,
                                                                            obj_level);
@@ -1068,7 +1068,7 @@ namespace internal
                              const unsigned int obj_index,
                              const dealii::internal::int2type<3> &)
           {
-            return dof_handler.levels[obj_level]->hexes.n_active_fe_indices (dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.n_active_fe_indices (dof_handler,
                                                                              obj_index);
           }
 
@@ -1083,7 +1083,7 @@ namespace internal
                              const unsigned int n,
                              const dealii::internal::int2type<3> &)
           {
-            return dof_handler.levels[obj_level]->hexes.nth_active_fe_index (dof_handler,
+            return dof_handler.levels[obj_level]->dof_object.nth_active_fe_index (dof_handler,
                                                                              obj_level,
                                                                              obj_index,
                                                                              n);
index cb9c40d7332006bc75346a42bc2626536fba7e7e..5e9875551f10baf838fbb88666c826aa4d5eea76 100644 (file)
@@ -141,7 +141,7 @@ namespace internal
                                           * The object containing dof-indices
                                           * and related access-functions
                                           */
-        DoFObjects<1> lines;
+        DoFObjects<1> dof_object;
 
                                          /**
                                           * Determine an estimate for the
@@ -174,7 +174,7 @@ namespace internal
                                           * The object containing dof-indices
                                           * and related access-functions
                                           */
-        internal::DoFHandler::DoFObjects<2> quads;
+        internal::DoFHandler::DoFObjects<2> dof_object;
 
                                          /**
                                           * Determine an estimate for the
@@ -207,7 +207,7 @@ namespace internal
                                           * The object containing dof-indices
                                           * and related access-functions
                                           */
-        internal::DoFHandler::DoFObjects<3> hexes;
+        internal::DoFHandler::DoFObjects<3> dof_object;
 
                                          /**
                                           * Determine an estimate for the
@@ -241,7 +241,7 @@ namespace internal
                                  const unsigned int version)
     {
       this->DoFLevel<0>::serialize (ar, version);
-      ar & lines;
+      ar & dof_object;
     }
 
 
@@ -250,7 +250,7 @@ namespace internal
                                  const unsigned int version)
     {
       this->DoFLevel<0>::serialize (ar, version);
-      ar & quads;
+      ar & dof_object;
     }
 
 
@@ -259,7 +259,7 @@ namespace internal
                                  const unsigned int version)
     {
       this->DoFLevel<0>::serialize (ar, version);
-      ar & hexes;
+      ar & dof_object;
     }
   }
 }
index f526ccab2a7ea6b830821998981c5e32ae56ebd3..7fc4b81bedbfbbd01deb581586c4f525183cd49a 100644 (file)
@@ -164,7 +164,7 @@ namespace internal
                                           *  store the dof-indices and related functions of
                                           *  lines
                                           */
-        internal::hp::DoFObjects<1> lines;
+        internal::hp::DoFObjects<1> dof_object;
 
                                          /**
                                           * Determine an estimate for the
@@ -190,7 +190,7 @@ namespace internal
                                           *  store the dof-indices and related functions of
                                           *  quads
                                           */
-        internal::hp::DoFObjects<2> quads;
+        internal::hp::DoFObjects<2> dof_object;
 
                                          /**
                                           * Determine an estimate for the
@@ -217,7 +217,7 @@ namespace internal
                                           *  store the dof-indices and related functions of
                                           *  hexes
                                           */
-        internal::hp::DoFObjects<3> hexes;
+        internal::hp::DoFObjects<3> dof_object;
 
                                          /**
                                           * Determine an estimate for the
index ab9251c238b2b7c3bd1963daabd94ea10721d19f..b0ae632789a0aa71ad49111ba1e910fe4179edbe 100644 (file)
@@ -271,7 +271,7 @@ namespace internal
                 dof_handler.levels
                   .push_back (new internal::DoFHandler::DoFLevel<1>);
 
-                dof_handler.levels.back()->lines.dofs
+                dof_handler.levels.back()->dof_object.dofs
                   .resize (dof_handler.tria->n_raw_lines(i) *
                            dof_handler.selected_fe->dofs_per_line,
                            DoFHandler<1,spacedim>::invalid_dof_index);
@@ -297,7 +297,7 @@ namespace internal
               {
                 dof_handler.levels.push_back (new internal::DoFHandler::DoFLevel<2>);
 
-                dof_handler.levels.back()->quads.dofs
+                dof_handler.levels.back()->dof_object.dofs
                   .resize (dof_handler.tria->n_raw_quads(i) *
                            dof_handler.selected_fe->dofs_per_quad,
                            DoFHandler<2,spacedim>::invalid_dof_index);
@@ -329,7 +329,7 @@ namespace internal
               {
                 dof_handler.levels.push_back (new internal::DoFHandler::DoFLevel<3>);
 
-                dof_handler.levels.back()->hexes.dofs
+                dof_handler.levels.back()->dof_object.dofs
                   .resize (dof_handler.tria->n_raw_hexs(i) *
                            dof_handler.selected_fe->dofs_per_hex,
                            DoFHandler<3,spacedim>::invalid_dof_index);
index 4d7940c2f7c395265dad460b6d8372cca52a800a..bbfd2159181fbb3408078431a1aeda4224d94ed0 100644 (file)
@@ -326,8 +326,8 @@ namespace internal
 
               for (unsigned int level=0; level<dof_handler.levels.size(); ++level)
                 for (std::vector<unsigned int>::iterator
-                       i=dof_handler.levels[level]->lines.dofs.begin();
-                     i!=dof_handler.levels[level]->lines.dofs.end(); ++i)
+                       i=dof_handler.levels[level]->dof_object.dofs.begin();
+                     i!=dof_handler.levels[level]->dof_object.dofs.end(); ++i)
                   if (*i != DoFHandler<1,spacedim>::invalid_dof_index)
                     *i = new_numbers[*i];
 
@@ -388,8 +388,8 @@ namespace internal
               for (unsigned int level=0; level<dof_handler.levels.size(); ++level)
                 {
                   for (std::vector<unsigned int>::iterator
-                         i=dof_handler.levels[level]->quads.dofs.begin();
-                       i!=dof_handler.levels[level]->quads.dofs.end(); ++i)
+                         i=dof_handler.levels[level]->dof_object.dofs.begin();
+                       i!=dof_handler.levels[level]->dof_object.dofs.end(); ++i)
                     if (*i != DoFHandler<2,spacedim>::invalid_dof_index)
                       *i = ((indices.n_elements() == 0) ?
                             new_numbers[*i] :
@@ -459,8 +459,8 @@ namespace internal
               for (unsigned int level=0; level<dof_handler.levels.size(); ++level)
                 {
                   for (std::vector<unsigned int>::iterator
-                         i=dof_handler.levels[level]->hexes.dofs.begin();
-                       i!=dof_handler.levels[level]->hexes.dofs.end(); ++i)
+                         i=dof_handler.levels[level]->dof_object.dofs.begin();
+                       i!=dof_handler.levels[level]->dof_object.dofs.end(); ++i)
                     if (*i != DoFHandler<3,spacedim>::invalid_dof_index)
                       *i = ((indices.n_elements() == 0) ?
                             new_numbers[*i] :
index c595f65a3cd5d2659d62f84cf7dce7707344e11b..7b0e37c14a9fbcf2f4e939b5907cf77d2bb5a759 100644 (file)
@@ -34,7 +34,7 @@ namespace internal
     DoFLevel<1>::memory_consumption () const
     {
       return (DoFLevel<0>::memory_consumption () +
-              MemoryConsumption::memory_consumption (lines));
+              MemoryConsumption::memory_consumption (dof_object));
     }
 
 
@@ -43,7 +43,7 @@ namespace internal
     DoFLevel<2>::memory_consumption () const
     {
       return (DoFLevel<0>::memory_consumption () +
-              MemoryConsumption::memory_consumption (quads));
+              MemoryConsumption::memory_consumption (dof_object));
     }
 
 
@@ -52,7 +52,7 @@ namespace internal
     DoFLevel<3>::memory_consumption () const
     {
       return (DoFLevel<0>::memory_consumption () +
-              MemoryConsumption::memory_consumption (hexes));
+              MemoryConsumption::memory_consumption (dof_object));
     }
 
   }
index 35a74c96705f2a12f68a6d060fe08e7a769afe8e..734b8c7f0c696e3d3a2593527995c8e41e239f0e 100644 (file)
@@ -573,7 +573,7 @@ namespace internal
                                                // finite element is used for it
               for (unsigned int level=0; level<dof_handler.tria->n_levels(); ++level)
                 {
-                  dof_handler.levels[level]->lines.dof_offsets
+                  dof_handler.levels[level]->dof_object.dof_offsets
                     = std::vector<unsigned int> (dof_handler.tria->n_raw_lines(level),
                                                  DoFHandler<dim,spacedim>::invalid_dof_index);
 
@@ -583,11 +583,11 @@ namespace internal
                        cell!=dof_handler.end_active(level); ++cell)
                     if (!cell->has_children())
                       {
-                        dof_handler.levels[level]->lines.dof_offsets[cell->index()] = next_free_dof;
+                        dof_handler.levels[level]->dof_object.dof_offsets[cell->index()] = next_free_dof;
                         next_free_dof += cell->get_fe().dofs_per_line;
                       }
 
-                  dof_handler.levels[level]->lines.dofs
+                  dof_handler.levels[level]->dof_object.dofs
                     = std::vector<unsigned int> (next_free_dof,
                                                  DoFHandler<dim,spacedim>::invalid_dof_index);
                 }
@@ -609,11 +609,11 @@ namespace internal
                     if (!cell->has_children())
                       counter += cell->get_fe().dofs_per_line;
 
-                  Assert (dof_handler.levels[level]->lines.dofs.size() == counter,
+                  Assert (dof_handler.levels[level]->dof_object.dofs.size() == counter,
                           ExcInternalError());
                   Assert (static_cast<unsigned int>
-                          (std::count (dof_handler.levels[level]->lines.dof_offsets.begin(),
-                                       dof_handler.levels[level]->lines.dof_offsets.end(),
+                          (std::count (dof_handler.levels[level]->dof_object.dof_offsets.begin(),
+                                       dof_handler.levels[level]->dof_object.dof_offsets.end(),
                                        DoFHandler<dim,spacedim>::invalid_dof_index))
                           ==
                           dof_handler.tria->n_raw_lines(level) - dof_handler.tria->n_active_lines(level),
@@ -689,7 +689,7 @@ namespace internal
                                                // finite element is used for it
               for (unsigned int level=0; level<dof_handler.tria->n_levels(); ++level)
                 {
-                  dof_handler.levels[level]->quads.dof_offsets
+                  dof_handler.levels[level]->dof_object.dof_offsets
                     = std::vector<unsigned int> (dof_handler.tria->n_raw_quads(level),
                                                  DoFHandler<dim,spacedim>::invalid_dof_index);
 
@@ -699,11 +699,11 @@ namespace internal
                        cell!=dof_handler.end_active(level); ++cell)
                     if (!cell->has_children())
                       {
-                        dof_handler.levels[level]->quads.dof_offsets[cell->index()] = next_free_dof;
+                        dof_handler.levels[level]->dof_object.dof_offsets[cell->index()] = next_free_dof;
                         next_free_dof += cell->get_fe().dofs_per_quad;
                       }
 
-                  dof_handler.levels[level]->quads.dofs
+                  dof_handler.levels[level]->dof_object.dofs
                     = std::vector<unsigned int> (next_free_dof,
                                                  DoFHandler<dim,spacedim>::invalid_dof_index);
                 }
@@ -725,11 +725,11 @@ namespace internal
                     if (!cell->has_children())
                       counter += cell->get_fe().dofs_per_quad;
 
-                  Assert (dof_handler.levels[level]->quads.dofs.size() == counter,
+                  Assert (dof_handler.levels[level]->dof_object.dofs.size() == counter,
                           ExcInternalError());
                   Assert (static_cast<unsigned int>
-                          (std::count (dof_handler.levels[level]->quads.dof_offsets.begin(),
-                                       dof_handler.levels[level]->quads.dof_offsets.end(),
+                          (std::count (dof_handler.levels[level]->dof_object.dof_offsets.begin(),
+                                       dof_handler.levels[level]->dof_object.dof_offsets.end(),
                                        DoFHandler<dim,spacedim>::invalid_dof_index))
                           ==
                           dof_handler.tria->n_raw_quads(level) - dof_handler.tria->n_active_quads(level),
@@ -1053,7 +1053,7 @@ namespace internal
                                                // finite element is used for it
               for (unsigned int level=0; level<dof_handler.tria->n_levels(); ++level)
                 {
-                  dof_handler.levels[level]->hexes.dof_offsets
+                  dof_handler.levels[level]->dof_object.dof_offsets
                     = std::vector<unsigned int> (dof_handler.tria->n_raw_hexs(level),
                                                  DoFHandler<dim,spacedim>::invalid_dof_index);
 
@@ -1063,11 +1063,11 @@ namespace internal
                        cell!=dof_handler.end_active(level); ++cell)
                     if (!cell->has_children())
                       {
-                        dof_handler.levels[level]->hexes.dof_offsets[cell->index()] = next_free_dof;
+                        dof_handler.levels[level]->dof_object.dof_offsets[cell->index()] = next_free_dof;
                         next_free_dof += cell->get_fe().dofs_per_hex;
                       }
 
-                  dof_handler.levels[level]->hexes.dofs
+                  dof_handler.levels[level]->dof_object.dofs
                     = std::vector<unsigned int> (next_free_dof,
                                                  DoFHandler<dim,spacedim>::invalid_dof_index);
                 }
@@ -1089,11 +1089,11 @@ namespace internal
                     if (!cell->has_children())
                       counter += cell->get_fe().dofs_per_hex;
 
-                  Assert (dof_handler.levels[level]->hexes.dofs.size() == counter,
+                  Assert (dof_handler.levels[level]->dof_object.dofs.size() == counter,
                           ExcInternalError());
                   Assert (static_cast<unsigned int>
-                          (std::count (dof_handler.levels[level]->hexes.dof_offsets.begin(),
-                                       dof_handler.levels[level]->hexes.dof_offsets.end(),
+                          (std::count (dof_handler.levels[level]->dof_object.dof_offsets.begin(),
+                                       dof_handler.levels[level]->dof_object.dof_offsets.end(),
                                        DoFHandler<dim,spacedim>::invalid_dof_index))
                           ==
                           dof_handler.tria->n_raw_hexs(level) - dof_handler.tria->n_active_hexs(level),
index 3acf4964d03e1152c22f54a5ef172bcdb07891a4..f37fbcdef47fe02e786ed1489d5c64143ea3f68c 100644 (file)
@@ -26,7 +26,7 @@ namespace internal
     DoFLevel<1>::memory_consumption () const
     {
       return (DoFLevel<0>::memory_consumption() +
-              MemoryConsumption::memory_consumption (lines));
+              MemoryConsumption::memory_consumption (dof_object));
     }
 
 
@@ -35,7 +35,7 @@ namespace internal
     DoFLevel<2>::memory_consumption () const
     {
       return (DoFLevel<0>::memory_consumption () +
-              MemoryConsumption::memory_consumption (quads));
+              MemoryConsumption::memory_consumption (dof_object));
     }
 
 
@@ -44,7 +44,7 @@ namespace internal
     DoFLevel<3>::memory_consumption () const
     {
       return (DoFLevel<0>::memory_consumption () +
-              MemoryConsumption::memory_consumption (hexes));
+              MemoryConsumption::memory_consumption (dof_object));
     }
 
 
index 4d9d2eff40144838624c59ded9074d128dc9c303..7434a8b67e07555945efd2f80640e23dbfb39cfe 100644 (file)
@@ -254,7 +254,7 @@ namespace internal
                        const unsigned int       local_index,
                        const int2type<1>)
           {
-            return mg_level.lines.
+            return mg_level.dof_object.
               get_dof_index (mg_dof_handler,
                              obj_index,
                              fe_index,
@@ -274,7 +274,7 @@ namespace internal
                        const unsigned int       global_index,
                        const int2type<1>)
           {
-            mg_level.lines.
+            mg_level.dof_object.
               set_dof_index (mg_dof_handler,
                              obj_index,
                              fe_index,
@@ -336,7 +336,7 @@ namespace internal
                        const unsigned int       local_index,
                        const int2type<2>)
           {
-            return mg_level.quads.
+            return mg_level.dof_object.
               get_dof_index (mg_dof_handler,
                              obj_index,
                              fe_index,
@@ -356,7 +356,7 @@ namespace internal
                        const unsigned int       global_index,
                        const int2type<2>)
           {
-            mg_level.quads.
+            mg_level.dof_object.
               set_dof_index (mg_dof_handler,
                              obj_index,
                              fe_index,
@@ -437,7 +437,7 @@ namespace internal
                        const unsigned int       local_index,
                        const int2type<3>)
           {
-            return mg_level.hexes.
+            return mg_level.dof_object.
               get_dof_index (mg_dof_handler,
                              obj_index,
                              fe_index,
@@ -479,7 +479,7 @@ namespace internal
                        const unsigned int       global_index,
                        const int2type<3>)
           {
-            mg_level.hexes.
+            mg_level.dof_object.
               set_dof_index (mg_dof_handler,
                              obj_index,
                              fe_index,
@@ -513,7 +513,7 @@ namespace internal
               {
                 mg_dof_handler.mg_levels.push_back (new internal::DoFHandler::DoFLevel<1>);
 
-                mg_dof_handler.mg_levels.back()->lines.dofs = std::vector<unsigned int>(mg_dof_handler.get_tria().n_raw_lines(i) *
+                mg_dof_handler.mg_levels.back()->dof_object.dofs = std::vector<unsigned int>(mg_dof_handler.get_tria().n_raw_lines(i) *
                                                                                         mg_dof_handler.get_fe().dofs_per_line,
                                                                                         DoFHandler<1>::invalid_dof_index);
               }
@@ -592,7 +592,7 @@ namespace internal
               {
                 mg_dof_handler.mg_levels.push_back (new internal::DoFHandler::DoFLevel<2>);
 
-                mg_dof_handler.mg_levels.back()->quads.dofs = std::vector<unsigned int> (mg_dof_handler.get_tria().n_raw_quads(i) *
+                mg_dof_handler.mg_levels.back()->dof_object.dofs = std::vector<unsigned int> (mg_dof_handler.get_tria().n_raw_quads(i) *
                                                                                          mg_dof_handler.get_fe().dofs_per_quad,
                                                                                          DoFHandler<2>::invalid_dof_index);
               }
@@ -682,7 +682,7 @@ namespace internal
               {
                 mg_dof_handler.mg_levels.push_back (new internal::DoFHandler::DoFLevel<3>);
 
-                mg_dof_handler.mg_levels.back()->hexes.dofs
+                mg_dof_handler.mg_levels.back()->dof_object.dofs
                   = std::vector<unsigned int> (mg_dof_handler.get_tria().n_raw_hexs(i) *
                                                mg_dof_handler.get_fe().dofs_per_hex,
                                                DoFHandler<3>::invalid_dof_index);
@@ -2062,8 +2062,8 @@ void MGDoFHandler<1>::renumber_dofs (const unsigned int level,
                       new_numbers[i->get_index (level, d,
                                                 this->get_fe().dofs_per_vertex)]);
 
-  for (std::vector<unsigned int>::iterator i=mg_levels[level]->lines.dofs.begin();
-       i!=mg_levels[level]->lines.dofs.end(); ++i)
+  for (std::vector<unsigned int>::iterator i=mg_levels[level]->dof_object.dofs.begin();
+       i!=mg_levels[level]->dof_object.dofs.end(); ++i)
     {
       if (*i != DoFHandler<1>::invalid_dof_index)
         {
@@ -2123,8 +2123,8 @@ void MGDoFHandler<2>::renumber_dofs (const unsigned int  level,
       const_cast<Triangulation<2> &>(this->get_tria()).load_user_flags (user_flags);
     }
 
-  for (std::vector<unsigned int>::iterator i=mg_levels[level]->quads.dofs.begin();
-       i!=mg_levels[level]->quads.dofs.end(); ++i)
+  for (std::vector<unsigned int>::iterator i=mg_levels[level]->dof_object.dofs.begin();
+       i!=mg_levels[level]->dof_object.dofs.end(); ++i)
     {
       if (*i != DoFHandler<2>::invalid_dof_index)
         {
@@ -2220,8 +2220,8 @@ void MGDoFHandler<3>::renumber_dofs (const unsigned int  level,
     }
 
                                    //HEX DoFs
-  for (std::vector<unsigned int>::iterator i=mg_levels[level]->hexes.dofs.begin();
-       i!=mg_levels[level]->hexes.dofs.end(); ++i)
+  for (std::vector<unsigned int>::iterator i=mg_levels[level]->dof_object.dofs.begin();
+       i!=mg_levels[level]->dof_object.dofs.end(); ++i)
     {
       if (*i != DoFHandler<3>::invalid_dof_index)
         {

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.