From: Timo Heister Date: Fri, 12 Aug 2016 15:42:27 +0000 (-0400) Subject: remove CompressedSparsityPattern classes X-Git-Tag: v8.5.0-rc1~773^2~6 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d66722ec5e4ccfcfe01aff1b9aeeb1a5855d8001;p=dealii.git remove CompressedSparsityPattern classes [Block]Compressed*SparsityPattern classed got deprecated in March 2015 for DynamicSparsityPattern. Remove them and corresponding tests. --- diff --git a/include/deal.II/lac/block_sparsity_pattern.h b/include/deal.II/lac/block_sparsity_pattern.h index 662af1b73a..ffb2ecccc8 100644 --- a/include/deal.II/lac/block_sparsity_pattern.h +++ b/include/deal.II/lac/block_sparsity_pattern.h @@ -24,9 +24,7 @@ #include #include #include -#include -#include -#include +#include #include DEAL_II_NAMESPACE_OPEN @@ -450,7 +448,7 @@ public: * rather acts as a @p typedef to introduce the name of this class, without * requiring the user to specify the templated name of the base class. For * information on the interface of this class refer to the base class. The - * individual blocks are based on the CompressedSparsityPattern class. + * individual blocks are based on the DynamicSparsityPattern class. * * This class is an example of the "dynamic" type of * @ref Sparsity. @@ -568,23 +566,6 @@ public: using BlockSparsityPatternBase::reinit; }; -/** - * @deprecated Use BlockDynamicSparsityPattern instead. - */ -typedef BlockDynamicSparsityPattern BlockCompressedSparsityPattern DEAL_II_DEPRECATED; - -/** - * @deprecated Use BlockDynamicSparsityPattern instead. - */ -typedef BlockDynamicSparsityPattern BlockCompressedSetSparsityPattern DEAL_II_DEPRECATED; - -/** - * @deprecated Use BlockDynamicSparsityPattern instead. - */ -typedef BlockDynamicSparsityPattern BlockCompressedSimpleSparsityPattern DEAL_II_DEPRECATED; - - - #ifdef DEAL_II_WITH_TRILINOS diff --git a/include/deal.II/lac/compressed_set_sparsity_pattern.h b/include/deal.II/lac/compressed_set_sparsity_pattern.h deleted file mode 100644 index e6a8b69f95..0000000000 --- a/include/deal.II/lac/compressed_set_sparsity_pattern.h +++ /dev/null @@ -1,38 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2001 - 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - -#ifndef dealii__compressed_set_sparsity_pattern_h -#define dealii__compressed_set_sparsity_pattern_h - - -#include -#include - -DEAL_II_NAMESPACE_OPEN - -/*! @addtogroup Sparsity - *@{ - */ - -/** - * @deprecated Use DynamicSparsityPattern instead. - */ -typedef DynamicSparsityPattern CompressedSetSparsityPattern DEAL_II_DEPRECATED; - -/*@}*/ - -DEAL_II_NAMESPACE_CLOSE - -#endif diff --git a/include/deal.II/lac/compressed_simple_sparsity_pattern.h b/include/deal.II/lac/compressed_simple_sparsity_pattern.h deleted file mode 100644 index 500bc4f88e..0000000000 --- a/include/deal.II/lac/compressed_simple_sparsity_pattern.h +++ /dev/null @@ -1,51 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2001 - 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - -#ifndef dealii__compressed_simple_sparsity_pattern_h -#define dealii__compressed_simple_sparsity_pattern_h - - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - -DEAL_II_NAMESPACE_OPEN - -template class SparseMatrix; - - -/*! @addtogroup Sparsity - *@{ - */ - -/** - * @deprecated Use DynamicSparsityPattern instead. - */ -typedef DynamicSparsityPattern CompressedSimpleSparsityPattern DEAL_II_DEPRECATED; - -/*@}*/ - - -DEAL_II_NAMESPACE_CLOSE - -#endif diff --git a/include/deal.II/lac/compressed_sparsity_pattern.h b/include/deal.II/lac/compressed_sparsity_pattern.h deleted file mode 100644 index 26e531b2ad..0000000000 --- a/include/deal.II/lac/compressed_sparsity_pattern.h +++ /dev/null @@ -1,38 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2001 - 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - -#ifndef dealii__compressed_sparsity_pattern_h -#define dealii__compressed_sparsity_pattern_h - - -#include -#include - -DEAL_II_NAMESPACE_OPEN - -/*! @addtogroup Sparsity - *@{ - */ - -/** - * @deprecated Use DynamicSparsityPattern instead. - */ -typedef DynamicSparsityPattern CompressedSparsityPattern DEAL_II_DEPRECATED; - -/*@}*/ - -DEAL_II_NAMESPACE_CLOSE - -#endif diff --git a/include/deal.II/lac/petsc_parallel_sparse_matrix.h b/include/deal.II/lac/petsc_parallel_sparse_matrix.h index f8ced1a8b7..ba8574f01c 100644 --- a/include/deal.II/lac/petsc_parallel_sparse_matrix.h +++ b/include/deal.II/lac/petsc_parallel_sparse_matrix.h @@ -101,7 +101,7 @@ namespace PETScWrappers * * The only way to avoid this is to tell PETSc where the actual entries of * the matrix will be. For this, there are constructors and reinit() - * functions of this class that take a CompressedSparsityPattern object + * functions of this class that take a DynamicSparsityPattern object * containing all this information. While in the general case it is * sufficient if the constructors and reinit() functions know the number * of local rows and columns, the functions getting a sparsity pattern