From b8285e143475a0cc96abb5430b840c9bde1eca53 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 8 Jan 2013 19:58:12 +0000 Subject: [PATCH] Undeprecate a couple of functions that aren't by themselves evil, just slow or lead to big memory consumption. There are good reasons to use them in some places, though. Add a few notes. git-svn-id: https://svn.dealii.org/trunk@27980 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/dofs/dof_handler.h | 20 ++++++-------------- deal.II/include/deal.II/hp/dof_handler.h | 6 +++++- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/deal.II/include/deal.II/dofs/dof_handler.h b/deal.II/include/deal.II/dofs/dof_handler.h index 9deec237d0..20402cdf36 100644 --- a/deal.II/include/deal.II/dofs/dof_handler.h +++ b/deal.II/include/deal.II/dofs/dof_handler.h @@ -435,12 +435,6 @@ public: const std::vector &new_numbers); /** - * @deprecated Use - * CompressedSparsityPattern instead of - * initializing SparsityPattern with this - * value, see the discussion in step-2 - * and the @ref Sparsity module. - * * Return the maximum number of * degrees of freedom a degree of freedom * in the given triangulation with the @@ -486,15 +480,9 @@ public: * is also discussed in the documentation * of the module on @ref Sparsity. */ - unsigned int max_couplings_between_dofs () const DEAL_II_DEPRECATED; + unsigned int max_couplings_between_dofs () const; /** - * @deprecated Use - * CompressedSparsityPattern - * instead of initializing - * SparsityPattern with this - * value. - * * Return the number of degrees of freedom * located on the boundary another dof on * the boundary can couple with. @@ -502,8 +490,12 @@ public: * The number is the same as for * max_couplings_between_dofs() in one * dimension less. + * + * @note The same applies to this function as to max_couplings_per_dofs() + * as regards the performance of this function. Think about one of the + * dynamic sparsity pattern classes instead (see @ref Sparsity). */ - unsigned int max_couplings_between_boundary_dofs () const DEAL_II_DEPRECATED; + unsigned int max_couplings_between_boundary_dofs () const; /*--------------------------------------*/ diff --git a/deal.II/include/deal.II/hp/dof_handler.h b/deal.II/include/deal.II/hp/dof_handler.h index 32fbed9f02..ab10917eeb 100644 --- a/deal.II/include/deal.II/hp/dof_handler.h +++ b/deal.II/include/deal.II/hp/dof_handler.h @@ -272,7 +272,7 @@ namespace hp * matrix also. * * As for - * DoFHandler::max_couplings_between_dofs(), + * ::DoFHandler::max_couplings_between_dofs(), * the result of this function is often * not very accurate for 3d and/or high * polynomial degrees. The consequences @@ -289,6 +289,10 @@ namespace hp * The number is the same as for * @p max_coupling_between_dofs in one * dimension less. + * + * @note The same applies to this function as to max_couplings_per_dofs() + * as regards the performance of this function. Think about one of the + * dynamic sparsity pattern classes instead (see @ref Sparsity). */ unsigned int max_couplings_between_boundary_dofs () const; -- 2.39.5