modified filtered_matrix tests to work with square matrices only

modified filtered_matrix tests to work with square matrices only

diff --git a/tests/lac/filtered_matrix_01.cc b/tests/lac/filtered_matrix_01.cc
index 014215fc7088f1d40a7fa86f2bb35b0d85b3af7c..ea46757e2f3e4cb9b94b06aa67488f56efe9eea6 100644 (file)
--- a/tests/lac/filtered_matrix_01.cc
+++ b/tests/lac/filtered_matrix_01.cc
@@ -51,17 +51,19 @@ main()
   deallog.threshold_double(1.e-10);
 
   const double Adata[] =
-  { 1, 2, 3, 4, 5, 6 };
+  { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-  FullMatrix<double> A(2, 3);
+  FullMatrix<double> A(3, 3);
 
   A.fill(Adata);
 
-  Vector<double> V(3);
-  V(0) = 1;
-  V(1) = 2;
-  V(2) = 3;
+  Vector<double> V1(3);
+  Vector<double> V2(3);
 
-  checkVmult<double>(A, V, false);
-  checkVmult<double>(A, V, true);
+  V1(0) = V2(0) = 1;
+  V1(1) = V2(1) = 2;
+  V1(2) = V2(2) = 3;
+
+  checkVmult<double>(A, V1, false);
+  checkVmult<double>(A, V2, true);
 }

diff --git a/tests/lac/filtered_matrix_01.output b/tests/lac/filtered_matrix_01.output
index 4f082a076e49d221db061479b579464de477833b..e893ffef71e79ae475b49401154a1dd6bedb1b31 100644 (file)
--- a/tests/lac/filtered_matrix_01.output
+++ b/tests/lac/filtered_matrix_01.output
@@ -1,5 +1,5 @@
 
 DEAL::vmult
-DEAL::1.0000   28.0000 
+DEAL::1.0000   28.0000 43.0000 
 DEAL::vmult
-DEAL::1.0000   32.0000 
+DEAL::1.0000   32.0000 50.0000 

diff --git a/tests/lac/filtered_matrix_02.cc b/tests/lac/filtered_matrix_02.cc
index ac432c2712425f862f9246e026583b0937e09cd2..3c526af9f6bab0ece9012b50078a783115d5caf0 100644 (file)
--- a/tests/lac/filtered_matrix_02.cc
+++ b/tests/lac/filtered_matrix_02.cc
@@ -51,16 +51,19 @@ main()
   deallog.threshold_double(1.e-10);
 
   const double Adata[] =
-  { 1, 2, 3, 4, 5, 6 };
+  { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-  FullMatrix<double> A(2, 3);
+  FullMatrix<double> A(3, 3);
 
   A.fill(Adata);
 
-  Vector<double> V(2);
-  V(0) = 1;
-  V(1) = 2;
+  Vector<double> V1(3);
+  Vector<double> V2(3);
 
-  checkTvmult<double>(A, V, false);
-  checkTvmult<double>(A, V, true);
+  V1(0) = V2(0) = 1;
+  V1(1) = V2(1) = 2;
+  V1(2) = V2(2) = 3;
+
+  checkTvmult<double>(A, V1, false);
+  checkTvmult<double>(A, V2, true);
 }

diff --git a/tests/lac/filtered_matrix_02.output b/tests/lac/filtered_matrix_02.output
index 27e7f6bec64460bcabf34da731f46e2c5c18b091..5c3f2bee7897eb795c5263ecfb0e170c096c7499 100644 (file)
--- a/tests/lac/filtered_matrix_02.output
+++ b/tests/lac/filtered_matrix_02.output
@@ -1,5 +1,5 @@
 
 DEAL::Tvmult
-DEAL::1.0000   10.0000 12.0000 
+DEAL::1.0000   34.0000 39.0000 
 DEAL::Tvmult
-DEAL::1.0000   12.0000 15.0000 
+DEAL::1.0000   36.0000 42.0000 

