From: Denis Davydov <davydden@gmail.com>
Date: Thu, 17 Sep 2015 21:09:42 +0000 (+0200)
Subject: avoid using C++11 functions in arpack unit tests
X-Git-Tag: v8.4.0-rc2~396^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe1b1e895d22527719dfcddeb371d6b6e01c4217;p=dealii.git

avoid using C++11 functions in arpack unit tests
---

diff --git a/tests/arpack/step-36_ar.cc b/tests/arpack/step-36_ar.cc
index 1811ba4f93..4713a48dae 100644
--- a/tests/arpack/step-36_ar.cc
+++ b/tests/arpack/step-36_ar.cc
@@ -228,7 +228,7 @@ namespace Step36
 
     // make sure that we have eigenvectors and they are mass-orthonormal:
     // a) (A*x_i-\lambda*B*x_i).L2() == 0
-    // b) x_i*B*y_i=\delta_{ij}
+    // b) x_j*B*x_i=\delta_{ij}
     {
       Vector<double> Ax(eigenfunctions[0]), Bx(eigenfunctions[0]);
       for (unsigned int i=0; i < eigenfunctions.size(); ++i)
@@ -237,12 +237,18 @@ namespace Step36
 
           for (unsigned int j=0; j < eigenfunctions.size(); j++)
             Assert( std::abs( eigenfunctions[j] * Bx - (i==j))< 1e-8,
-                    ExcMessage(std::to_string(eigenfunctions[j] * Bx)));
+                    ExcMessage("Eigenvectors " +
+                               Utilities::int_to_string(i) +
+                               " and " +
+                               Utilities::int_to_string(j) +
+                               " are not orthonormal!"));
 
           stiffness_matrix.vmult(Ax,eigenfunctions[i]);
           Ax.add(-1.0*std::real(eigenvalues[i]),Bx);
           Assert (Ax.l2_norm() < 1e-8,
-                  ExcMessage(std::to_string(Ax.l2_norm())));
+                  ExcMessage("Returned vector " +
+                             Utilities::int_to_string(i) +
+                             " is not an eigenvector!"));
         }
     }
     for (unsigned int i=0; i<eigenfunctions.size(); ++i)
diff --git a/tests/arpack/step-36_parpack.cc b/tests/arpack/step-36_parpack.cc
index cb8ec9ab59..7f45711e51 100644
--- a/tests/arpack/step-36_parpack.cc
+++ b/tests/arpack/step-36_parpack.cc
@@ -298,7 +298,7 @@ void test ()
 
     // make sure that we have eigenvectors and they are mass-orthonormal:
     // a) (A*x_i-\lambda*B*x_i).L2() == 0
-    // b) x_i*B*y_i=\delta_{ij}
+    // b) x_j*B*x_i=\delta_{ij}
     {
       const double precision = 1e-7;
       PETScWrappers::MPI::Vector Ax(eigenfunctions[0]), Bx(eigenfunctions[0]);
@@ -308,7 +308,11 @@ void test ()
 
           for (unsigned int j=0; j < eigenfunctions.size(); j++)
             Assert( std::abs( eigenfunctions[j] * Bx - (i==j))< precision,
-                    ExcMessage(std::to_string(eigenfunctions[j] * Bx)));
+                    ExcMessage("Eigenvectors " +
+                               Utilities::int_to_string(i) +
+                               " and " +
+                               Utilities::int_to_string(j) +
+                               " are not orthonormal!"));
 
           stiffness_matrix.vmult(Ax,eigenfunctions[i]);
           Ax.add(-1.0*std::real(lambda[i]),Bx);
diff --git a/tests/arpack/step-36_parpack_trilinos.cc b/tests/arpack/step-36_parpack_trilinos.cc
index 31396a8b28..b6a2592e35 100644
--- a/tests/arpack/step-36_parpack_trilinos.cc
+++ b/tests/arpack/step-36_parpack_trilinos.cc
@@ -292,7 +292,7 @@ void test ()
 
     // make sure that we have eigenvectors and they are mass-orthonormal:
     // a) (A*x_i-\lambda*B*x_i).L2() == 0
-    // b) x_i*B*y_i=\delta_{ij}
+    // b) x_j*B*x_i=\delta_{ij}
     {
       const double precision = 1e-7;
       TrilinosWrappers::MPI::Vector Ax(eigenfunctions[0]), Bx(eigenfunctions[0]);
@@ -302,12 +302,18 @@ void test ()
 
           for (unsigned int j=0; j < eigenfunctions.size(); j++)
             Assert( std::abs( eigenfunctions[j] * Bx - (i==j))< precision,
-                    ExcMessage(std::to_string(eigenfunctions[j] * Bx)));
+                    ExcMessage("Eigenvectors " +
+                               Utilities::int_to_string(i) +
+                               " and " +
+                               Utilities::int_to_string(j) +
+                               " are not orthonormal!"));
 
           stiffness_matrix.vmult(Ax,eigenfunctions[i]);
           Ax.add(-1.0*std::real(lambda[i]),Bx);
           Assert (Ax.l2_norm() < precision,
-                  ExcMessage(std::to_string(Ax.l2_norm())));
+                  ExcMessage("Returned vector " +
+                             Utilities::int_to_string(i) +
+                             " is not an eigenvector!"));
         }
     }
   }