From e0e21378f5bf31ca24745b958c2cf4bdc5cb1522 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 13 Jan 2013 20:06:06 +0000 Subject: [PATCH] Deprecate the functions that condense a linear system by shrinking its size and copying everything into a second set of objects. git-svn-id: https://svn.dealii.org/trunk@28041 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/lac/constraint_matrix.h | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/deal.II/include/deal.II/lac/constraint_matrix.h b/deal.II/include/deal.II/lac/constraint_matrix.h index 103433b068..bf539e6b23 100644 --- a/deal.II/include/deal.II/lac/constraint_matrix.h +++ b/deal.II/include/deal.II/lac/constraint_matrix.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------- // $Id$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -787,10 +787,14 @@ public: * * The constraint matrix object must be * closed to call this function. + * + * @deprecated The functions converting an uncondensed matrix into + * its condensed form are deprecated. Use the functions doing the + * in-place condensation leaving the size of the linear system unchanged. */ template void condense (const SparseMatrix &uncondensed, - SparseMatrix &condensed) const; + SparseMatrix &condensed) const DEAL_II_DEPRECATED; /** * This function does much the same as @@ -829,10 +833,14 @@ public: * or Trilinos vector wrapper class, or * any other type having the same * interface. + * + * @deprecated The functions converting an uncondensed matrix into + * its condensed form are deprecated. Use the functions doing the + * in-place condensation leaving the size of the linear system unchanged. */ template void condense (const VectorType &uncondensed, - VectorType &condensed) const; + VectorType &condensed) const DEAL_II_DEPRECATED; /** * Condense the given vector @@ -865,12 +873,16 @@ public: * * The constraint matrix object must be * closed to call this function. + * + * @deprecated The functions converting an uncondensed matrix into + * its condensed form are deprecated. Use the functions doing the + * in-place condensation leaving the size of the linear system unchanged. */ template void condense (const SparseMatrix &uncondensed_matrix, const VectorType &uncondensed_vector, SparseMatrix &condensed_matrix, - VectorType &condensed_vector) const; + VectorType &condensed_vector) const DEAL_II_DEPRECATED; /** * This function does much the same as @@ -2158,4 +2170,3 @@ add_entries_local_to_global (const std::vector &local_dof_indices, DEAL_II_NAMESPACE_CLOSE #endif - -- 2.39.5