diff --git a/tests/lac/filtered_matrix_03.cc b/tests/lac/filtered_matrix_03.cc
index e42ab6bc22f62080b0c841131bc8eee38d48e37f..715294592895477b6f53c4b13578da8a5c25e5dd 100644 (file)
--- a/tests/lac/filtered_matrix_03.cc
+++ b/tests/lac/filtered_matrix_03.cc
@@ -55,17 +55,19 @@ main()
   deallog.threshold_double(1.e-10);
 
   const double Adata[] =
-  { 1, 2, 3, 4, 5, 6 };
+  { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-  FullMatrix<double> A(2, 3);
+  FullMatrix<double> A(3, 3);
 
   A.fill(Adata);
 
-  Vector<double> V(3);
-  V(0) = 1;
-  V(1) = 2;
-  V(2) = 3;
+  Vector<double> V1(3);
+  Vector<double> V2(3);
 
-  checkVmult_Add<double>(A, V, false);
-  checkVmult_Add<double>(A, V, true);
+  V1(0) = V2(0) = 1;
+  V1(1) = V2(1) = 2;
+  V1(2) = V2(2) = 3;
+
+  checkVmult_Add<double>(A, V1, false);
+  checkVmult_Add<double>(A, V2, true);
 }

diff --git a/tests/lac/filtered_matrix_03.output b/tests/lac/filtered_matrix_03.output
index 1bbc0b2bd0299506938a1b77fb452adc4aab6c82..9ea8103a311f78a1521b2c1143a1c40267e6aa9d 100644 (file)
--- a/tests/lac/filtered_matrix_03.output
+++ b/tests/lac/filtered_matrix_03.output
@@ -1,5 +1,5 @@
 
 DEAL::vmult_add
-DEAL::1.0000   29.0000 
+DEAL::1.0000   29.0000 44.0000 
 DEAL::vmult_add
-DEAL::1.0000   33.0000 
+DEAL::1.0000   33.0000 51.0000 

diff --git a/tests/lac/filtered_matrix_04.cc b/tests/lac/filtered_matrix_04.cc
index 1f74844e39b830e0150619cb2cb3f9b71bbd8a45..648793a947bd4c2eb4fcd029afb2ae41f487e7b4 100644 (file)
--- a/tests/lac/filtered_matrix_04.cc
+++ b/tests/lac/filtered_matrix_04.cc
@@ -55,16 +55,19 @@ main()
   deallog.threshold_double(1.e-10);
 
   const double Adata[] =
-  { 1, 2, 3, 4, 5, 6 };
+  { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-  FullMatrix<double> A(2, 3);
+  FullMatrix<double> A(3, 3);
 
   A.fill(Adata);
 
-  Vector<double> V(2);
-  V(0) = 1;
-  V(1) = 2;
+  Vector<double> V1(3);
+  Vector<double> V2(3);
 
-  checkTvmult_Add<double>(A, V, false);
-  checkTvmult_Add<double>(A, V, true);
+  V1(0) = V2(0) = 1;
+  V1(1) = V2(1) = 2;
+  V1(2) = V2(2) = 3;
+
+  checkTvmult_Add<double>(A, V1, false);
+  checkTvmult_Add<double>(A, V2, true);
 }

diff --git a/tests/lac/filtered_matrix_04.output b/tests/lac/filtered_matrix_04.output
index 8683f4050012a482ef0ad3553e94d99c12f86ef3..b455ab3529c5109b2034bbe8c42ea502638ebcea 100644 (file)
--- a/tests/lac/filtered_matrix_04.output
+++ b/tests/lac/filtered_matrix_04.output
@@ -1,5 +1,5 @@
 
 DEAL::Tvmult_add
-DEAL::1.0000   11.0000 13.0000 
+DEAL::1.0000   35.0000 40.0000 
 DEAL::Tvmult_add
-DEAL::1.0000   13.0000 16.0000 
+DEAL::1.0000   37.0000 43.0000