From: Wolfgang Bangerth Date: Thu, 22 Jun 2017 02:07:02 +0000 (-0500) Subject: Merge branch 'master' into dofhandler-cleanup-3 X-Git-Tag: v9.0.0-rc1~1481^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9672642228b3c6eca2fe4e97dce106ce3d3e7b53;p=dealii.git Merge branch 'master' into dofhandler-cleanup-3 --- 9672642228b3c6eca2fe4e97dce106ce3d3e7b53 diff --cc source/dofs/dof_handler_policy.cc index dc497ae105,b8ee6c24cb..bd3f60899a --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@@ -560,11 -560,11 +560,11 @@@ namespace interna { const dealii::types::global_dof_index idx = i->get_index (level, d); if (check_validity) - Assert(idx != DoFHandler<1>::invalid_dof_index, ExcInternalError ()); + Assert(idx != numbers::invalid_dof_index, ExcInternalError ()); - if (idx != DoFHandler<1>::invalid_dof_index) + if (idx != numbers::invalid_dof_index) i->set_index (level, d, - (indices.n_elements() == 0)? + (indices.size() == 0)? (new_numbers[idx]) : (new_numbers[indices.index_within_set(idx)])); } @@@ -575,10 -575,10 +575,10 @@@ i!=dof_handler.mg_levels[level]->dof_object.dofs.end(); ++i) { - if (*i != DoFHandler<1>::invalid_dof_index) + if (*i != numbers::invalid_dof_index) { Assert(*i::iterator i=dof_handler.vertex_dofs.begin(); i!=dof_handler.vertex_dofs.end(); ++i) - if (*i != DoFHandler<2,spacedim>::invalid_dof_index) + if (*i != numbers::invalid_dof_index) - *i = (indices.n_elements() == 0)? + *i = (indices.size() == 0)? (new_numbers[*i]) : (new_numbers[indices.index_within_set(*i)]); else if (check_validity) @@@ -620,8 -620,8 +620,8 @@@ for (std::vector::iterator i=dof_handler.faces->lines.dofs.begin(); i!=dof_handler.faces->lines.dofs.end(); ++i) - if (*i != DoFHandler<2,spacedim>::invalid_dof_index) + if (*i != numbers::invalid_dof_index) - *i = ((indices.n_elements() == 0) ? + *i = ((indices.size() == 0) ? new_numbers[*i] : new_numbers[indices.index_within_set(*i)]); @@@ -630,8 -630,8 +630,8 @@@ for (std::vector::iterator 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) + if (*i != numbers::invalid_dof_index) - *i = ((indices.n_elements() == 0) ? + *i = ((indices.size() == 0) ? new_numbers[*i] : new_numbers[indices.index_within_set(*i)]); } @@@ -666,11 -666,11 +666,11 @@@ { const dealii::types::global_dof_index idx = i->get_index (level, d); if (check_validity) - Assert(idx != DoFHandler<2>::invalid_dof_index, ExcInternalError ()); + Assert(idx != numbers::invalid_dof_index, ExcInternalError ()); - if (idx != DoFHandler<1>::invalid_dof_index) + if (idx != numbers::invalid_dof_index) i->set_index (level, d/*, dof_handler.get_fe().dofs_per_vertex*/, - ((indices.n_elements() == 0) ? + ((indices.size() == 0) ? new_numbers[idx] : new_numbers[indices.index_within_set(idx)])); } @@@ -701,10 -701,10 +701,10 @@@ { const dealii::types::global_dof_index idx = cell->line(l)->mg_dof_index(level, d); if (check_validity) - Assert(idx != DoFHandler<2>::invalid_dof_index, ExcInternalError ()); + Assert(idx != numbers::invalid_dof_index, ExcInternalError ()); - if (idx != DoFHandler<1>::invalid_dof_index) + if (idx != numbers::invalid_dof_index) - cell->line(l)->set_mg_dof_index (level, d, ((indices.n_elements() == 0) ? + cell->line(l)->set_mg_dof_index (level, d, ((indices.size() == 0) ? new_numbers[idx] : new_numbers[indices.index_within_set(idx)])); } @@@ -717,10 -717,10 +717,10 @@@ for (std::vector::iterator i=dof_handler.mg_levels[level]->dof_object.dofs.begin(); i!=dof_handler.mg_levels[level]->dof_object.dofs.end(); ++i) { - if (*i != DoFHandler<2>::invalid_dof_index) + if (*i != numbers::invalid_dof_index) { Assert(*i::iterator i=dof_handler.vertex_dofs.begin(); i!=dof_handler.vertex_dofs.end(); ++i) - if (*i != DoFHandler<3,spacedim>::invalid_dof_index) + if (*i != numbers::invalid_dof_index) - *i = ((indices.n_elements() == 0) ? + *i = ((indices.size() == 0) ? new_numbers[*i] : new_numbers[indices.index_within_set(*i)]); else if (check_validity) @@@ -762,15 -762,15 +762,15 @@@ for (std::vector::iterator i=dof_handler.faces->lines.dofs.begin(); i!=dof_handler.faces->lines.dofs.end(); ++i) - if (*i != DoFHandler<3,spacedim>::invalid_dof_index) + if (*i != numbers::invalid_dof_index) - *i = ((indices.n_elements() == 0) ? + *i = ((indices.size() == 0) ? new_numbers[*i] : new_numbers[indices.index_within_set(*i)]); for (std::vector::iterator i=dof_handler.faces->quads.dofs.begin(); i!=dof_handler.faces->quads.dofs.end(); ++i) - if (*i != DoFHandler<3,spacedim>::invalid_dof_index) + if (*i != numbers::invalid_dof_index) - *i = ((indices.n_elements() == 0) ? + *i = ((indices.size() == 0) ? new_numbers[*i] : new_numbers[indices.index_within_set(*i)]); @@@ -779,8 -779,8 +779,8 @@@ for (std::vector::iterator 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) + if (*i != numbers::invalid_dof_index) - *i = ((indices.n_elements() == 0) ? + *i = ((indices.size() == 0) ? new_numbers[*i] : new_numbers[indices.index_within_set(*i)]); } @@@ -815,11 -815,11 +815,11 @@@ { const dealii::types::global_dof_index idx = i->get_index (level, d); if (check_validity) - Assert(idx != DoFHandler<3>::invalid_dof_index, ExcInternalError ()); + Assert(idx != numbers::invalid_dof_index, ExcInternalError ()); - if (idx != DoFHandler<3>::invalid_dof_index) + if (idx != numbers::invalid_dof_index) i->set_index (level, d, - ((indices.n_elements() == 0) ? + ((indices.size() == 0) ? new_numbers[idx] : new_numbers[indices.index_within_set(idx)])); } @@@ -850,10 -850,10 +850,10 @@@ { const dealii::types::global_dof_index idx = cell->line(l)->mg_dof_index(level, d); if (check_validity) - Assert(idx != DoFHandler<3>::invalid_dof_index, ExcInternalError ()); + Assert(idx != numbers::invalid_dof_index, ExcInternalError ()); - if (idx != DoFHandler<3>::invalid_dof_index) + if (idx != numbers::invalid_dof_index) - cell->line(l)->set_mg_dof_index (level, d, ((indices.n_elements() == 0) ? + cell->line(l)->set_mg_dof_index (level, d, ((indices.size() == 0) ? new_numbers[idx] : new_numbers[indices.index_within_set(idx)])); } @@@ -876,10 -876,10 +876,10 @@@ { const dealii::types::global_dof_index idx = cell->quad(l)->mg_dof_index(level, d); if (check_validity) - Assert(idx != DoFHandler<3>::invalid_dof_index, ExcInternalError ()); + Assert(idx != numbers::invalid_dof_index, ExcInternalError ()); - if (idx != DoFHandler<1>::invalid_dof_index) + if (idx != numbers::invalid_dof_index) - cell->quad(l)->set_mg_dof_index (level, d, ((indices.n_elements() == 0) ? + cell->quad(l)->set_mg_dof_index (level, d, ((indices.size() == 0) ? new_numbers[idx] : new_numbers[indices.index_within_set(idx)])); } @@@ -893,10 -893,10 +893,10 @@@ for (std::vector::iterator i=dof_handler.mg_levels[level]->dof_object.dofs.begin(); i!=dof_handler.mg_levels[level]->dof_object.dofs.end(); ++i) { - if (*i != DoFHandler<3>::invalid_dof_index) + if (*i != numbers::invalid_dof_index) { Assert(*i