Make a few tests check what they are supposed to

diff --git a/tests/matrix_free/pre_and_post_loops_01.cc b/tests/matrix_free/pre_and_post_loops_01.cc
index 632345b13d8f7e73cb70b49cd2c284aa3a4af282..e117e539f9a6901ab8d61e0260a802291566bd48 100644 (file)
--- a/tests/matrix_free/pre_and_post_loops_01.cc
+++ b/tests/matrix_free/pre_and_post_loops_01.cc
@@ -159,11 +159,13 @@ test()
 
   for (unsigned int i = 0; i < vec1.local_size(); ++i)
     {
-      double entry          = random_value<double>();
+      // Multiply by 0.01 to make float error with roundoff less than the
+      // numdiff absolute tolerance
+      double entry          = 0.01 * random_value<double>();
       vec1.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec2.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec3.local_element(i) = entry;
     }
 
@@ -172,7 +174,7 @@ test()
   LinearAlgebra::distributed::Vector<number> ref3 = vec3;
 
   mf.vmult_with_update_basic(ref3, ref2, ref1);
-  mf.vmult_with_update_basic(vec3, vec2, vec1);
+  mf.vmult_with_update_merged(vec3, vec2, vec1);
 
   vec3 -= ref3;
   deallog << "Error in 1x merged operation: " << vec3.linfty_norm()
@@ -181,10 +183,10 @@ test()
   ref3 = 0;
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   vec3 -= ref3;
   deallog << "Error in 2x merged operation: " << vec3.linfty_norm()

diff --git a/tests/matrix_free/pre_and_post_loops_02.cc b/tests/matrix_free/pre_and_post_loops_02.cc
index 099a309c9068359da6121972e801031a7ac10ac3..ce4431b1b705505e0c79ffb546bab571ab966114 100644 (file)
--- a/tests/matrix_free/pre_and_post_loops_02.cc
+++ b/tests/matrix_free/pre_and_post_loops_02.cc
@@ -172,11 +172,13 @@ test()
             vec1.get_partitioner()->local_to_global(i)))
         continue;
 
-      double entry          = random_value<double>();
+      // Multiply by 0.01 to make float error with roundoff less than the
+      // numdiff absolute tolerance
+      double entry          = 0.01 * random_value<double>();
       vec1.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec2.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec3.local_element(i) = entry;
     }
 
@@ -185,7 +187,7 @@ test()
   LinearAlgebra::distributed::Vector<number> ref3 = vec3;
 
   mf.vmult_with_update_basic(ref3, ref2, ref1);
-  mf.vmult_with_update_basic(vec3, vec2, vec1);
+  mf.vmult_with_update_merged(vec3, vec2, vec1);
 
   vec3 -= ref3;
   deallog << "Error in 1x merged operation: " << vec3.linfty_norm()
@@ -194,10 +196,10 @@ test()
   ref3 = 0;
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   vec3 -= ref3;
   deallog << "Error in 2x merged operation: " << vec3.linfty_norm()

diff --git a/tests/matrix_free/pre_and_post_loops_03.cc b/tests/matrix_free/pre_and_post_loops_03.cc
index 42dbe772cdd350826f9e99649fee114a6a604628..1b477e7116510f67dd78e7f29a2f1e25bceb169f 100644 (file)
--- a/tests/matrix_free/pre_and_post_loops_03.cc
+++ b/tests/matrix_free/pre_and_post_loops_03.cc
@@ -161,11 +161,13 @@ test()
 
   for (unsigned int i = 0; i < vec1.local_size(); ++i)
     {
-      double entry          = random_value<double>();
+      // Multiply by 0.01 to make float error with roundoff less than the
+      // numdiff absolute tolerance
+      double entry          = 0.01 * random_value<double>();
       vec1.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec2.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec3.local_element(i) = entry;
     }
 
