From 9acca44b4254ae36f7f6c7ebe0b781980ac0cc38 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Thu, 10 Aug 2017 22:21:01 -0600 Subject: [PATCH] Cleaned up tests. --- include/deal.II/meshworker/mesh_loop.h | 14 +++++++------- tests/meshworker/mesh_loop_02.cc | 10 ---------- tests/meshworker/mesh_loop_02.output | 26 -------------------------- tests/meshworker/mesh_loop_03.cc | 4 +--- 4 files changed, 8 insertions(+), 46 deletions(-) diff --git a/include/deal.II/meshworker/mesh_loop.h b/include/deal.II/meshworker/mesh_loop.h index 145e436f78..b0c8e45d57 100644 --- 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>::type &boundary_worker= - std::function(), + const typename identity>::type &boundary_worker= + std::function(), const typename identity>::type &face_worker= - std::function(), + const CellIteratorType &, const unsigned int &, const unsigned int &, + ScratchData &, CopyData &)>>::type &face_worker= + std::function(), 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 f231b62af3..5aff73ade1 100644 --- 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 f63bd6b747..6239db8887 100644 --- 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 a7e51a20aa..bcbdbfc1c6 100644 --- 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; -- 2.39.5