Skip to content

Commit

Permalink
Merge pull request #13621 from drwells/improve-renumber-support-points
Browse files Browse the repository at this point in the history 
Make DoFRenumbering::support_point_wise() about twice as fast.
  • Loading branch information
@kronbichler
kronbichler committed Apr 17, 2022
2 parents 37b1cca + 4600f35 commit 91bff6e
Show file tree
Hide file tree
Showing 7 changed files with 192 additions and 7 deletions.
46 changes: 39 additions & 7 deletions source/dofs/dof_renumbering.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2296,8 +2296,21 @@ namespace DoFRenumbering
std::vector<unsigned int>(),
false);

const std::vector<types::global_dof_index> dofs_per_component =
DoFTools::count_dofs_per_fe_component(dof_handler, true);
#ifdef DEBUG
{
const std::vector<types::global_dof_index> dofs_per_component =
DoFTools::count_dofs_per_fe_component(dof_handler, true);
for (const auto &dpc : dofs_per_component)
Assert(dofs_per_component[0] == dpc, ExcNotImplemented());
}
#endif
const unsigned int n_components =
dof_handler.get_fe_collection().n_components();
Assert(dof_handler.n_dofs() % n_components == 0, ExcInternalError());
const types::global_dof_index dofs_per_component =
dof_handler.n_dofs() / n_components;
const types::global_dof_index local_dofs_per_component =
dof_handler.n_locally_owned_dofs() / n_components;

// At this point we have no more communication to do - simplify things by
// returning early if possible
Expand All @@ -2312,10 +2325,29 @@ namespace DoFRenumbering
// This index set equals what dof_handler.locally_owned_dofs() would be if
// we executed the componentwise renumbering.
IndexSet component_renumbered_dofs(dof_handler.n_dofs());
component_renumbered_dofs.add_indices(component_renumbering.begin(),
component_renumbering.end());
for (const auto &dpc : dofs_per_component)
AssertThrow(dofs_per_component[0] == dpc, ExcNotImplemented());
// DoFs in each component are now consecutive, which IndexSet::add_indices()
// can exploit by avoiding calls to sort. Make use of that by adding DoFs
// one component at a time:
std::vector<types::global_dof_index> component_dofs(
local_dofs_per_component);
for (unsigned int component = 0; component < n_components; ++component)
{
for (std::size_t i = 0; i < local_dofs_per_component; ++i)
component_dofs[i] =
component_renumbering[n_components * i + component];
component_renumbered_dofs.add_indices(component_dofs.begin(),
component_dofs.end());
}
component_renumbered_dofs.compress();
#ifdef DEBUG
{
IndexSet component_renumbered_dofs2(dof_handler.n_dofs());
component_renumbered_dofs2.add_indices(component_renumbering.begin(),
component_renumbering.end());
Assert(component_renumbered_dofs2 == component_renumbered_dofs,
ExcInternalError());
}
#endif
for (const FiniteElement<dim, spacedim> &fe :
dof_handler.get_fe_collection())
{
Expand Down Expand Up @@ -2382,7 +2414,7 @@ namespace DoFRenumbering
const auto local_index =
component_renumbered_dofs.index_within_set(
component_renumbered_cell_dofs[i] +
dofs_per_component[0] * component);
dofs_per_component * component);

if (component_to_nodal[local_index] ==
numbers::invalid_dof_index)
Expand Down
0 ...bering_01.mpirun=2.with_p4est=true.output → ..._01.mpirun=2.with_p4est=true.debug.output
View file
File renamed without changes.
51 changes: 51 additions & 0 deletions tests/dofs/nodal_renumbering_01.mpirun=2.with_p4est=true.release.output
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@

DEAL:0::new case with locally owned dofs = {[0,7]}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::new case with locally owned dofs = {[0,99]}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::new case with locally owned dofs = {[0,4033]}
DEAL:0::
DEAL:0::difference norm = 1.59444e-15
DEAL:0::new case with locally owned dofs = {[0,3]}
DEAL:0::
DEAL:0::new case with locally owned dofs = {[0,230]}
DEAL:0::
DEAL:0::new case with locally owned dofs = {[0,1721]}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:0::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:0::The violated condition was:
DEAL:0::fe.dofs_per_cell == 0 || fe.has_support_points()
DEAL:0::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:0::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:0::The violated condition was:
DEAL:0::fe.dofs_per_cell == 0 || fe.has_support_points()

DEAL:1::new case with locally owned dofs = {[8,9]}
DEAL:1::
DEAL:1::difference norm = 0.00000
DEAL:1::new case with locally owned dofs = {[100,249]}
DEAL:1::
DEAL:1::difference norm = 0.00000
DEAL:1::new case with locally owned dofs = {[4034,7965]}
DEAL:1::
DEAL:1::difference norm = 1.59444e-15
DEAL:1::new case with locally owned dofs = {4}
DEAL:1::
DEAL:1::new case with locally owned dofs = {[231,440]}
DEAL:1::
DEAL:1::new case with locally owned dofs = {[1722,3361]}
DEAL:1::
DEAL:1::difference norm = 0.00000
DEAL:1::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:1::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:1::The violated condition was:
DEAL:1::fe.dofs_per_cell == 0 || fe.has_support_points()
DEAL:1::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:1::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:1::The violated condition was:
DEAL:1::fe.dofs_per_cell == 0 || fe.has_support_points()

