From 29a12bd9382cc76e5cfd5275991e890c1435b15c Mon Sep 17 00:00:00 2001 From: kanschat Date: Wed, 22 Aug 2007 16:59:41 +0000 Subject: [PATCH] remove more deprecated functions in lac git-svn-id: https://svn.dealii.org/trunk@15011 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/block_matrix_base.h | 34 ------------------- deal.II/lac/include/lac/sparse_matrix.h | 18 ---------- .../lac/include/lac/sparse_matrix.templates.h | 10 ------ deal.II/lac/include/lac/sparse_matrix_ez.h | 26 -------------- deal.II/lac/source/sparse_matrix_matrix.in.h | 5 +-- 5 files changed, 1 insertion(+), 92 deletions(-) diff --git a/deal.II/lac/include/lac/block_matrix_base.h b/deal.II/lac/include/lac/block_matrix_base.h index c6af8a2289..34f11e932c 100644 --- a/deal.II/lac/include/lac/block_matrix_base.h +++ b/deal.II/lac/include/lac/block_matrix_base.h @@ -585,25 +585,6 @@ class BlockMatrixBase : public Subscriptor const BlockMatrixType &matrix); - /** - * @deprecated Add - * matrix scaled by - * factor to this - * matrix, i.e. the matrix - * factor*matrix is - * added to this. - * - * This function is - * deprecated. Use add - * instead, since this has the - * same interface as the other - * matrix and vector classes in - * the library. - */ - template - void add_scaled (const value_type factor, - const BlockMatrixType &matrix); - /** * Adding Matrix-vector * multiplication. Add $M*src$ on @@ -1714,21 +1695,6 @@ BlockMatrixBase::operator /= (const value_type factor) -template -template -void -BlockMatrixBase:: -add_scaled (const value_type factor, - const BlockMatrixType &matrix) -{ - for (unsigned int r=0; r template void diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index d00c221956..297d84298c 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -926,24 +926,6 @@ class SparseMatrix : public virtual Subscriptor void add (const number factor, const SparseMatrix &matrix); - /** - * @deprecated Add - * matrix scaled by - * factor to this - * matrix, i.e. the matrix - * factor*matrix is - * added to this. - * - * This function is - * deprecated. Use add - * instead, since this has the - * same interface as the other - * matrix and vector classes in - * the library. - */ - template - void add_scaled (const number factor, - const SparseMatrix &matrix); //@} /** * @name Entry Access diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h index 236d13979a..8ba5136940 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -325,16 +325,6 @@ SparseMatrix::add (const number factor, } -template -template -void -SparseMatrix::add_scaled (const number factor, - const SparseMatrix &matrix) -{ - add(factor, matrix); -} - - template template void diff --git a/deal.II/lac/include/lac/sparse_matrix_ez.h b/deal.II/lac/include/lac/sparse_matrix_ez.h index 88a5d84d54..5ca5b70994 100644 --- a/deal.II/lac/include/lac/sparse_matrix_ez.h +++ b/deal.II/lac/include/lac/sparse_matrix_ez.h @@ -520,22 +520,6 @@ class SparseMatrixEZ : public Subscriptor void add (const number factor, const MATRIX &matrix); - /** - * @deprecated Add @p matrix - * scaled by @p factor to this - * matrix. - * - * This function is - * deprecated. Use add - * instead, since this has the - * same interface as the other - * matrix and vector classes in - * the library. - */ - template - void add_scaled (const number factor, - const MATRIX &matrix); - /** * Return the value of the entry * (i,j). This may be an @@ -1465,16 +1449,6 @@ SparseMatrixEZ::add (const number factor, } -template -template -inline -void -SparseMatrixEZ::add_scaled (const number factor, - const MATRIX& M) -{ - add (factor, M); -} - template template diff --git a/deal.II/lac/source/sparse_matrix_matrix.in.h b/deal.II/lac/source/sparse_matrix_matrix.in.h index bb0a3cdc2c..df8b2b21bf 100644 --- a/deal.II/lac/source/sparse_matrix_matrix.in.h +++ b/deal.II/lac/source/sparse_matrix_matrix.in.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -27,7 +27,4 @@ void SparseMatrix::copy_from (const FullMatrix &); template void SparseMatrix::add (const TYPEMAT, const SparseMatrix &); -template void SparseMatrix::add_scaled (const TYPEMAT, - const SparseMatrix &); - DEAL_II_NAMESPACE_CLOSE -- 2.39.5