From d9368146e2f147dca07c2ac2954f61927575a1bd Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 5 Jan 2015 08:57:03 -0600 Subject: [PATCH] Remove deprecated function *Vector*::compress() without argument. --- doc/news/changes.h | 3 +++ include/deal.II/lac/block_vector_base.h | 15 --------------- include/deal.II/lac/parallel_vector.h | 15 --------------- include/deal.II/lac/petsc_vector_base.h | 5 ----- include/deal.II/lac/trilinos_vector_base.h | 17 +---------------- source/lac/petsc_vector_base.cc | 8 -------- tests/lac/ala_01.cc | 4 ++-- tests/trilinos/11.cc | 4 ++-- tests/trilinos/12.cc | 4 ++-- tests/trilinos/13.cc | 4 ++-- tests/trilinos/15.cc | 1 + tests/trilinos/17.cc | 4 ++-- tests/trilinos/18.cc | 4 ++-- tests/trilinos/19.cc | 4 ++-- tests/trilinos/20.cc | 4 ++-- tests/trilinos/21.cc | 4 ++-- tests/trilinos/22.cc | 6 +++--- tests/trilinos/23.cc | 6 +++--- tests/trilinos/24.cc | 4 ++-- tests/trilinos/25.cc | 4 ++-- tests/trilinos/26.cc | 4 ++-- tests/trilinos/27.cc | 4 ++-- tests/trilinos/28.cc | 4 ++-- tests/trilinos/30.cc | 4 ++-- tests/trilinos/31.cc | 4 ++-- tests/trilinos/32.cc | 4 ++-- tests/trilinos/33.cc | 4 ++-- tests/trilinos/34.cc | 4 ++-- tests/trilinos/35.cc | 6 +++--- tests/trilinos/36.cc | 6 +++--- tests/trilinos/37.cc | 4 ++-- tests/trilinos/38.cc | 6 +++--- tests/trilinos/39.cc | 6 +++--- tests/trilinos/40.cc | 8 ++++---- tests/trilinos/41.cc | 6 +++--- tests/trilinos/42.cc | 6 +++--- tests/trilinos/43.cc | 8 ++++---- tests/trilinos/44.cc | 10 +++++----- tests/trilinos/45.cc | 6 +++--- tests/trilinos/46.cc | 6 +++--- tests/trilinos/47.cc | 8 ++++---- tests/trilinos/48.cc | 8 ++++---- tests/trilinos/51.cc | 6 +++--- tests/trilinos/53.cc | 5 +++-- tests/trilinos/54.cc | 5 +++-- tests/trilinos/55.cc | 4 ++-- tests/trilinos/56.cc | 4 ++-- tests/trilinos/57.cc | 4 ++-- tests/trilinos/58.cc | 4 ++-- tests/trilinos/59.cc | 4 ++-- tests/trilinos/60.cc | 4 ++-- tests/trilinos/61.cc | 4 ++-- tests/trilinos/deal_solver_01.cc | 6 +++--- tests/trilinos/deal_solver_02.cc | 6 +++--- tests/trilinos/deal_solver_03.cc | 6 +++--- tests/trilinos/deal_solver_04.cc | 6 +++--- tests/trilinos/deal_solver_05.cc | 6 +++--- tests/trilinos/deal_solver_06.cc | 6 +++--- tests/trilinos/solver_03.cc | 6 +++--- tests/trilinos/solver_05.cc | 6 +++--- tests/trilinos/solver_07.cc | 6 +++--- tests/trilinos/sparse_matrix_vector_01.cc | 8 ++++---- tests/trilinos/sparse_matrix_vector_02.cc | 8 ++++---- tests/trilinos/sparse_matrix_vector_03.cc | 8 ++++---- tests/trilinos/sparse_matrix_vector_04.cc | 8 ++++---- tests/trilinos/sparse_matrix_vector_05.cc | 8 ++++---- tests/trilinos/sparse_matrix_vector_06.cc | 6 +++--- tests/trilinos/sparse_matrix_vector_07.cc | 8 ++++---- 68 files changed, 173 insertions(+), 225 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 0b672c655d..0f6ae16aea 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -105,6 +105,9 @@ inconvenience this causes. - The deprecated constructor of SparseILU. - SparseILU::apply_decomposition. - The deprecated constructor of SparseMIC. +- The compress() functions without argument in the various vector + classes. You should use the versions with a VectorOperation + argument instead. diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h index 9b15eab2bc..2830ade016 100644 --- a/include/deal.II/lac/block_vector_base.h +++ b/include/deal.II/lac/block_vector_base.h @@ -629,11 +629,6 @@ public: */ void compress (::dealii::VectorOperation::values operation); - /** - * @deprecated: use compress(VectorOperation::values) instead. - */ - void compress () DEAL_II_DEPRECATED; - /** * Access to a single block. */ @@ -1691,16 +1686,6 @@ BlockVectorBase::compress (::dealii::VectorOperation::values operati -template -inline -void -BlockVectorBase::compress () -{ - compress(VectorOperation::unknown); -} - - - template inline typename BlockVectorBase::iterator diff --git a/include/deal.II/lac/parallel_vector.h b/include/deal.II/lac/parallel_vector.h index a633a89ded..457782cfb8 100644 --- a/include/deal.II/lac/parallel_vector.h +++ b/include/deal.II/lac/parallel_vector.h @@ -370,11 +370,6 @@ namespace parallel */ void compress (::dealii::VectorOperation::values operation); - /** - * @deprecated: use compress(VectorOperation::values) instead. - */ - void compress () DEAL_II_DEPRECATED; - /** * Fills the data field for ghost indices with the values stored in the * respective positions of the owning processor. This function is needed @@ -1333,16 +1328,6 @@ namespace parallel - template - inline - void - Vector::compress () - { - compress(VectorOperation::unknown); - } - - - template inline void diff --git a/include/deal.II/lac/petsc_vector_base.h b/include/deal.II/lac/petsc_vector_base.h index a6f3392a24..ebe9b7bac5 100644 --- a/include/deal.II/lac/petsc_vector_base.h +++ b/include/deal.II/lac/petsc_vector_base.h @@ -272,11 +272,6 @@ namespace PETScWrappers */ void compress (::dealii::VectorOperation::values operation); - /** - * @deprecated: use compress(VectorOperation::values) instead. - */ - void compress () DEAL_II_DEPRECATED; - /** * Set all components of the vector to the given number @p s. Simply pass * this down to the individual block objects, but we still need to declare diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h index 9235eec0de..50d54123fa 100644 --- a/include/deal.II/lac/trilinos_vector_base.h +++ b/include/deal.II/lac/trilinos_vector_base.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2008 - 2014 by the deal.II authors +// Copyright (C) 2008 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -282,12 +282,6 @@ namespace TrilinosWrappers */ void compress (::dealii::VectorOperation::values operation); - /** - * @deprecated: Use the compress(VectorOperation::values) function above - * instead. - */ - void compress() DEAL_II_DEPRECATED; - /** * @deprecated Use compress(dealii::VectorOperation::values) instead. */ @@ -1230,15 +1224,6 @@ namespace TrilinosWrappers - inline - void - VectorBase::compress () - { - compress(VectorOperation::unknown); - } - - - inline VectorBase & VectorBase::operator = (const TrilinosScalar s) diff --git a/source/lac/petsc_vector_base.cc b/source/lac/petsc_vector_base.cc index 26324e95f6..a90e093ce2 100644 --- a/source/lac/petsc_vector_base.cc +++ b/source/lac/petsc_vector_base.cc @@ -418,14 +418,6 @@ namespace PETScWrappers - void - VectorBase::compress () - { - compress(VectorOperation::unknown); - } - - - VectorBase::real_type VectorBase::norm_sqr () const { diff --git a/tests/lac/ala_01.cc b/tests/lac/ala_01.cc index 3e87f8ce49..9604b91f14 100644 --- a/tests/lac/ala_01.cc +++ b/tests/lac/ala_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2013 by the deal.II authors +// Copyright (C) 2004 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -29,7 +29,7 @@ void test () VEC x(3); x(0)=10; deallog << x.l2_norm() << std::endl; - x.compress(); + x.compress(VectorOperation::insert); deallog << "OK" << std::endl; } diff --git a/tests/trilinos/11.cc b/tests/trilinos/11.cc index 83613362e8..b8601816c2 100644 --- a/tests/trilinos/11.cc +++ b/tests/trilinos/11.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2013 by the deal.II authors +// Copyright (C) 2004 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -30,7 +30,7 @@ void test (TrilinosWrappers::Vector &v) for (unsigned int i=0; i w (v); Vector x (v); diff --git a/tests/trilinos/59.cc b/tests/trilinos/59.cc index c5b1b4cfed..9701c5452c 100644 --- a/tests/trilinos/59.cc +++ b/tests/trilinos/59.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2013 by the deal.II authors +// Copyright (C) 2004 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -38,7 +38,7 @@ void test (TrilinosWrappers::Vector &v) pattern[i] = true; } - v.compress (); + v.compress (VectorOperation::add); Vector w (v); Vector x (v); diff --git a/tests/trilinos/60.cc b/tests/trilinos/60.cc index 78f9794b68..17af35cc05 100644 --- a/tests/trilinos/60.cc +++ b/tests/trilinos/60.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2013 by the deal.II authors +// Copyright (C) 2004 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -38,7 +38,7 @@ void test (TrilinosWrappers::Vector &v) pattern[i] = true; } - v.compress (); + v.compress (VectorOperation::add); Vector w; w=v; diff --git a/tests/trilinos/61.cc b/tests/trilinos/61.cc index 4bf25d0118..5fd5f04901 100644 --- a/tests/trilinos/61.cc +++ b/tests/trilinos/61.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2013 by the deal.II authors +// Copyright (C) 2004 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -38,7 +38,7 @@ void test (TrilinosWrappers::Vector &v) pattern[i] = true; } - v.compress (); + v.compress (VectorOperation::add); Vector w(v.size()); w=v; diff --git a/tests/trilinos/deal_solver_01.cc b/tests/trilinos/deal_solver_01.cc index ec0ae150e6..14c36b4b7c 100644 --- a/tests/trilinos/deal_solver_01.cc +++ b/tests/trilinos/deal_solver_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -94,8 +94,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); GrowingVectorMemory mem; SolverCG solver(control, mem); diff --git a/tests/trilinos/deal_solver_02.cc b/tests/trilinos/deal_solver_02.cc index 98014991b3..21b3c5d5ea 100644 --- a/tests/trilinos/deal_solver_02.cc +++ b/tests/trilinos/deal_solver_02.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -95,8 +95,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); GrowingVectorMemory mem; SolverBicgstab solver(control,mem); diff --git a/tests/trilinos/deal_solver_03.cc b/tests/trilinos/deal_solver_03.cc index 52f477d159..394a9489f2 100644 --- a/tests/trilinos/deal_solver_03.cc +++ b/tests/trilinos/deal_solver_03.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -96,8 +96,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); GrowingVectorMemory mem; SolverGMRES solver(control,mem); diff --git a/tests/trilinos/deal_solver_04.cc b/tests/trilinos/deal_solver_04.cc index 5af9b1f76f..87ee004693 100644 --- a/tests/trilinos/deal_solver_04.cc +++ b/tests/trilinos/deal_solver_04.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -95,8 +95,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); GrowingVectorMemory mem; SolverMinRes solver(control,mem); diff --git a/tests/trilinos/deal_solver_05.cc b/tests/trilinos/deal_solver_05.cc index 7013d97b76..a34b93bf98 100644 --- a/tests/trilinos/deal_solver_05.cc +++ b/tests/trilinos/deal_solver_05.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -94,8 +94,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); GrowingVectorMemory mem; SolverQMRS solver(control,mem); diff --git a/tests/trilinos/deal_solver_06.cc b/tests/trilinos/deal_solver_06.cc index 9e8a68126f..312b6bc111 100644 --- a/tests/trilinos/deal_solver_06.cc +++ b/tests/trilinos/deal_solver_06.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -92,8 +92,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); GrowingVectorMemory mem; SolverRichardson solver(control,mem,0.1); diff --git a/tests/trilinos/solver_03.cc b/tests/trilinos/solver_03.cc index 305c463d1e..d73e57fcca 100644 --- a/tests/trilinos/solver_03.cc +++ b/tests/trilinos/solver_03.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -89,8 +89,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); TrilinosWrappers::SolverCG solver(control); TrilinosWrappers::PreconditionJacobi preconditioner; diff --git a/tests/trilinos/solver_05.cc b/tests/trilinos/solver_05.cc index d0686bedae..b47004759b 100644 --- a/tests/trilinos/solver_05.cc +++ b/tests/trilinos/solver_05.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -89,8 +89,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); TrilinosWrappers::SolverGMRES solver(control); TrilinosWrappers::PreconditionJacobi preconditioner; diff --git a/tests/trilinos/solver_07.cc b/tests/trilinos/solver_07.cc index ce61c2cd2a..7a746bc016 100644 --- a/tests/trilinos/solver_07.cc +++ b/tests/trilinos/solver_07.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2004 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -88,8 +88,8 @@ int main(int argc, char **argv) TrilinosWrappers::Vector u(dim); f = 1.; A.compress (); - f.compress (); - u.compress (); + f.compress (VectorOperation::insert); + u.compress (VectorOperation::insert); TrilinosWrappers::SolverCGS solver(control); TrilinosWrappers::PreconditionJacobi preconditioner; diff --git a/tests/trilinos/sparse_matrix_vector_01.cc b/tests/trilinos/sparse_matrix_vector_01.cc index c4b992015a..2b024faeb8 100644 --- a/tests/trilinos/sparse_matrix_vector_01.cc +++ b/tests/trilinos/sparse_matrix_vector_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2013 by the deal.II authors +// Copyright (C) 2004 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -37,9 +37,9 @@ void test (TrilinosWrappers::Vector &v, for (unsigned int i=0; i const TrilinosScalar s = m.matrix_scalar_product (w,v); diff --git a/tests/trilinos/sparse_matrix_vector_06.cc b/tests/trilinos/sparse_matrix_vector_06.cc index 2057203675..15bdc4c8b2 100644 --- a/tests/trilinos/sparse_matrix_vector_06.cc +++ b/tests/trilinos/sparse_matrix_vector_06.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2013 by the deal.II authors +// Copyright (C) 2004 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -36,8 +36,8 @@ void test (TrilinosWrappers::Vector &v) for (unsigned int i=0; i const TrilinosScalar s = m.matrix_norm_square (v); diff --git a/tests/trilinos/sparse_matrix_vector_07.cc b/tests/trilinos/sparse_matrix_vector_07.cc index 3e57d0adcd..0d4456c8e0 100644 --- a/tests/trilinos/sparse_matrix_vector_07.cc +++ b/tests/trilinos/sparse_matrix_vector_07.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2013 by the deal.II authors +// Copyright (C) 2004 - 2013, 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -41,9 +41,9 @@ void test (TrilinosWrappers::Vector &v, w(i) = i+1; } - m.compress (); - v.compress (); - w.compress (); + m.compress (VectorOperation::insert); + v.compress (VectorOperation::insert); + w.compress (VectorOperation::insert); // x=w-Mv const double s = m.residual (x, v, w); -- 2.39.5