From: kronbichler Date: Wed, 25 Dec 2013 10:53:09 +0000 (+0000) Subject: Actually enable parallel run of WorkStream. Now some tests might fail from time to... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aab60359afa0bc1506adaee99565212c7cdaac60;p=dealii-svn.git Actually enable parallel run of WorkStream. Now some tests might fail from time to time because writing into a TrilinosWrappers::MPI::Vector is not thread-safe. Will fix that during the next days git-svn-id: https://svn.dealii.org/trunk@32120 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/deal.II/assemble_matrix_parallel_01.cc b/tests/deal.II/assemble_matrix_parallel_01.cc index 6d842edf1b..fb9dff2621 100644 --- a/tests/deal.II/assemble_matrix_parallel_01.cc +++ b/tests/deal.II/assemble_matrix_parallel_01.cc @@ -31,8 +31,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/tests/deal.II/assemble_matrix_parallel_02.cc b/tests/deal.II/assemble_matrix_parallel_02.cc index 5f31e94221..c3e51ddd6d 100644 --- a/tests/deal.II/assemble_matrix_parallel_02.cc +++ b/tests/deal.II/assemble_matrix_parallel_02.cc @@ -401,6 +401,7 @@ void LaplaceProblem::assemble_test_1 () std_cxx1x::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (), + multithread_info.n_threads(), 1); } @@ -425,6 +426,7 @@ void LaplaceProblem::assemble_test_2 () std_cxx1x::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (true), + 2*multithread_info.n_threads(), 1); } diff --git a/tests/deal.II/assemble_matrix_parallel_04.cc b/tests/deal.II/assemble_matrix_parallel_04.cc index 4713c3c936..18cdb2b707 100644 --- a/tests/deal.II/assemble_matrix_parallel_04.cc +++ b/tests/deal.II/assemble_matrix_parallel_04.cc @@ -429,6 +429,7 @@ void LaplaceProblem::assemble_test_1 () std_cxx1x::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (1), + 2*multithread_info.n_threads(), 1); for (unsigned int i=0; i::assemble_test_2 () std_cxx1x::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), Assembly::Copy::Data (2), + 2*multithread_info.n_threads(), 1); for (unsigned int i=0; i::assemble_test () this, std_cxx1x::_1), Assembly::Scratch::Data(fe_collection, quadrature_collection), - Assembly::Copy::Data ()); + Assembly::Copy::Data (), + 2*multithread_info.n_threads(), + 1); test_matrix.add(-1, reference_matrix); diff --git a/tests/trilinos/assemble_matrix_parallel_02.cc b/tests/trilinos/assemble_matrix_parallel_02.cc index 5dfdc8ad2c..954afca20a 100644 --- a/tests/trilinos/assemble_matrix_parallel_02.cc +++ b/tests/trilinos/assemble_matrix_parallel_02.cc @@ -362,6 +362,7 @@ void LaplaceProblem::assemble_test () std_cxx1x::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (), + 2*multithread_info.n_threads(), 1); test_matrix.compress(VectorOperation::add); test_rhs.compress(VectorOperation::add); diff --git a/tests/trilinos/assemble_matrix_parallel_03.cc b/tests/trilinos/assemble_matrix_parallel_03.cc index 70f08ed558..e61846e1b5 100644 --- a/tests/trilinos/assemble_matrix_parallel_03.cc +++ b/tests/trilinos/assemble_matrix_parallel_03.cc @@ -363,6 +363,7 @@ void LaplaceProblem::assemble_test () std_cxx1x::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (), + 2*multithread_info.n_threads(), 1); test_matrix.compress(VectorOperation::add); test_rhs.compress(VectorOperation::add); diff --git a/tests/trilinos/assemble_matrix_parallel_04.cc b/tests/trilinos/assemble_matrix_parallel_04.cc index f1b5335070..b7745d6e2a 100644 --- a/tests/trilinos/assemble_matrix_parallel_04.cc +++ b/tests/trilinos/assemble_matrix_parallel_04.cc @@ -380,6 +380,7 @@ void LaplaceProblem::assemble_test () std_cxx1x::_1), Assembly::Scratch::Data(fe, quadrature), Assembly::Copy::Data (), + 2*multithread_info.n_threads(), 1); test_matrix.compress(VectorOperation::add); test_rhs.compress(VectorOperation::add);