Actually enable parallel run of WorkStream. Now some tests might fail from time to...

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 6d842edf1bd971c79857662257ad898916895f41..fb9dff26213bf8c3d309eba1f4b09566b079efc8 100644 (file)
--- a/tests/deal.II/assemble_matrix_parallel_01.cc
+++ b/tests/deal.II/assemble_matrix_parallel_01.cc
@@ -31,8 +31,6 @@
 #include <deal.II/lac/vector.h>
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/sparse_matrix.h>
-#include <deal.II/lac/solver_cg.h>
-#include <deal.II/lac/precondition.h>
 #include <deal.II/grid/tria.h>
 #include <deal.II/grid/grid_generator.h>
 #include <deal.II/grid/tria_accessor.h>

diff --git a/tests/deal.II/assemble_matrix_parallel_02.cc b/tests/deal.II/assemble_matrix_parallel_02.cc
index 5f31e94221895972cd9d07ef0c54988d9c640709..c3e51ddd6d524fb52bc58b034944cc339b0007f0 100644 (file)
--- a/tests/deal.II/assemble_matrix_parallel_02.cc
+++ b/tests/deal.II/assemble_matrix_parallel_02.cc
@@ -401,6 +401,7 @@ void LaplaceProblem<dim>::assemble_test_1 ()
                           std_cxx1x::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (),
+         multithread_info.n_threads(),
          1);
 }
 
@@ -425,6 +426,7 @@ void LaplaceProblem<dim>::assemble_test_2 ()
                           std_cxx1x::_1),
          Assembly::Scratch::Data<dim>(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 4713c3c936f7dab7613eb216b53cdbecd5fee435..18cdb2b70738c4c9a02a72c823b84ff624666934 100644 (file)
--- a/tests/deal.II/assemble_matrix_parallel_04.cc
+++ b/tests/deal.II/assemble_matrix_parallel_04.cc
@@ -429,6 +429,7 @@ void LaplaceProblem<dim>::assemble_test_1 ()
                           std_cxx1x::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (1),
+         2*multithread_info.n_threads(),
          1);
   for (unsigned int i=0; i<dof_handler.n_dofs(); ++i)
     if (constraints.is_constrained(i))
@@ -459,6 +460,7 @@ void LaplaceProblem<dim>::assemble_test_2 ()
                           std_cxx1x::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (2),
+         2*multithread_info.n_threads(),
          1);
   for (unsigned int i=0; i<dof_handler.n_dofs(); ++i)
     if (constraints.is_constrained(i))

diff --git a/tests/trilinos/assemble_matrix_parallel_01.cc b/tests/trilinos/assemble_matrix_parallel_01.cc
index 209fe9c025a098919742ef05d874763bcdd72e42..ca074fec83880c9878ed87c4a75ed744acff2a72 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_01.cc
+++ b/tests/trilinos/assemble_matrix_parallel_01.cc
@@ -367,7 +367,9 @@ void LaplaceProblem<dim>::assemble_test ()
                           this,
                           std_cxx1x::_1),
          Assembly::Scratch::Data<dim>(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 5dfdc8ad2c3d81efeef7f9d67663949132e50f34..954afca20aace38595b242e6d5b3600a4f629195 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_02.cc
+++ b/tests/trilinos/assemble_matrix_parallel_02.cc
@@ -362,6 +362,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx1x::_1),
          Assembly::Scratch::Data<dim>(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 70f08ed5587ce11981e85b0a260e1943893b181f..e61846e1b5e0f5567195cb14ecc37b2f5ea5c3a1 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_03.cc
+++ b/tests/trilinos/assemble_matrix_parallel_03.cc
@@ -363,6 +363,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx1x::_1),
          Assembly::Scratch::Data<dim>(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 f1b53350708ad076455107ad5ff2fa22cab54d6e..b7745d6e2a2e66a6e5889436b0a5613bec0c60d3 100644 (file)
--- a/tests/trilinos/assemble_matrix_parallel_04.cc
+++ b/tests/trilinos/assemble_matrix_parallel_04.cc
@@ -380,6 +380,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx1x::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (),
+         2*multithread_info.n_threads(),
          1);
   test_matrix.compress(VectorOperation::add);
   test_rhs.compress(VectorOperation::add);