From: Wolfgang Bangerth Date: Tue, 12 Sep 2017 19:42:59 +0000 (-0600) Subject: Limit renumbering hp DoFs to non-artificial cells. X-Git-Tag: v9.0.0-rc1~1085^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcebc42821fe98b950e9b4fdd4fa0ba75de9695;p=dealii.git Limit renumbering hp DoFs to non-artificial cells. --- diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc index f6cd3dacd2..ff966fe300 100644 --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@ -1614,22 +1614,23 @@ namespace internal hp::DoFHandler &dof_handler) { for (typename hp::DoFHandler::active_cell_iterator - cell = dof_handler.begin_active(); + cell=dof_handler.begin_active(); cell!=dof_handler.end(); ++cell) - { - const unsigned int fe_index = cell->active_fe_index (); + if (!cell->is_artificial()) + { + const unsigned int fe_index = cell->active_fe_index (); - for (unsigned int d=0; d(); ++d) - { - const types::global_dof_index old_dof_index = cell->dof_index(d,fe_index); - if (old_dof_index != numbers::invalid_dof_index) - cell->set_dof_index (d, - (indices.size() == 0)? - (new_numbers[old_dof_index]) : - (new_numbers[indices.index_within_set(old_dof_index)]), - fe_index); - } - } + for (unsigned int d=0; d(); ++d) + { + const types::global_dof_index old_dof_index = cell->dof_index(d,fe_index); + if (old_dof_index != numbers::invalid_dof_index) + cell->set_dof_index (d, + (indices.size() == 0)? + (new_numbers[old_dof_index]) : + (new_numbers[indices.index_within_set(old_dof_index)]), + fe_index); + } + } } @@ -1668,32 +1669,33 @@ namespace internal for (typename hp::DoFHandler::active_cell_iterator cell = dof_handler.begin_active(); cell!=dof_handler.end(); ++cell) - for (unsigned int l=0; l::lines_per_cell; ++l) - if (cell->line(l)->user_flag_set() == false) - { - const typename hp::DoFHandler::line_iterator line = cell->line(l); - line->set_user_flag(); - - const unsigned int n_active_fe_indices - = line->n_active_fe_indices (); + if (!cell->is_artificial()) + for (unsigned int l=0; l::lines_per_cell; ++l) + if (cell->line(l)->user_flag_set() == false) + { + const typename hp::DoFHandler::line_iterator line = cell->line(l); + line->set_user_flag(); - for (unsigned int f=0; fnth_active_fe_index (f); + const unsigned int n_active_fe_indices + = line->n_active_fe_indices (); - for (unsigned int d=0; ddof_index(d,fe_index); - if (old_dof_index != numbers::invalid_dof_index) - line->set_dof_index (d, - (indices.size() == 0)? - (new_numbers[old_dof_index]) : - (new_numbers[indices.index_within_set(old_dof_index)]), - fe_index); - } - } - } + for (unsigned int f=0; fnth_active_fe_index (f); + + for (unsigned int d=0; ddof_index(d,fe_index); + if (old_dof_index != numbers::invalid_dof_index) + line->set_dof_index (d, + (indices.size() == 0)? + (new_numbers[old_dof_index]) : + (new_numbers[indices.index_within_set(old_dof_index)]), + fe_index); + } + } + } // at the end, restore the user // flags for the lines @@ -1725,32 +1727,33 @@ namespace internal for (typename hp::DoFHandler::active_cell_iterator cell = dof_handler.begin_active(); cell!=dof_handler.end(); ++cell) - for (unsigned int l=0; l::lines_per_cell; ++l) - if (cell->line(l)->user_flag_set() == false) - { - const typename hp::DoFHandler::line_iterator line = cell->line(l); - line->set_user_flag(); - - const unsigned int n_active_fe_indices - = line->n_active_fe_indices (); + if (!cell->is_artificial()) + for (unsigned int l=0; l::lines_per_cell; ++l) + if (cell->line(l)->user_flag_set() == false) + { + const typename hp::DoFHandler::line_iterator line = cell->line(l); + line->set_user_flag(); - for (unsigned int f=0; fnth_active_fe_index (f); + const unsigned int n_active_fe_indices + = line->n_active_fe_indices (); - for (unsigned int d=0; ddof_index(d,fe_index); - if (old_dof_index != numbers::invalid_dof_index) - line->set_dof_index (d, - (indices.size() == 0)? - (new_numbers[old_dof_index]) : - (new_numbers[indices.index_within_set(old_dof_index)]), - fe_index); - } - } - } + for (unsigned int f=0; fnth_active_fe_index (f); + + for (unsigned int d=0; ddof_index(d,fe_index); + if (old_dof_index != numbers::invalid_dof_index) + line->set_dof_index (d, + (indices.size() == 0)? + (new_numbers[old_dof_index]) : + (new_numbers[indices.index_within_set(old_dof_index)]), + fe_index); + } + } + } // at the end, restore the user // flags for the lines @@ -1768,32 +1771,33 @@ namespace internal for (typename hp::DoFHandler::active_cell_iterator cell = dof_handler.begin_active(); cell!=dof_handler.end(); ++cell) - for (unsigned int q=0; q::quads_per_cell; ++q) - if (cell->quad(q)->user_flag_set() == false) - { - const typename hp::DoFHandler::quad_iterator quad = cell->quad(q); - quad->set_user_flag(); - - const unsigned int n_active_fe_indices - = quad->n_active_fe_indices (); + if (!cell->is_artificial()) + for (unsigned int q=0; q::quads_per_cell; ++q) + if (cell->quad(q)->user_flag_set() == false) + { + const typename hp::DoFHandler::quad_iterator quad = cell->quad(q); + quad->set_user_flag(); - for (unsigned int f=0; fnth_active_fe_index (f); + const unsigned int n_active_fe_indices + = quad->n_active_fe_indices (); - for (unsigned int d=0; ddof_index(d,fe_index); - if (old_dof_index != numbers::invalid_dof_index) - quad->set_dof_index (d, - (indices.size() == 0)? - (new_numbers[old_dof_index]) : - (new_numbers[indices.index_within_set(old_dof_index)]), - fe_index); - } - } - } + for (unsigned int f=0; fnth_active_fe_index (f); + + for (unsigned int d=0; ddof_index(d,fe_index); + if (old_dof_index != numbers::invalid_dof_index) + quad->set_dof_index (d, + (indices.size() == 0)? + (new_numbers[old_dof_index]) : + (new_numbers[indices.index_within_set(old_dof_index)]), + fe_index); + } + } + } // at the end, restore the user flags for the quads const_cast&>(dof_handler.get_triangulation())