0 ...bering_01.mpirun=3.with_p4est=true.output → ..._01.mpirun=3.with_p4est=true.debug.output
View file
File renamed without changes.
77 changes: 77 additions & 0 deletions tests/dofs/nodal_renumbering_01.mpirun=3.with_p4est=true.release.output
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@

DEAL:0::new case with locally owned dofs = {}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::new case with locally owned dofs = {[0,49]}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::new case with locally owned dofs = {[0,2731]}
DEAL:0::
DEAL:0::difference norm = 1.67272e-15
DEAL:0::new case with locally owned dofs = {}
DEAL:0::
DEAL:0::new case with locally owned dofs = {[0,120]}
DEAL:0::
DEAL:0::new case with locally owned dofs = {[0,1101]}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:0::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:0::The violated condition was:
DEAL:0::fe.dofs_per_cell == 0 || fe.has_support_points()
DEAL:0::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:0::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:0::The violated condition was:
DEAL:0::fe.dofs_per_cell == 0 || fe.has_support_points()

DEAL:1::new case with locally owned dofs = {[0,7]}
DEAL:1::
DEAL:1::difference norm = 0.00000
DEAL:1::new case with locally owned dofs = {[50,149]}
DEAL:1::
DEAL:1::difference norm = 0.00000
DEAL:1::new case with locally owned dofs = {[2732,5305]}
DEAL:1::
DEAL:1::difference norm = 1.67272e-15
DEAL:1::new case with locally owned dofs = {[0,3]}
DEAL:1::
DEAL:1::new case with locally owned dofs = {[121,340]}
DEAL:1::
DEAL:1::new case with locally owned dofs = {[1102,2361]}
DEAL:1::
DEAL:1::difference norm = 0.00000
DEAL:1::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:1::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:1::The violated condition was:
DEAL:1::fe.dofs_per_cell == 0 || fe.has_support_points()
DEAL:1::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:1::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:1::The violated condition was:
DEAL:1::fe.dofs_per_cell == 0 || fe.has_support_points()


DEAL:2::new case with locally owned dofs = {[8,9]}
DEAL:2::
DEAL:2::difference norm = 0.00000
DEAL:2::new case with locally owned dofs = {[150,249]}
DEAL:2::
DEAL:2::difference norm = 0.00000
DEAL:2::new case with locally owned dofs = {[5306,7935]}
DEAL:2::
DEAL:2::difference norm = 1.67272e-15
DEAL:2::new case with locally owned dofs = {4}
DEAL:2::
DEAL:2::new case with locally owned dofs = {[341,440]}
DEAL:2::
DEAL:2::new case with locally owned dofs = {[2362,3361]}
DEAL:2::
DEAL:2::difference norm = 0.00000
DEAL:2::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:2::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:2::The violated condition was:
DEAL:2::fe.dofs_per_cell == 0 || fe.has_support_points()
DEAL:2::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:2::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:2::The violated condition was:
DEAL:2::fe.dofs_per_cell == 0 || fe.has_support_points()

0 ...dal_renumbering_01.with_p4est=true.output → ...numbering_01.with_p4est=true.debug.output
View file
File renamed without changes.
25 changes: 25 additions & 0 deletions tests/dofs/nodal_renumbering_01.with_p4est=true.release.output
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

DEAL:0::new case with locally owned dofs = {[0,9]}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::new case with locally owned dofs = {[0,249]}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::new case with locally owned dofs = {[0,7941]}
DEAL:0::
DEAL:0::difference norm = 1.62791e-15
DEAL:0::new case with locally owned dofs = {[0,4]}
DEAL:0::
DEAL:0::new case with locally owned dofs = {[0,440]}
DEAL:0::
DEAL:0::new case with locally owned dofs = {[0,3361]}
DEAL:0::
DEAL:0::difference norm = 0.00000
DEAL:0::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:0::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:0::The violated condition was:
DEAL:0::fe.dofs_per_cell == 0 || fe.has_support_points()
DEAL:0::FE_NedelecSZ nodal renumbering failed successfully with message:
DEAL:0::void dealii::DoFRenumbering::compute_support_point_wise(std::vector<unsigned int>&, const dealii::DoFHandler<dim, spacedim>&) [with int dim = 2; int spacedim = 2]
DEAL:0::The violated condition was:
DEAL:0::fe.dofs_per_cell == 0 || fe.has_support_points()

0 comments on commit 91bff6e

Please sign in to comment.