From 7fbe53b81b36579eed37d713cb1f794b1840c3f5 Mon Sep 17 00:00:00 2001 From: kanschat Date: Tue, 4 Sep 2012 21:02:17 +0000 Subject: [PATCH] start simplification of DoFHandler; remove dimension-dependent names in DoFLevels git-svn-id: https://svn.dealii.org/trunk@26236 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/dofs/dof_accessor.templates.h | 42 +++++++++---------- deal.II/include/deal.II/dofs/dof_levels.h | 12 +++--- deal.II/include/deal.II/hp/dof_levels.h | 6 +-- deal.II/source/dofs/dof_handler.cc | 6 +-- deal.II/source/dofs/dof_handler_policy.cc | 12 +++--- deal.II/source/dofs/dof_levels.cc | 6 +-- deal.II/source/hp/dof_handler.cc | 36 ++++++++-------- deal.II/source/hp/dof_levels.cc | 6 +-- deal.II/source/multigrid/mg_dof_handler.cc | 30 ++++++------- 9 files changed, 78 insertions(+), 78 deletions(-) diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h index dedeae9968..3db0ddefe8 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -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); diff --git a/deal.II/include/deal.II/dofs/dof_levels.h b/deal.II/include/deal.II/dofs/dof_levels.h index cb9c40d733..5e9875551f 100644 --- a/deal.II/include/deal.II/dofs/dof_levels.h +++ b/deal.II/include/deal.II/dofs/dof_levels.h @@ -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; } } } diff --git a/deal.II/include/deal.II/hp/dof_levels.h b/deal.II/include/deal.II/hp/dof_levels.h index f526ccab2a..7fc4b81bed 100644 --- a/deal.II/include/deal.II/hp/dof_levels.h +++ b/deal.II/include/deal.II/hp/dof_levels.h @@ -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 diff --git a/deal.II/source/dofs/dof_handler.cc b/deal.II/source/dofs/dof_handler.cc index ab9251c238..b0ae632789 100644 --- a/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/source/dofs/dof_handler.cc @@ -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); diff --git a/deal.II/source/dofs/dof_handler_policy.cc b/deal.II/source/dofs/dof_handler_policy.cc index 4d7940c2f7..bbfd215918 100644 --- a/deal.II/source/dofs/dof_handler_policy.cc +++ b/deal.II/source/dofs/dof_handler_policy.cc @@ -326,8 +326,8 @@ namespace internal for (unsigned int level=0; level::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::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::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] : diff --git a/deal.II/source/dofs/dof_levels.cc b/deal.II/source/dofs/dof_levels.cc index c595f65a3c..7b0e37c14a 100644 --- a/deal.II/source/dofs/dof_levels.cc +++ b/deal.II/source/dofs/dof_levels.cc @@ -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)); } } diff --git a/deal.II/source/hp/dof_handler.cc b/deal.II/source/hp/dof_handler.cc index 35a74c9670..734b8c7f0c 100644 --- a/deal.II/source/hp/dof_handler.cc +++ b/deal.II/source/hp/dof_handler.cc @@ -573,7 +573,7 @@ namespace internal // finite element is used for it for (unsigned int level=0; leveln_levels(); ++level) { - dof_handler.levels[level]->lines.dof_offsets + dof_handler.levels[level]->dof_object.dof_offsets = std::vector (dof_handler.tria->n_raw_lines(level), DoFHandler::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 (next_free_dof, DoFHandler::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 - (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::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; leveln_levels(); ++level) { - dof_handler.levels[level]->quads.dof_offsets + dof_handler.levels[level]->dof_object.dof_offsets = std::vector (dof_handler.tria->n_raw_quads(level), DoFHandler::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 (next_free_dof, DoFHandler::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 - (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::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; leveln_levels(); ++level) { - dof_handler.levels[level]->hexes.dof_offsets + dof_handler.levels[level]->dof_object.dof_offsets = std::vector (dof_handler.tria->n_raw_hexs(level), DoFHandler::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 (next_free_dof, DoFHandler::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 - (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::invalid_dof_index)) == dof_handler.tria->n_raw_hexs(level) - dof_handler.tria->n_active_hexs(level), diff --git a/deal.II/source/hp/dof_levels.cc b/deal.II/source/hp/dof_levels.cc index 3acf4964d0..f37fbcdef4 100644 --- a/deal.II/source/hp/dof_levels.cc +++ b/deal.II/source/hp/dof_levels.cc @@ -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)); } diff --git a/deal.II/source/multigrid/mg_dof_handler.cc b/deal.II/source/multigrid/mg_dof_handler.cc index 4d9d2eff40..7434a8b67e 100644 --- a/deal.II/source/multigrid/mg_dof_handler.cc +++ b/deal.II/source/multigrid/mg_dof_handler.cc @@ -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(mg_dof_handler.get_tria().n_raw_lines(i) * + mg_dof_handler.mg_levels.back()->dof_object.dofs = std::vector(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 (mg_dof_handler.get_tria().n_raw_quads(i) * + mg_dof_handler.mg_levels.back()->dof_object.dofs = std::vector (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 (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::iterator i=mg_levels[level]->lines.dofs.begin(); - i!=mg_levels[level]->lines.dofs.end(); ++i) + for (std::vector::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 &>(this->get_tria()).load_user_flags (user_flags); } - for (std::vector::iterator i=mg_levels[level]->quads.dofs.begin(); - i!=mg_levels[level]->quads.dofs.end(); ++i) + for (std::vector::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::iterator i=mg_levels[level]->hexes.dofs.begin(); - i!=mg_levels[level]->hexes.dofs.end(); ++i) + for (std::vector::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) { -- 2.39.5