@@ -174,7 +176,7 @@ test()
   LinearAlgebra::distributed::Vector<number> ref3 = vec3;
 
   mf.vmult_with_update_basic(ref3, ref2, ref1);
-  mf.vmult_with_update_basic(vec3, vec2, vec1);
+  mf.vmult_with_update_merged(vec3, vec2, vec1);
 
   vec3 -= ref3;
   deallog << "Error in 1x merged operation: " << vec3.linfty_norm()
@@ -183,10 +185,10 @@ test()
   ref3 = 0;
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   vec3 -= ref3;
   deallog << "Error in 2x merged operation: " << vec3.linfty_norm()

diff --git a/tests/matrix_free/pre_and_post_loops_04.cc b/tests/matrix_free/pre_and_post_loops_04.cc
index 43362cf2da8cbe2157f20c093d211bc3c449eaac..907903ce7cd457b42ae683ddfe39d0bfc4a10377 100644 (file)
--- a/tests/matrix_free/pre_and_post_loops_04.cc
+++ b/tests/matrix_free/pre_and_post_loops_04.cc
@@ -158,11 +158,13 @@ test()
 
   for (unsigned int i = 0; i < vec1.local_size(); ++i)
     {
-      double entry          = random_value<double>();
+      // Multiply by 0.01 to make float error with roundoff less than the
+      // numdiff absolute tolerance
+      double entry          = 0.01 * random_value<double>();
       vec1.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec2.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec3.local_element(i) = entry;
     }
 
@@ -171,7 +173,7 @@ test()
   LinearAlgebra::distributed::Vector<number> ref3 = vec3;
 
   mf.vmult_with_update_basic(ref3, ref2, ref1);
-  mf.vmult_with_update_basic(vec3, vec2, vec1);
+  mf.vmult_with_update_merged(vec3, vec2, vec1);
 
   vec3 -= ref3;
   deallog << "Error in 1x merged operation: " << vec3.linfty_norm()
@@ -180,10 +182,10 @@ test()
   ref3 = 0;
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   vec3 -= ref3;
   deallog << "Error in 2x merged operation: " << vec3.linfty_norm()

diff --git a/tests/matrix_free/pre_and_post_loops_05.cc b/tests/matrix_free/pre_and_post_loops_05.cc
index 3b8ceb953bb6e265921a34d0957293ea10fdc334..898d5fa11d059db5de197c5c63950b713672e961 100644 (file)
--- a/tests/matrix_free/pre_and_post_loops_05.cc
+++ b/tests/matrix_free/pre_and_post_loops_05.cc
@@ -175,11 +175,13 @@ test()
 
   for (unsigned int i = 0; i < vec1.local_size(); ++i)
     {
-      double entry          = random_value<double>();
+      // Multiply by 0.01 to make float error with roundoff less than the
+      // numdiff absolute tolerance
+      double entry          = 0.01 * random_value<double>();
       vec1.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec2.local_element(i) = entry;
-      entry                 = random_value<double>();
+      entry                 = 0.01 * random_value<double>();
       vec3.local_element(i) = entry;
     }
 
@@ -188,7 +190,7 @@ test()
   LinearAlgebra::distributed::Vector<number> ref3 = vec3;
 
   mf.vmult_with_update_basic(ref3, ref2, ref1);
-  mf.vmult_with_update_basic(vec3, vec2, vec1);
+  mf.vmult_with_update_merged(vec3, vec2, vec1);
 
   vec3 -= ref3;
   deallog << "Error in 1x merged operation: " << vec3.linfty_norm()
@@ -197,10 +199,10 @@ test()
   ref3 = 0;
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   mf.vmult_with_update_basic(ref1, ref2, ref3);
-  mf.vmult_with_update_basic(vec1, vec2, vec3);
+  mf.vmult_with_update_merged(vec1, vec2, vec3);
 
   vec3 -= ref3;
   deallog << "Error in 2x merged operation: " << vec3.linfty_norm()