From a9217913bae51cac73f0688e255bb07fd1e9b2a8 Mon Sep 17 00:00:00 2001 From: kronbichler Date: Thu, 9 May 2013 06:58:30 +0000 Subject: [PATCH] Adjust test output: Trilinos has apparently a call to rand() somewhere which affects the random elements we put into the matrix (now there is one initialization less in the Trilinos matrix). git-svn-id: https://svn.dealii.org/trunk@29485 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/trilinos/66.cc | 2 +- tests/trilinos/66/cmp/generic | 4 ++-- tests/trilinos/67.cc | 2 +- tests/trilinos/67/cmp/generic | 4 ++-- tests/trilinos/68.cc | 2 +- tests/trilinos/68/cmp/generic | 4 ++-- tests/trilinos/69.cc | 2 +- tests/trilinos/69/cmp/generic | 4 ++-- tests/trilinos/slowness_04.cc | 2 +- tests/trilinos/slowness_04/cmp/generic | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/trilinos/66.cc b/tests/trilinos/66.cc index be6d44ffc5..e3f258bc11 100644 --- 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 ef29e63784..4572eca4cf 100644 --- 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 09745e2e76..4de4663722 100644 --- 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 b67138e88c..18be8791f8 100644 --- 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 8716e81e71..0c06976dba 100644 --- 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 68844418cf..cdb4bb75ce 100644 --- 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 fce91f9230..330c45bbd3 100644 --- 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 e405e1f946..d14aebb0a1 100644 --- 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 c1369bb4bd..4048a0e734 100644 --- 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 45d40bcfab..0528791e54 100644 --- 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 -- 2.39.5