From dac6e182282f999fe3855203c643f6ecc4541fd6 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 6 Apr 2017 15:30:29 -0500 Subject: [PATCH] Tests: Remove ProductMatrix tests --- tests/lac/product_matrix_01.cc | 88 ------------------- tests/lac/product_matrix_01.output | 6 -- tests/lac/product_matrix_02.cc | 87 ------------------- tests/lac/product_matrix_02.output | 6 -- tests/lac/product_matrix_03.cc | 86 ------------------- tests/lac/product_matrix_03.output | 6 -- tests/lac/product_matrix_04.cc | 87 ------------------- tests/lac/product_matrix_04.output | 5 -- tests/lac/product_matrix_05.cc | 94 -------------------- tests/lac/product_matrix_05.output | 6 -- tests/lac/product_matrix_06.cc | 86 ------------------- tests/lac/product_matrix_06.output | 5 -- tests/lac/product_matrix_07.cc | 94 -------------------- tests/lac/product_matrix_07.output | 6 -- tests/lac/product_matrix_08.cc | 133 ----------------------------- tests/lac/product_matrix_08.output | 13 --- 16 files changed, 808 deletions(-) delete mode 100644 tests/lac/product_matrix_01.cc delete mode 100644 tests/lac/product_matrix_01.output delete mode 100644 tests/lac/product_matrix_02.cc delete mode 100644 tests/lac/product_matrix_02.output delete mode 100644 tests/lac/product_matrix_03.cc delete mode 100644 tests/lac/product_matrix_03.output delete mode 100644 tests/lac/product_matrix_04.cc delete mode 100644 tests/lac/product_matrix_04.output delete mode 100644 tests/lac/product_matrix_05.cc delete mode 100644 tests/lac/product_matrix_05.output delete mode 100644 tests/lac/product_matrix_06.cc delete mode 100644 tests/lac/product_matrix_06.output delete mode 100644 tests/lac/product_matrix_07.cc delete mode 100644 tests/lac/product_matrix_07.output delete mode 100644 tests/lac/product_matrix_08.cc delete mode 100644 tests/lac/product_matrix_08.output diff --git a/tests/lac/product_matrix_01.cc b/tests/lac/product_matrix_01.cc deleted file mode 100644 index c051826832..0000000000 --- a/tests/lac/product_matrix_01.cc +++ /dev/null @@ -1,88 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2014 - 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. -// -// --------------------------------------------------------------------- - -// Check ProductMatrix::constructor1 - -#include "../tests.h" -#include -#include -#include -#include - -#include -#include -#include - -template -void -checkConstructor1(FullMatrix &A, FullMatrix &B) -{ - deallog << "Init with empty constructor" << std::endl; - GrowingVectorMemory < Vector > mem; - ProductMatrix < Vector > P; - P.initialize(A, B, mem); - - deallog << "Multiplying with all ones vector" << std::endl; - Vector V(B.n()); - for (unsigned int i = 0; i < V.size(); ++i) - V(i) = 1; - - Vector O(A.m()); - - P.vmult(O, V); - - // Check the dimensions of the result matrix - Assert(A.m() == O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: O=(A*B)*V - FullMatrix AB_Product(A.m(), B.n()); - Vector O_(A.m()); - - A.mmult(AB_Product, B, false); - AB_Product.vmult(O_, V); - - Assert(O == O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < O.size(); ++i) - deallog << O(i) << '\t'; - deallog << std::endl; -} - -int -main() -{ - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(4); - deallog.attach(logfile); - deallog.threshold_double(1.e-10); - - const double Adata[] = - { 2, 3, 4, 5 }; - - const double Bdata[] = - { 0, 1, 2, 3 }; - - FullMatrix A(2, 2); - FullMatrix B(2, 2); - - A.fill(Adata); - B.fill(Bdata); - - checkConstructor1(A, B); - -} diff --git a/tests/lac/product_matrix_01.output b/tests/lac/product_matrix_01.output deleted file mode 100644 index 33dd94a27a..0000000000 --- a/tests/lac/product_matrix_01.output +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Init with empty constructor -DEAL::Multiplying with all ones vector -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::17.0000 29.0000 diff --git a/tests/lac/product_matrix_02.cc b/tests/lac/product_matrix_02.cc deleted file mode 100644 index 7b917ff9c3..0000000000 --- a/tests/lac/product_matrix_02.cc +++ /dev/null @@ -1,87 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2014 - 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. -// -// --------------------------------------------------------------------- - -// Check ProductMatrix::constructor2 - -#include "../tests.h" -#include -#include -#include -#include - -#include -#include -#include - -template -void -checkConstructor2(FullMatrix &A, FullMatrix &B) -{ - deallog << "Init with vector memory. Delayed reinit" << std::endl; - GrowingVectorMemory < Vector > mem; - ProductMatrix < Vector > P(mem); - P.reinit(A, B); - - deallog << "Multiplying with all ones vector" << std::endl; - Vector V(B.n()); - for (unsigned int i = 0; i < V.size(); ++i) - V(i) = 1; - Vector O(A.m()); - - P.vmult(O, V); - - // Check the dimensions of the result matrix - Assert(A.m() == O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: O=(A*B)*V - FullMatrix AB_Product(A.m(), B.n()); - Vector O_(A.m()); - - A.mmult(AB_Product, B, false); - AB_Product.vmult(O_, V); - - Assert(O == O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < O.size(); ++i) - deallog << O(i) << '\t'; - deallog << std::endl; -} - -int -main() -{ - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(4); - deallog.attach(logfile); - deallog.threshold_double(1.e-10); - - const double Adata[] = - { 2, 3, 4, 5 }; - - const double Bdata[] = - { 0, 1, 2, 3 }; - - FullMatrix A(2, 2); - FullMatrix B(2, 2); - - A.fill(Adata); - B.fill(Bdata); - - checkConstructor2(A, B); - -} diff --git a/tests/lac/product_matrix_02.output b/tests/lac/product_matrix_02.output deleted file mode 100644 index 26b5a6b223..0000000000 --- a/tests/lac/product_matrix_02.output +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Init with vector memory. Delayed reinit -DEAL::Multiplying with all ones vector -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::17.0000 29.0000 diff --git a/tests/lac/product_matrix_03.cc b/tests/lac/product_matrix_03.cc deleted file mode 100644 index c7ebbdf9e9..0000000000 --- a/tests/lac/product_matrix_03.cc +++ /dev/null @@ -1,86 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2014 - 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. -// -// --------------------------------------------------------------------- - -// Check ProductMatrix::constructor3 - -#include "../tests.h" -#include -#include -#include -#include - -#include -#include -#include - -template -void -checkConstructor3(FullMatrix &A, FullMatrix &B) -{ - deallog << "Init with vector memory, matrix 1 and matrix 2" << std::endl; - GrowingVectorMemory < Vector > mem; - ProductMatrix < Vector > P(A, B, mem); - - deallog << "Multiplying with all ones vector" << std::endl; - Vector V(B.n()); - for (unsigned int i = 0; i < V.size(); ++i) - V(i) = 1; - Vector O(A.m()); - - P.vmult(O, V); - - // Check the dimensions of the result matrix - Assert(A.m() == O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: O=(A*B)*V - FullMatrix AB_Product(A.m(), B.n()); - Vector O_(A.m()); - - A.mmult(AB_Product, B, false); - AB_Product.vmult(O_, V); - - Assert(O == O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < O.size(); ++i) - deallog << O(i) << '\t'; - deallog << std::endl; -} - -int -main() -{ - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(4); - deallog.attach(logfile); - deallog.threshold_double(1.e-10); - - const double Adata[] = - { 2, 3, 4, 5 }; - - const double Bdata[] = - { 0, 1, 2, 3 }; - - FullMatrix A(2, 2); - FullMatrix B(2, 2); - - A.fill(Adata); - B.fill(Bdata); - - checkConstructor3(A, B); - -} diff --git a/tests/lac/product_matrix_03.output b/tests/lac/product_matrix_03.output deleted file mode 100644 index 096275148e..0000000000 --- a/tests/lac/product_matrix_03.output +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Init with vector memory, matrix 1 and matrix 2 -DEAL::Multiplying with all ones vector -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::17.0000 29.0000 diff --git a/tests/lac/product_matrix_04.cc b/tests/lac/product_matrix_04.cc deleted file mode 100644 index b5d70bb768..0000000000 --- a/tests/lac/product_matrix_04.cc +++ /dev/null @@ -1,87 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2014 - 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. -// -// --------------------------------------------------------------------- - -// Check ProductMatrix::vmult - -#include "../tests.h" -#include -#include -#include -#include - -#include -#include -#include - -template -void -checkVmult(FullMatrix &A, FullMatrix &B, Vector &V) -{ - deallog << "vmult" << std::endl; - - GrowingVectorMemory < Vector > mem; - ProductMatrix < Vector > P(A, B, mem); - - Vector O(A.m()); - - P.vmult(O, V); - - // Check the dimensions of the result matrix - Assert(A.m() == O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: O=(A*B)*V - FullMatrix AB_Product(A.m(), B.n()); - Vector O_(A.m()); - - A.mmult(AB_Product, B, false); - AB_Product.vmult(O_, V); - - Assert(O == O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < O.size(); ++i) - deallog << O(i) << '\t'; - deallog << std::endl; -} - -int -main() -{ - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(4); - deallog.attach(logfile); - deallog.threshold_double(1.e-10); - - const double Adata[] = - { 2, 3, 4, 5 }; - - const double Bdata[] = - { 0, 1, 2, 3 }; - - FullMatrix A(2, 2); - FullMatrix B(2, 2); - - A.fill(Adata); - B.fill(Bdata); - - Vector V(2); - V(0) = 1; - V(1) = 2; - - checkVmult(A, B, V); - -} diff --git a/tests/lac/product_matrix_04.output b/tests/lac/product_matrix_04.output deleted file mode 100644 index a55771472f..0000000000 --- a/tests/lac/product_matrix_04.output +++ /dev/null @@ -1,5 +0,0 @@ - -DEAL::vmult -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::28.0000 48.0000 diff --git a/tests/lac/product_matrix_05.cc b/tests/lac/product_matrix_05.cc deleted file mode 100644 index c45ffd6121..0000000000 --- a/tests/lac/product_matrix_05.cc +++ /dev/null @@ -1,94 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2014 - 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. -// -// --------------------------------------------------------------------- - -// Check ProductMatrix::vmult_add - -#include "../tests.h" -#include -#include -#include -#include - -#include -#include -#include - -template -void -checkVmult_add(FullMatrix &A, FullMatrix &B, - Vector &V) -{ - deallog << "vmult_add" << std::endl; - GrowingVectorMemory < Vector > mem; - ProductMatrix < Vector > P(A, B, mem); - - deallog - << "Result vector set to all ones and to be added with product result vector" - << std::endl; - Vector O(V.size()); - for (unsigned int i = 0; i < O.size(); ++i) - O(i) = 1; - - P.vmult_add(O, V); - - // Check the dimensions of the result matrix - Assert(A.m() == O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: O=(A*B)*V - FullMatrix AB_Product(A.m(), B.n()); - Vector O_(A.m()); - for (unsigned int i = 0; i < O_.size(); ++i) - O_(i) = 1; - - A.mmult(AB_Product, B, false); - AB_Product.vmult_add(O_, V); - - Assert(O == O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < O.size(); ++i) - deallog << O(i) << '\t'; - deallog << std::endl; -} - -int -main() -{ - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(4); - deallog.attach(logfile); - deallog.threshold_double(1.e-10); - - const double Adata[] = - { 2, 3, 4, 5 }; - - const double Bdata[] = - { 0, 1, 2, 3 }; - - FullMatrix A(2, 2); - FullMatrix B(2, 2); - - A.fill(Adata); - B.fill(Bdata); - - Vector V(2); - V(0) = 1; - V(1) = 2; - - checkVmult_add(A, B, V); - -} diff --git a/tests/lac/product_matrix_05.output b/tests/lac/product_matrix_05.output deleted file mode 100644 index 836a996f4d..0000000000 --- a/tests/lac/product_matrix_05.output +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::vmult_add -DEAL::Result vector set to all ones and to be added with product result vector -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::29.0000 49.0000 diff --git a/tests/lac/product_matrix_06.cc b/tests/lac/product_matrix_06.cc deleted file mode 100644 index 6679585a34..0000000000 --- a/tests/lac/product_matrix_06.cc +++ /dev/null @@ -1,86 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2014 - 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. -// -// --------------------------------------------------------------------- - -// Check ProductMatrix::Tvmult - -#include "../tests.h" -#include -#include -#include -#include - -#include -#include -#include - -template -void -checkTvmult(FullMatrix &A, FullMatrix &B, Vector &V) -{ - deallog << "Tvmult" << std::endl; - GrowingVectorMemory < Vector > mem; - ProductMatrix < Vector > P(A, B, mem); - - Vector O(V.size()); - - P.Tvmult(O, V); - - // Check the dimensions of the result matrix - Assert(A.m() == O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: O=(A*B)*V - FullMatrix AB_Product(A.m(), B.n()); - Vector O_(A.m()); - - A.mmult(AB_Product, B, false); - AB_Product.Tvmult(O_, V); - - Assert(O == O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < O.size(); ++i) - deallog << O(i) << '\t'; - deallog << std::endl; -} - -int -main() -{ - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(4); - deallog.attach(logfile); - deallog.threshold_double(1.e-10); - - const double Adata[] = - { 2, 3, 4, 5 }; - - const double Bdata[] = - { 0, 1, 2, 3 }; - - FullMatrix A(2, 2); - FullMatrix B(2, 2); - - A.fill(Adata); - B.fill(Bdata); - - Vector V(2); - V(0) = 1; - V(1) = 2; - - checkTvmult(A, B, V); - -} diff --git a/tests/lac/product_matrix_06.output b/tests/lac/product_matrix_06.output deleted file mode 100644 index beec1ee7ec..0000000000 --- a/tests/lac/product_matrix_06.output +++ /dev/null @@ -1,5 +0,0 @@ - -DEAL::Tvmult -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::26.0000 49.0000 diff --git a/tests/lac/product_matrix_07.cc b/tests/lac/product_matrix_07.cc deleted file mode 100644 index 75a28ef685..0000000000 --- a/tests/lac/product_matrix_07.cc +++ /dev/null @@ -1,94 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2014 - 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. -// -// --------------------------------------------------------------------- - -// Check ProductMatrix::Tvmult_add - -#include "../tests.h" -#include -#include -#include -#include - -#include -#include -#include - -template -void -checkTvmult_add(FullMatrix &A, FullMatrix &B, - Vector &V) -{ - deallog << "Tvmult_add" << std::endl; - GrowingVectorMemory < Vector > mem; - ProductMatrix < Vector > P(A, B, mem); - - deallog - << "Result vector set to all ones and to be added with product result vector" - << std::endl; - Vector O(V.size()); - for (unsigned int i = 0; i < O.size(); ++i) - O(i) = 1; - - P.Tvmult_add(O, V); - - // Check the dimensions of the result matrix - Assert(A.m() == O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: O=(A*B)*V - FullMatrix AB_Product(A.m(), B.n()); - Vector O_(A.m()); - for (unsigned int i = 0; i < O_.size(); ++i) - O_(i) = 1; - - A.mmult(AB_Product, B, false); - AB_Product.Tvmult_add(O_, V); - - Assert(O == O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < O.size(); ++i) - deallog << O(i) << '\t'; - deallog << std::endl; -} - -int -main() -{ - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(4); - deallog.attach(logfile); - deallog.threshold_double(1.e-10); - - const double Adata[] = - { 2, 3, 4, 5 }; - - const double Bdata[] = - { 0, 1, 2, 3 }; - - FullMatrix A(2, 2); - FullMatrix B(2, 2); - - A.fill(Adata); - B.fill(Bdata); - - Vector V(2); - V(0) = 1; - V(1) = 2; - - checkTvmult_add(A, B, V); - -} diff --git a/tests/lac/product_matrix_07.output b/tests/lac/product_matrix_07.output deleted file mode 100644 index 3c2323165a..0000000000 --- a/tests/lac/product_matrix_07.output +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::Tvmult_add -DEAL::Result vector set to all ones and to be added with product result vector -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::27.0000 50.0000 diff --git a/tests/lac/product_matrix_08.cc b/tests/lac/product_matrix_08.cc deleted file mode 100644 index abab5166cf..0000000000 --- a/tests/lac/product_matrix_08.cc +++ /dev/null @@ -1,133 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2014 - 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. -// -// --------------------------------------------------------------------- - -// Check ProductMatrix::clear - -#include "../tests.h" -#include -#include -#include -#include - -#include -#include -#include - -template -void -checkClear(FullMatrix &A, FullMatrix &B, - FullMatrix &C, FullMatrix &D) -{ - deallog << "clear" << std::endl; - deallog << "Init with vector memory, matrix 1 and matrix 2" << std::endl; - GrowingVectorMemory < Vector > mem; - ProductMatrix < Vector > P(A, B, mem); - - deallog << "Multiplying with all ones vector" << std::endl; - Vector V(B.n()); - for (unsigned int i = 0; i < V.size(); ++i) - V(i) = 1; - - Vector O(A.m()); - - P.vmult(O, V); - - // Check the dimensions of the result vector - Assert(A.m() == O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: O=(A*B)*V - FullMatrix AB_Product(A.m(), B.n()); - Vector O_(A.m()); - - A.mmult(AB_Product, B, false); - AB_Product.vmult(O_, V); - - Assert(O == O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < O.size(); ++i) - deallog << O(i) << '\t'; - deallog << std::endl; - - deallog << "Clearing product matrix" << std::endl; - P.clear(); - - deallog << "Reinitializing product matrix with matrix 3 and matrix 4" - << std::endl; - P.reinit(C, D); - - deallog << "Multiplying with all ones vector" << std::endl; - Vector _V(D.n()); - for (unsigned int i = 0; i < _V.size(); ++i) - _V(i) = 1; - - Vector _O(C.m()); - - P.vmult(_O, _V); - - // Check the dimensions of the result vector - Assert(C.m() == _O.size(), ExcInternalError()); - deallog << "Dimensions of result vector verified" << std::endl; - - // Verifying results with Method 2: _O=(C*D)*_V - FullMatrix CD_Product(C.m(), D.n()); - Vector _O_(C.m()); - - C.mmult(CD_Product, D, false); - CD_Product.vmult(_O_, _V); - - Assert(_O == _O_, ExcInternalError()); - deallog << "Result vector data verified" << std::endl; - - for (unsigned int i = 0; i < _O.size(); ++i) - deallog << _O(i) << '\t'; - deallog << std::endl; -} - -int -main() -{ - std::ofstream logfile("output"); - deallog << std::fixed; - deallog << std::setprecision(4); - deallog.attach(logfile); - deallog.threshold_double(1.e-10); - - const double Adata[] = - { 2, 3, 4, 5 }; - - const double Bdata[] = - { 0, 1, 2, 3 }; - - const double Cdata[] = - { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - - const double Ddata[] = - { 10, 11, 12, 13, 14, 15, 16, 17, 18 }; - - FullMatrix A(2, 2); - FullMatrix B(2, 2); - FullMatrix C(3, 3); - FullMatrix D(3, 3); - - A.fill(Adata); - B.fill(Bdata); - C.fill(Cdata); - D.fill(Ddata); - - checkClear(A, B, C, D); - -} diff --git a/tests/lac/product_matrix_08.output b/tests/lac/product_matrix_08.output deleted file mode 100644 index c0d230975f..0000000000 --- a/tests/lac/product_matrix_08.output +++ /dev/null @@ -1,13 +0,0 @@ - -DEAL::clear -DEAL::Init with vector memory, matrix 1 and matrix 2 -DEAL::Multiplying with all ones vector -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::17.0000 29.0000 -DEAL::Clearing product matrix -DEAL::Reinitializing product matrix with matrix 3 and matrix 4 -DEAL::Multiplying with all ones vector -DEAL::Dimensions of result vector verified -DEAL::Result vector data verified -DEAL::270.0000 648.0000 1026.0000 -- 2.39.5