From 9598bf22e5277e432d38422c0692a23e7ce90d02 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 21 Jun 2020 00:19:25 -0400 Subject: [PATCH] Remove the deprecated DoFTools::extract_locally_owned_dofs --- doc/doxygen/headers/distributed.h | 2 +- source/dofs/dof_tools.cc | 12 ------------ source/dofs/dof_tools.inst.in | 7 ------- tests/mpi/condense_01.cc | 2 +- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/doc/doxygen/headers/distributed.h b/doc/doxygen/headers/distributed.h index 61281e4f89..72223151eb 100644 --- a/doc/doxygen/headers/distributed.h +++ b/doc/doxygen/headers/distributed.h @@ -251,7 +251,7 @@ * The remaining question is how to identify the set of indices that * correspond to degrees of freedom we need to worry about on each * processor. To this end, you can use the - * DoFTools::extract_locally_owned_dofs() function to get at all the + * DoFHandler::locally_owned_dofs() function to get at all the * indices a processor owns. Note that this is a subset of the degrees * of freedom that are defined on the locally owned cells (since some * of the degrees of freedom at the interface between two different diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index 5d42d61249..05695a385c 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -1135,18 +1135,6 @@ namespace DoFTools - template - void - extract_locally_owned_dofs(const DoFHandlerType &dof_handler, - IndexSet & dof_set) - { - // collect all the locally owned dofs - dof_set = dof_handler.locally_owned_dofs(); - dof_set.compress(); - } - - - template void extract_locally_active_dofs(const DoFHandlerType &dof_handler, diff --git a/source/dofs/dof_tools.inst.in b/source/dofs/dof_tools.inst.in index 29a07daa68..eb588ed02d 100644 --- a/source/dofs/dof_tools.inst.in +++ b/source/dofs/dof_tools.inst.in @@ -35,13 +35,6 @@ for (DoFHandler : DOFHANDLER_TEMPLATES; const unsigned int level, IndexSet & dof_set); - template void - extract_locally_owned_dofs< - DoFHandler>( - const DoFHandler - & dof_handler, - IndexSet &dof_set); - template void extract_locally_active_dofs< DoFHandler>( diff --git a/tests/mpi/condense_01.cc b/tests/mpi/condense_01.cc index 0b3c435168..1fc960c81c 100644 --- a/tests/mpi/condense_01.cc +++ b/tests/mpi/condense_01.cc @@ -76,7 +76,7 @@ test() constraints.close(); IndexSet locally_owned_dofs, locally_relevant_dofs; - DoFTools::extract_locally_owned_dofs(dof_handler, locally_owned_dofs); + locally_owned_dofs = dof_handler.locally_owned_dofs(); DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); PETScWrappers::MPI::Vector vec(locally_owned_dofs, MPI_COMM_WORLD); -- 2.39.5