From: Wolfgang Bangerth Date: Sun, 25 Jan 2015 18:22:42 +0000 (-0600) Subject: Remove deprecated function MGTools::extract_inner_interface_dofs. X-Git-Tag: v8.3.0-rc1~516^2~5 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f75a11db8c520efc834cde768343939dfd70d72e;p=dealii.git Remove deprecated function MGTools::extract_inner_interface_dofs. --- diff --git a/doc/news/changes.h b/doc/news/changes.h index 977ecd63df..92e96e6ff3 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -205,6 +205,7 @@ inconvenience this causes. - PreconditionBlock::size. - MGTools::count_dofs_per_component. - MGTools::apply_boundary_values. + - MGTools::extract_inner_interface_dofs.
This release also removes the deprecated class MGDoFHandler. The functionality of this class had previously been incorporated into diff --git a/include/deal.II/multigrid/mg_tools.h b/include/deal.II/multigrid/mg_tools.h index 85277d5bf2..a6a69dfe6f 100644 --- a/include/deal.II/multigrid/mg_tools.h +++ b/include/deal.II/multigrid/mg_tools.h @@ -213,15 +213,6 @@ namespace MGTools extract_inner_interface_dofs (const DoFHandler &mg_dof_handler, std::vector &interface_dofs); - /** - * As above but with a deprecated data structure. This makes one additional - * copy. - */ - template - void - extract_inner_interface_dofs (const DoFHandler &mg_dof_handler, - std::vector > &interface_dofs) DEAL_II_DEPRECATED; - template void diff --git a/include/deal.II/multigrid/mg_transfer_component.h b/include/deal.II/multigrid/mg_transfer_component.h index b9d9d1e05b..9dfc70f5c0 100644 --- a/include/deal.II/multigrid/mg_transfer_component.h +++ b/include/deal.II/multigrid/mg_transfer_component.h @@ -346,12 +346,12 @@ private: unsigned int mg_selected_component; /** - * The degrees of freedom on the the refinement edges. For each level (outer - * vector) and each dof index (inner vector), this bool is true if the level - * degree of freedom is on the refinement edge towards the lower level + * The degrees of freedom on the refinement edges. For each level the index + * set denotes which level + * degrees of freedom are on the refinement edge towards the lower level, * excluding boundary dofs. */ - std::vector > interface_dofs; + std::vector interface_dofs; /** * The constraints of the global system. diff --git a/source/multigrid/mg_tools.cc b/source/multigrid/mg_tools.cc index 68b1a2963c..70025fbb61 100644 --- a/source/multigrid/mg_tools.cc +++ b/source/multigrid/mg_tools.cc @@ -1405,29 +1405,6 @@ namespace MGTools } - template - void - extract_inner_interface_dofs (const DoFHandler &mg_dof_handler, - std::vector > &interface_dofs) - { - std::vector temp; - temp.resize(interface_dofs.size()); - for (unsigned int l=0; l void extract_non_interface_dofs (const DoFHandler &mg_dof_handler, diff --git a/source/multigrid/mg_tools.inst.in b/source/multigrid/mg_tools.inst.in index 8a5981891f..329b7ce229 100644 --- a/source/multigrid/mg_tools.inst.in +++ b/source/multigrid/mg_tools.inst.in @@ -106,10 +106,6 @@ for (deal_II_dimension : DIMENSIONS) void extract_inner_interface_dofs (const DoFHandler &mg_dof_handler, std::vector &interface_dofs); - template - void - extract_inner_interface_dofs (const DoFHandler &mg_dof_handler, - std::vector > &interface_dofs); template void diff --git a/source/multigrid/mg_transfer_component.cc b/source/multigrid/mg_transfer_component.cc index af335e2247..185706e5d3 100644 --- a/source/multigrid/mg_transfer_component.cc +++ b/source/multigrid/mg_transfer_component.cc @@ -614,7 +614,10 @@ void MGTransferSelect::build_matrices ( interface_dofs.resize(mg_dof.get_tria().n_levels()); for (unsigned int l=0; l::build_matrices ( const unsigned int component = fe.system_to_component_index(i).first; if (component_mask[component] && - !interface_dofs[level][level_dof_indices[i]]) + !interface_dofs[level].is_element(level_dof_indices[i])) { const types::global_dof_index level_start = mg_component_start[level][mg_target_component[component]];