From: kanschat Date: Wed, 22 Aug 2007 16:59:35 +0000 (+0000) Subject: remove more deprecated functions in lac X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c9ffdbff7e5178df877a2edb040ea68fa16754;p=dealii-svn.git remove more deprecated functions in lac git-svn-id: https://svn.dealii.org/trunk@15010 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/Makefile b/tests/Makefile index 9574fa3e90..2852ace6de 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,7 +2,9 @@ # Makefile,v 1.14 2002/09/19 13:53:47 wolf Exp # Common Makefile for all test directories -all: base lac fe deal.II multigrid bits hp fail + +all: nofail fail +nofail: base lac fe deal.II multigrid bits hp @-if grep -q 'define HAVE_LIBUMFPACK' $D/base/include/base/config.h ; then \ cd umfpack ; $(MAKE) ; cd .. ; \ fi diff --git a/tests/bits/apply_boundary_values_01.cc b/tests/bits/apply_boundary_values_01.cc index 370ec2a788..095c148693 100644 --- a/tests/bits/apply_boundary_values_01.cc +++ b/tests/bits/apply_boundary_values_01.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -123,7 +123,7 @@ void test () // now comes the check: we subtract B from // A, and make sure that the result is zero - A.add_scaled (-1., B); + A.add (-1., B); deallog << "|A|=" << A.frobenius_norm() << std::endl; deallog << "|B|=" << B.frobenius_norm() << std::endl; Assert (A.frobenius_norm() < 1e-12*B.frobenius_norm(), diff --git a/tests/bits/apply_boundary_values_02.cc b/tests/bits/apply_boundary_values_02.cc index d1d0b36680..8df923a728 100644 --- a/tests/bits/apply_boundary_values_02.cc +++ b/tests/bits/apply_boundary_values_02.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -123,7 +123,7 @@ void test () // now comes the check: we subtract B from // A, and make sure that the result is zero - A.add_scaled (-1., B); + A.add (-1., B); deallog << "|A|=" << A.frobenius_norm() << std::endl; deallog << "|B|=" << B.frobenius_norm() << std::endl; Assert (A.frobenius_norm() < 1e-12*B.frobenius_norm(), diff --git a/tests/bits/dof_constraints_01.cc b/tests/bits/dof_constraints_01.cc index e40abacc28..92dbfd8dae 100644 --- a/tests/bits/dof_constraints_01.cc +++ b/tests/bits/dof_constraints_01.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -115,7 +115,7 @@ void test () // now comes the check: we subtract B from // A, and make sure that the result is zero - A.add_scaled (-1., B); + A.add (-1., B); deallog << "|A|=" << A.frobenius_norm() << std::endl; deallog << "|B|=" << B.frobenius_norm() << std::endl; Assert (A.frobenius_norm() < 1e-12*B.frobenius_norm(), diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc index beb89a351a..5f07d9e6c9 100644 --- a/tests/lac/sparse_matrices.cc +++ b/tests/lac/sparse_matrices.cc @@ -345,7 +345,7 @@ int main() check_iterator(E); #endif E.print_statistics(deallog, true); - E.add_scaled(-1., A); + E.add(-1., A); if (E.l2_norm() < 1.e-14) deallog << "Matrices are equal" << std::endl; else