From: kronbichler Date: Mon, 23 Nov 2009 02:35:00 +0000 (+0000) Subject: Cleanup Trilinos tests. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5e0cfe2adcf24eef8e311175a2c8cbca69b0f31;p=dealii-svn.git Cleanup Trilinos tests. git-svn-id: https://svn.dealii.org/trunk@20146 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/trilinos/01.cc b/tests/trilinos/01.cc index 8c5ac4294e..8eec496e5c 100644 --- a/tests/trilinos/01.cc +++ b/tests/trilinos/01.cc @@ -62,7 +62,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/02.cc b/tests/trilinos/02.cc index b6bf4bcdca..498463c21d 100644 --- a/tests/trilinos/02.cc +++ b/tests/trilinos/02.cc @@ -68,7 +68,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/03.cc b/tests/trilinos/03.cc index 6e1bba1e85..8af3714cb8 100644 --- a/tests/trilinos/03.cc +++ b/tests/trilinos/03.cc @@ -76,7 +76,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/03a.cc b/tests/trilinos/03a.cc index afb38179c3..3bf8e68555 100644 --- a/tests/trilinos/03a.cc +++ b/tests/trilinos/03a.cc @@ -72,7 +72,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/03b.cc b/tests/trilinos/03b.cc index 7f71ba9bbd..45fdbcf861 100644 --- a/tests/trilinos/03b.cc +++ b/tests/trilinos/03b.cc @@ -79,7 +79,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/04.cc b/tests/trilinos/04.cc index 671ad9f60d..b5c447a029 100644 --- a/tests/trilinos/04.cc +++ b/tests/trilinos/04.cc @@ -44,7 +44,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/05.cc b/tests/trilinos/05.cc index f0f64e80ac..378a03e18b 100644 --- a/tests/trilinos/05.cc +++ b/tests/trilinos/05.cc @@ -59,7 +59,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/06.cc b/tests/trilinos/06.cc index 8ffba06838..e5f62bc3ee 100644 --- a/tests/trilinos/06.cc +++ b/tests/trilinos/06.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/07.cc b/tests/trilinos/07.cc index 3bfe0e6deb..b8b7e99cee 100644 --- a/tests/trilinos/07.cc +++ b/tests/trilinos/07.cc @@ -55,7 +55,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/08.cc b/tests/trilinos/08.cc index c10af21ada..13474ee250 100644 --- a/tests/trilinos/08.cc +++ b/tests/trilinos/08.cc @@ -60,7 +60,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/09.cc b/tests/trilinos/09.cc index e6e487b2d1..811a9b3619 100644 --- a/tests/trilinos/09.cc +++ b/tests/trilinos/09.cc @@ -66,7 +66,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/10.cc b/tests/trilinos/10.cc index 2215f5eff1..7244ce761d 100644 --- a/tests/trilinos/10.cc +++ b/tests/trilinos/10.cc @@ -66,7 +66,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/49b.cc b/tests/trilinos/49b.cc index 98cab09c6b..cc5e54b3f7 100644 --- a/tests/trilinos/49b.cc +++ b/tests/trilinos/49b.cc @@ -1,6 +1,6 @@ //---------------------------- 49b.cc --------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // // Copyright (C) 2004, 2005, 2008, 2009 by the deal.II authors // @@ -17,7 +17,7 @@ // ::operator = (dealii::BlockVector) // with block vectors instead of plain vectors -#include "../tests.h" +#include "../tests.h" #include #include #include @@ -33,10 +33,10 @@ void test (TrilinosWrappers::MPI::BlockVector &v) for (unsigned int i=0; i row_lengths (5, 3U); row_lengths.back() = 2; - TrilinosWrappers::SparseMatrix m (5,5,row_lengths); + TrilinosWrappers::SparseMatrix m (5U,5U,row_lengths); test (m); } } diff --git a/tests/trilinos/62.cc b/tests/trilinos/62.cc index be01a5a093..18b3d6d429 100644 --- a/tests/trilinos/62.cc +++ b/tests/trilinos/62.cc @@ -52,7 +52,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix v (100,100,5); + TrilinosWrappers::SparseMatrix v (100U,100U,5U); test (v); } } diff --git a/tests/trilinos/63.cc b/tests/trilinos/63.cc index e5201c53e2..34303a881b 100644 --- a/tests/trilinos/63.cc +++ b/tests/trilinos/63.cc @@ -50,7 +50,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix v (100,100,5); + TrilinosWrappers::SparseMatrix v (100U,100U,5U); test (v); } } diff --git a/tests/trilinos/64.cc b/tests/trilinos/64.cc index 406d31e49f..8fa32f65a5 100644 --- a/tests/trilinos/64.cc +++ b/tests/trilinos/64.cc @@ -59,7 +59,7 @@ int main (int argc,char **argv) // check // TrilinosWrappers::SparseMatrix TrilinosWrappers::SparseMatrix - v1 (n_dofs, n_dofs, 5); + v1 (n_dofs, n_dofs, 5U); test (v1); // check diff --git a/tests/trilinos/66.cc b/tests/trilinos/66.cc index 7e723a8190..c64a448a74 100644 --- a/tests/trilinos/66.cc +++ b/tests/trilinos/66.cc @@ -106,7 +106,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix v (14,14,3); + TrilinosWrappers::SparseMatrix v (14U,14U,3U); test (v); } } diff --git a/tests/trilinos/66/cmp/generic b/tests/trilinos/66/cmp/generic index 3a786b7f71..ef29e63784 100644 --- a/tests/trilinos/66/cmp/generic +++ b/tests/trilinos/66/cmp/generic @@ -1,6 +1,6 @@ -DEAL::7.15267e+09 7.15267e+09 +DEAL::7.02303e+09 7.02303e+09 +DEAL::32 32 +DEAL::6.89422e+09 6.89422e+09 DEAL::32 32 -DEAL::6.84337e+09 6.84337e+09 -DEAL::30 32 DEAL::OK diff --git a/tests/trilinos/66/cmp/x86_64-unknown-linux-gnu+gcc3.3 b/tests/trilinos/66/cmp/x86_64-unknown-linux-gnu+gcc3.3 deleted file mode 100644 index 2ba21a489b..0000000000 --- a/tests/trilinos/66/cmp/x86_64-unknown-linux-gnu+gcc3.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::7.15267e+09 7.15267e+09 -DEAL::32 32 -DEAL::6.84337e+09 6.84337e+09 -DEAL::29 32 -DEAL::OK diff --git a/tests/trilinos/67.cc b/tests/trilinos/67.cc index a2a5f04765..d3423c0e53 100644 --- a/tests/trilinos/67.cc +++ b/tests/trilinos/67.cc @@ -112,7 +112,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix v (14,14,3); + TrilinosWrappers::SparseMatrix v (14U,14U,3U); test (v); } } diff --git a/tests/trilinos/67/cmp/generic b/tests/trilinos/67/cmp/generic index 8a0f539840..b67138e88c 100644 --- a/tests/trilinos/67/cmp/generic +++ b/tests/trilinos/67/cmp/generic @@ -1,6 +1,6 @@ -DEAL::7.15267e+09 7.15267e+09 +DEAL::7.02303e+09 7.02303e+09 +DEAL::32 32 +DEAL::6.68247e+09 6.68247e+09 DEAL::32 32 -DEAL::6.71272e+09 6.71272e+09 -DEAL::29 32 DEAL::OK diff --git a/tests/trilinos/67/cmp/x86_64-unknown-linux-gnu+gcc3.3 b/tests/trilinos/67/cmp/x86_64-unknown-linux-gnu+gcc3.3 deleted file mode 100644 index 729838e63f..0000000000 --- a/tests/trilinos/67/cmp/x86_64-unknown-linux-gnu+gcc3.3 +++ /dev/null @@ -1,6 +0,0 @@ - -DEAL::7.15267e+09 7.15267e+09 -DEAL::32 32 -DEAL::6.71272e+09 6.71272e+09 -DEAL::27 32 -DEAL::OK diff --git a/tests/trilinos/68.cc b/tests/trilinos/68.cc index 7ddf621419..247dfd6c1b 100644 --- a/tests/trilinos/68.cc +++ b/tests/trilinos/68.cc @@ -110,7 +110,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix v (14,14,3); + TrilinosWrappers::SparseMatrix v (14U,14U,3U); test (v); } } diff --git a/tests/trilinos/68/cmp/generic b/tests/trilinos/68/cmp/generic index a305d3511b..68844418cf 100644 --- a/tests/trilinos/68/cmp/generic +++ b/tests/trilinos/68/cmp/generic @@ -1,6 +1,6 @@ -DEAL::7.15267e+09 7.15267e+09 +DEAL::7.02303e+09 7.02303e+09 +DEAL::32 32 +DEAL::6.89431e+09 7.02885e+09 DEAL::32 32 -DEAL::6.96869e+09 6.96869e+09 -DEAL::30 32 DEAL::OK diff --git a/tests/trilinos/69.cc b/tests/trilinos/69.cc index 654714e00a..2773e4409a 100644 --- a/tests/trilinos/69.cc +++ b/tests/trilinos/69.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005, 2008 by the deal.II authors +// Copyright (C) 2004, 2005, 2008, 2009 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -116,7 +116,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix v (14,14,3); + TrilinosWrappers::SparseMatrix v (14U,14U,3U); test (v); } } diff --git a/tests/trilinos/69/cmp/generic b/tests/trilinos/69/cmp/generic index 2000691fac..e405e1f946 100644 --- a/tests/trilinos/69/cmp/generic +++ b/tests/trilinos/69/cmp/generic @@ -1,6 +1,6 @@ -DEAL::7.15267e+09 7.15267e+09 +DEAL::7.02303e+09 7.02303e+09 +DEAL::32 32 +DEAL::6.81766e+09 6.95733e+09 DEAL::32 32 -DEAL::6.96580e+09 6.96580e+09 -DEAL::29 32 DEAL::OK diff --git a/tests/trilinos/block_sparse_matrix_add_01.cc b/tests/trilinos/block_sparse_matrix_add_01.cc index 176250ab51..fdf8f620ca 100644 --- a/tests/trilinos/block_sparse_matrix_add_01.cc +++ b/tests/trilinos/block_sparse_matrix_add_01.cc @@ -31,7 +31,7 @@ void test () // first set a few entries one-by-one in // a small matrix const unsigned int block_size = 16; - TrilinosWrappers::SparseMatrix m_small (block_size,block_size,3); + TrilinosWrappers::SparseMatrix m_small (block_size,block_size,3U); for (unsigned int i=0; i -#include +#include #include #include void test () { - TrilinosWrappers::SparseMatrix m(5,5,5); + TrilinosWrappers::SparseMatrix m(5U,5U,5U); m.set (0,0,1); m.set (1,1,2); - m.set (1,2,3); + m.set (1,2,3); m.compress (); TrilinosWrappers::SparseMatrix::const_iterator i = m.begin(); deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl; @@ -34,7 +34,7 @@ void test () deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl; i++; deallog << i->row() << ' ' << i->column() << ' ' << i->value() << std::endl; - + deallog << "OK" << std::endl; } @@ -45,7 +45,7 @@ int main (int argc,char **argv) std::ofstream logfile("sparse_matrix_iterator_01/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); Utilities::System::MPI_InitFinalize mpi_initialization (argc, argv); @@ -66,10 +66,10 @@ int main (int argc,char **argv) << "Aborting!" << std::endl << "----------------------------------------------------" << std::endl; - + return 1; } - catch (...) + catch (...) { std::cerr << std::endl << std::endl << "----------------------------------------------------" diff --git a/tests/trilinos/sparse_matrix_set_01.cc b/tests/trilinos/sparse_matrix_set_01.cc index 2e8b5fc76f..75f12a4772 100644 --- a/tests/trilinos/sparse_matrix_set_01.cc +++ b/tests/trilinos/sparse_matrix_set_01.cc @@ -92,7 +92,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (5,5,3); + TrilinosWrappers::SparseMatrix m (5U,5U,3U); test (m); } } diff --git a/tests/trilinos/sparse_matrix_set_02.cc b/tests/trilinos/sparse_matrix_set_02.cc index c76c64d936..cdd901d80f 100644 --- a/tests/trilinos/sparse_matrix_set_02.cc +++ b/tests/trilinos/sparse_matrix_set_02.cc @@ -27,7 +27,7 @@ void test (TrilinosWrappers::SparseMatrix &m) { - TrilinosWrappers::SparseMatrix m2(m.m(), m.n(), 3); + TrilinosWrappers::SparseMatrix m2(m.m(), m.n(), 3U); // first set a few entries one-by-one and // initialize the sparsity pattern for m2 @@ -93,7 +93,7 @@ int main (int argc,char **argv) try { { - TrilinosWrappers::SparseMatrix m (16,16,3); + TrilinosWrappers::SparseMatrix m (16U,16U,3U); test (m); } } diff --git a/tests/trilinos/sparse_matrix_vector_04.cc b/tests/trilinos/sparse_matrix_vector_04.cc index edf3b7e034..005c512156 100644 --- a/tests/trilinos/sparse_matrix_vector_04.cc +++ b/tests/trilinos/sparse_matrix_vector_04.cc @@ -29,7 +29,7 @@ void test (TrilinosWrappers::Vector &v, TrilinosWrappers::SparseMatrix m(v.size(),v.size(),v.size()); for (unsigned int i=0; i