Cleaned up tests.

diff --git a/include/deal.II/meshworker/mesh_loop.h b/include/deal.II/meshworker/mesh_loop.h
index 145e436f78dacf57f1b71953073424eda4601efc..b0c8e45d577ef11aaa848692c0d9a8fd9382b61e 100644 (file)
--- a/include/deal.II/meshworker/mesh_loop.h
+++ b/include/deal.II/meshworker/mesh_loop.h
@@ -55,15 +55,15 @@ namespace MeshWorker
 
                  const AssembleFlags flags = assemble_own_cells,
 
-                 const typename identity<std::function<void (const CellIteratorType &, const unsigned int&, ScratchData &, CopyData &)>>::type &boundary_worker=
-                  std::function<void (const CellIteratorType &, const unsigned int&, ScratchData &, CopyData &)>(),
+                 const typename identity<std::function<void (const CellIteratorType &, const unsigned int &, ScratchData &, CopyData &)>>::type &boundary_worker=
+                   std::function<void (const CellIteratorType &, const unsigned int &, ScratchData &, CopyData &)>(),
 
                  const typename identity<std::function<void (const CellIteratorType &, const unsigned int &, const unsigned int &,
-                                           const CellIteratorType &, const unsigned int &, const unsigned int &,
-                                           ScratchData &, CopyData &)>>::type &face_worker=
-                  std::function<void (const CellIteratorType &, const unsigned int &, const unsigned int &,
-                                      const CellIteratorType &, const unsigned int &, const unsigned int &,
-                                      ScratchData &, CopyData &)>(),
+                                                             const CellIteratorType &, const unsigned int &, const unsigned int &,
+                                                             ScratchData &, CopyData &)>>::type &face_worker=
+                   std::function<void (const CellIteratorType &, const unsigned int &, const unsigned int &,
+                                       const CellIteratorType &, const unsigned int &, const unsigned int &,
+                                       ScratchData &, CopyData &)>(),
 
                  const unsigned int   queue_length = 2*MultithreadInfo::n_threads(),
                  const unsigned int   chunk_size = 8)

diff --git a/tests/meshworker/mesh_loop_02.cc b/tests/meshworker/mesh_loop_02.cc
index f231b62af3d1bb90532a0f7f4c8c913e8f0199bc..5aff73ade10bbbfcce204a0e8ffeaf8d7f8517cc 100644 (file)
--- a/tests/meshworker/mesh_loop_02.cc
+++ b/tests/meshworker/mesh_loop_02.cc
@@ -114,16 +114,6 @@ void test()
   mesh_loop(cell, endc, cell_worker, copyer, scratch, copy,
             assemble_own_interior_faces_both,
             boundary_worker, face_worker);
-
-
-
-
-  deallog << "CELLS FIRST AND BOUNDARY" << std::endl << std::endl;
-
-  mesh_loop(cell, endc, cell_worker, copyer, scratch, copy,
-            assemble_own_cells | assemble_cells_first | assemble_boundary_faces,
-            boundary_worker, face_worker);
-
 }
 
 

diff --git a/tests/meshworker/mesh_loop_02.output b/tests/meshworker/mesh_loop_02.output
index f63bd6b747c8b04e1132e46d38735ec49c51d4d6..6239db88871c0068430e6bb57de07ffea28d6871 100644 (file)
--- a/tests/meshworker/mesh_loop_02.output
+++ b/tests/meshworker/mesh_loop_02.output
@@ -134,29 +134,3 @@ DEAL::Copyer
 DEAL::Copyer
 DEAL::Copyer
 DEAL::Copyer
-DEAL::CELLS FIRST AND BOUNDARY
-DEAL::
-DEAL::Cell worker on : 1.1
-DEAL::Boundary worker on : 1.1, Face : 1
-DEAL::Boundary worker on : 1.1, Face : 2
-DEAL::Cell worker on : 1.2
-DEAL::Boundary worker on : 1.2, Face : 0
-DEAL::Boundary worker on : 1.2, Face : 3
-DEAL::Cell worker on : 1.3
-DEAL::Boundary worker on : 1.3, Face : 1
-DEAL::Boundary worker on : 1.3, Face : 3
-DEAL::Cell worker on : 2.0
-DEAL::Boundary worker on : 2.0, Face : 0
-DEAL::Boundary worker on : 2.0, Face : 2
-DEAL::Cell worker on : 2.1
-DEAL::Boundary worker on : 2.1, Face : 2
-DEAL::Cell worker on : 2.2
-DEAL::Boundary worker on : 2.2, Face : 0
-DEAL::Cell worker on : 2.3
-DEAL::Copyer
-DEAL::Copyer
-DEAL::Copyer
-DEAL::Copyer
-DEAL::Copyer
-DEAL::Copyer
-DEAL::Copyer

diff --git a/tests/meshworker/mesh_loop_03.cc b/tests/meshworker/mesh_loop_03.cc
index a7e51a20aa5835720e0a69bd8aab2fb294d8425b..bcbdbfc1c6ac84f872866d52b74fd3b8bc9ea90b 100644 (file)
--- a/tests/meshworker/mesh_loop_03.cc
+++ b/tests/meshworker/mesh_loop_03.cc
@@ -79,9 +79,7 @@ void test()
 
   deallog << "CELLS ONLY" << std::endl << std::endl;
 
-  mesh_loop(cell, endc, cell_worker, copyer, scratch, copy,
-            assemble_own_cells,
-            boundary_worker, face_worker);
+  mesh_loop(cell, endc, cell_worker, copyer, scratch, copy);
 
 
   deallog << "CELLS ONLY WORKSTREAM" << std::endl << std::endl;