From 329c63ad5ce3d920d2fa70052393c23ebdfe2972 Mon Sep 17 00:00:00 2001
From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Mon, 21 Oct 2013 08:49:41 +0000
Subject: [PATCH] Fix bug in update_ghost_values of matrix free with
 partition_partition strategy for hybrid parallelism.

git-svn-id: https://svn.dealii.org/trunk@31370 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/include/deal.II/matrix_free/matrix_free.h | 5 +----
 tests/mpi/matrix_free_02.cc                       | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/deal.II/include/deal.II/matrix_free/matrix_free.h b/deal.II/include/deal.II/matrix_free/matrix_free.h
index 59b9ae536f..ffc29f351e 100644
--- a/deal.II/include/deal.II/matrix_free/matrix_free.h
+++ b/deal.II/include/deal.II/matrix_free/matrix_free.h
@@ -2305,10 +2305,7 @@ MatrixFree<dim, Number>::cell_loop
                   internal::MPIComDistribute<InVector> *worker_dist =
                     new (worker[j]->allocate_child())
                   internal::MPIComDistribute<InVector>(src);
-                  if (odds == 0)
-                    break;
-                  else
-                    worker_dist->spawn(*worker_dist);
+                  worker_dist->spawn(*worker_dist);
                 }
               if (j<evens-1)
                 {
diff --git a/tests/mpi/matrix_free_02.cc b/tests/mpi/matrix_free_02.cc
index 4ba13a5242..39fcb9fbdc 100644
--- a/tests/mpi/matrix_free_02.cc
+++ b/tests/mpi/matrix_free_02.cc
@@ -184,7 +184,6 @@ void test ()
     }
 
   mf.vmult (ref, in);
-  MPI_Barrier (MPI_COMM_WORLD);
 
   for (unsigned int parallel_option = 0; parallel_option < 3; ++parallel_option)
     {
@@ -213,7 +212,6 @@ void test ()
       data.tasks_block_size = 3;
       mf_data.reinit (dof, constraints, quad, data);
       MatrixFreeTest<dim, fe_degree, number> mf (mf_data);
-      MPI_Barrier(MPI_COMM_WORLD);
       deallog << "Norm of difference:";
 
       // run 10 times to make a possible error more
-- 
2.39.5