From e1151638524119ec00aee06907ce472c761c9204 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sun, 25 Jan 2015 12:20:39 -0600 Subject: [PATCH] Remove deprecated function MGTools::apply_boundary_values. --- doc/news/changes.h | 1 + include/deal.II/multigrid/mg_tools.h | 19 ------- source/multigrid/mg_tools.cc | 79 ---------------------------- 3 files changed, 1 insertion(+), 98 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index a38e733781..977ecd63df 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -204,6 +204,7 @@ inconvenience this causes. - GridTools::extract_boundary_mesh. - PreconditionBlock::size. - MGTools::count_dofs_per_component. + - MGTools::apply_boundary_values.
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 ce4e0a522d..85277d5bf2 100644 --- a/include/deal.II/multigrid/mg_tools.h +++ b/include/deal.II/multigrid/mg_tools.h @@ -203,25 +203,6 @@ namespace MGTools std::vector &boundary_indices, const ComponentMask &component_mask = ComponentMask()); - /** - * @deprecated - */ - template - void - apply_boundary_values (const std::set &boundary_dofs, - SparseMatrix &matrix, - const bool preserve_symmetry, - const bool ignore_zeros = false) DEAL_II_DEPRECATED; - - /** - * @deprecated - */ - template - void - apply_boundary_values (const std::set &boundary_dofs, - BlockSparseMatrix &matrix, - const bool preserve_symmetry) DEAL_II_DEPRECATED; - /** * For each level in a multigrid hierarchy, produce an IndexSet that * indicates which of the degrees of freedom are along interfaces of this diff --git a/source/multigrid/mg_tools.cc b/source/multigrid/mg_tools.cc index d23cf4a6d3..68b1a2963c 100644 --- a/source/multigrid/mg_tools.cc +++ b/source/multigrid/mg_tools.cc @@ -1576,89 +1576,10 @@ namespace MGTools } } - - - template - void - apply_boundary_values ( - const std::set &boundary_dofs, - SparseMatrix &matrix, - const bool preserve_symmetry, - const bool /*ignore_zeros*/) - { - // this function is not documented and not tested in the testsuite - // so it isn't quite clear what it's supposed to do. it also isn't - // used anywhere else in the library. in avoiding the use of - // a deprecated function, I therefore threw away the original function - // and replaced it by the following, which I believe should work - - std::map boundary_values; - for (std::set::const_iterator p=boundary_dofs.begin(); - p != boundary_dofs.end(); ++p) - boundary_values[*p] = 0; - - Vector dummy(matrix.m()); - MatrixTools::apply_boundary_values (boundary_values, - matrix, dummy, dummy, - preserve_symmetry); - } - - - - template - void - apply_boundary_values ( - const std::set &boundary_dofs, - BlockSparseMatrix &matrix, - const bool preserve_symmetry) - { - Assert (matrix.n_block_rows() == matrix.n_block_cols(), - ExcNotQuadratic()); - Assert (matrix.get_sparsity_pattern().get_row_indices() == - matrix.get_sparsity_pattern().get_column_indices(), - ExcNotQuadratic()); - - // this function is not documented and not tested in the testsuite - // so it isn't quite clear what it's supposed to do. it also isn't - // used anywhere else in the library. in avoiding the use of - // a deprecated function, I therefore threw away the original function - // and replaced it by the following, which I believe should work - - std::map boundary_values; - for (std::set::const_iterator p=boundary_dofs.begin(); - p != boundary_dofs.end(); ++p) - boundary_values[*p] = 0; - - BlockVector dummy(matrix.n_block_rows()); - for (unsigned int i=0; i &, - SparseMatrix &, const bool, const bool); - template void apply_boundary_values ( - const std::set &, - SparseMatrix &, const bool, const bool); - template void apply_boundary_values ( - const std::set &, - BlockSparseMatrix &, const bool); - template void apply_boundary_values ( - const std::set &, - BlockSparseMatrix &, const bool); -} - - DEAL_II_NAMESPACE_CLOSE -- 2.39.5