Adjust test output: Trilinos has apparently a call to rand() somewhere which affects...

git-svn-id: https://svn.dealii.org/trunk@29485 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/trilinos/66.cc b/tests/trilinos/66.cc
index be6d44ffc59ee3b7b4bbb0b68905dc6cd6af762f..e3f258bc1117957e5f94f39ee5647b05c0022d04 100644 (file)
--- a/tests/trilinos/66.cc
+++ b/tests/trilinos/66.cc
@@ -56,7 +56,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       norm_sqr += s*s;
       ++nnz;
     }
-  m.compress ();
+  m.compress (VectorOperation::insert);
   
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;

diff --git a/tests/trilinos/66/cmp/generic b/tests/trilinos/66/cmp/generic
index ef29e637847b4965ea231d9438b9613153c5d198..4572eca4cf8a92e786334ad4b0ad29b74a07ab52 100644 (file)
--- a/tests/trilinos/66/cmp/generic
+++ b/tests/trilinos/66/cmp/generic
@@ -1,6 +1,6 @@
 
-DEAL::7.02303e+09 7.02303e+09
+DEAL::7.15267e+09 7.15267e+09
 DEAL::32 32
-DEAL::6.89422e+09 6.89422e+09
+DEAL::6.84337e+09 6.84337e+09
 DEAL::32 32
 DEAL::OK

diff --git a/tests/trilinos/67.cc b/tests/trilinos/67.cc
index 09745e2e76bebd3e7cc4dc66af593dc4f444b410..4de46637225aac1df605237edcde7d951c913077 100644 (file)
--- a/tests/trilinos/67.cc
+++ b/tests/trilinos/67.cc
@@ -56,7 +56,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       norm_sqr += s*s;
       ++nnz;
     }
-  m.compress ();
+  m.compress (VectorOperation::insert);
   
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;

diff --git a/tests/trilinos/67/cmp/generic b/tests/trilinos/67/cmp/generic
index b67138e88c2116a0dcf5c205fffbf0a6b46ec9d3..18be8791f86046d55466af524fd04ea4d67cea84 100644 (file)
--- a/tests/trilinos/67/cmp/generic
+++ b/tests/trilinos/67/cmp/generic
@@ -1,6 +1,6 @@
 
-DEAL::7.02303e+09 7.02303e+09
+DEAL::7.15267e+09 7.15267e+09
 DEAL::32 32
-DEAL::6.68247e+09 6.68247e+09
+DEAL::6.71272e+09 6.71272e+09
 DEAL::32 32
 DEAL::OK

diff --git a/tests/trilinos/68.cc b/tests/trilinos/68.cc
index 8716e81e7110fe47095c1843208dd048bd345370..0c06976dbab30700feca2c9d59a33569c21ade5e 100644 (file)
--- a/tests/trilinos/68.cc
+++ b/tests/trilinos/68.cc
@@ -56,7 +56,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       norm_sqr += s*s;
       ++nnz;
     }
-  m.compress ();
+  m.compress (VectorOperation::insert);
   
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;

diff --git a/tests/trilinos/68/cmp/generic b/tests/trilinos/68/cmp/generic
index 68844418cf859feed84f758e7e7b6b8c9bdf8c57..cdb4bb75cebf6775c8292eab7a7610867a095e2d 100644 (file)
--- a/tests/trilinos/68/cmp/generic
+++ b/tests/trilinos/68/cmp/generic
@@ -1,6 +1,6 @@
 
-DEAL::7.02303e+09 7.02303e+09
+DEAL::7.15267e+09 7.15267e+09
 DEAL::32 32
-DEAL::6.89431e+09 7.02885e+09
+DEAL::6.85012e+09 6.96869e+09
 DEAL::32 32
 DEAL::OK

diff --git a/tests/trilinos/69.cc b/tests/trilinos/69.cc
index fce91f923090b522c08d865c94aa603e31cf4121..330c45bbd35eff41ea431e22231d5be6712ec47c 100644 (file)
--- a/tests/trilinos/69.cc
+++ b/tests/trilinos/69.cc
@@ -56,7 +56,7 @@ void test (TrilinosWrappers::SparseMatrix &m)
       norm_sqr += s*s;
       ++nnz;
     }
-  m.compress ();
+  m.compress (VectorOperation::insert);
   
   deallog << m.frobenius_norm() << ' ' << std::sqrt (norm_sqr)
           << std::endl;

diff --git a/tests/trilinos/69/cmp/generic b/tests/trilinos/69/cmp/generic
index e405e1f9462cd9185aad616b5202966845dc96ab..d14aebb0a1928aeffab44c28903099cd314aa853 100644 (file)
--- a/tests/trilinos/69/cmp/generic
+++ b/tests/trilinos/69/cmp/generic
@@ -1,6 +1,6 @@
 
-DEAL::7.02303e+09 7.02303e+09
+DEAL::7.15267e+09 7.15267e+09
 DEAL::32 32
-DEAL::6.81766e+09 6.95733e+09
+DEAL::6.82410e+09 6.96580e+09
 DEAL::32 32
 DEAL::OK

diff --git a/tests/trilinos/slowness_04.cc b/tests/trilinos/slowness_04.cc
index c1369bb4bda0c124588af1c40bec249a3eebd6c0..4048a0e73425e66c49f3862e9ce03f8dea2d2305 100644 (file)
--- a/tests/trilinos/slowness_04.cc
+++ b/tests/trilinos/slowness_04.cc
@@ -92,7 +92,7 @@ void test ()
             matrix.set(global, global+N, rand());
           }
       }
-  matrix.compress ();
+  matrix.compress (VectorOperation::insert);
   
                                    // then do a single matrix-vector
                                    // multiplication with subsequent formation

diff --git a/tests/trilinos/slowness_04/cmp/generic b/tests/trilinos/slowness_04/cmp/generic
index 45d40bcfab8b42f5ce5def097d5cd3ac9109600d..0528791e54fd25a19445d84f3d2a04b7513164a3 100644 (file)
--- a/tests/trilinos/slowness_04/cmp/generic
+++ b/tests/trilinos/slowness_04/cmp/generic
@@ -1,2 +1,2 @@
 
-DEAL::2.04927e+23
+DEAL::2.04928e+23