From d87321f01fb051f0d7b5f206dd605498683f3d0b Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Thu, 10 Aug 2017 22:28:01 -0600 Subject: [PATCH] Fixed typo --- include/deal.II/meshworker/mesh_loop.h | 4 +- tests/meshworker/mesh_loop_02.cc | 16 ++--- tests/meshworker/mesh_loop_02.output | 84 +++++++++++++------------- tests/meshworker/mesh_loop_03.cc | 8 +-- tests/meshworker/mesh_loop_03.output | 28 ++++----- 5 files changed, 70 insertions(+), 70 deletions(-) diff --git a/include/deal.II/meshworker/mesh_loop.h b/include/deal.II/meshworker/mesh_loop.h index b0c8e45d57..2036c7ded4 100644 --- a/include/deal.II/meshworker/mesh_loop.h +++ b/include/deal.II/meshworker/mesh_loop.h @@ -48,7 +48,7 @@ namespace MeshWorker const typename identity::type &end, const typename identity>::type &cell_worker, - const typename identity>::type ©er, + const typename identity>::type &copier, ScratchData &scratch_data, CopyData ©_data, @@ -214,7 +214,7 @@ namespace MeshWorker // Loop over all cells WorkStream::run(begin, end, - cell_action, copyer, + cell_action, copier, scratch_data, copy_data, queue_length, chunk_size); } diff --git a/tests/meshworker/mesh_loop_02.cc b/tests/meshworker/mesh_loop_02.cc index 5aff73ade1..bdd5feffe7 100644 --- a/tests/meshworker/mesh_loop_02.cc +++ b/tests/meshworker/mesh_loop_02.cc @@ -71,47 +71,47 @@ void test() << ", Neighbor Subface: " << nsf << std::endl; }; - auto copyer = [](const CopyData &) + auto copier = [](const CopyData &) { - deallog << "Copyer" << std::endl; + deallog << "copier" << std::endl; }; deallog << "CELLS ONLY" << std::endl << std::endl; - mesh_loop(cell, endc, cell_worker, copyer, scratch, copy, + mesh_loop(cell, endc, cell_worker, copier, scratch, copy, assemble_own_cells, boundary_worker, face_worker); deallog << "BOUNDARY ONLY" << std::endl << std::endl; - mesh_loop(cell, endc, cell_worker, copyer, scratch, copy, + mesh_loop(cell, endc, cell_worker, copier, scratch, copy, assemble_boundary_faces, boundary_worker, face_worker); deallog << "CELLS AND BOUNDARY" << std::endl << std::endl; - mesh_loop(cell, endc, cell_worker, copyer, scratch, copy, + mesh_loop(cell, endc, cell_worker, copier, scratch, copy, assemble_own_cells | assemble_boundary_faces, boundary_worker, face_worker); deallog << "CELLS FIRST AND BOUNDARY" << std::endl << std::endl; - mesh_loop(cell, endc, cell_worker, copyer, scratch, copy, + mesh_loop(cell, endc, cell_worker, copier, scratch, copy, assemble_own_cells | assemble_cells_first | assemble_boundary_faces, boundary_worker, face_worker); deallog << "ONLY FACES ONCE" << std::endl << std::endl; - mesh_loop(cell, endc, cell_worker, copyer, scratch, copy, + mesh_loop(cell, endc, cell_worker, copier, scratch, copy, assemble_own_interior_faces_once, boundary_worker, face_worker); deallog << "ONLY FACES BOTH" << std::endl << std::endl; - mesh_loop(cell, endc, cell_worker, copyer, scratch, copy, + mesh_loop(cell, endc, cell_worker, copier, scratch, copy, assemble_own_interior_faces_both, boundary_worker, face_worker); } diff --git a/tests/meshworker/mesh_loop_02.output b/tests/meshworker/mesh_loop_02.output index 6239db8887..0bc6997891 100644 --- a/tests/meshworker/mesh_loop_02.output +++ b/tests/meshworker/mesh_loop_02.output @@ -8,13 +8,13 @@ DEAL::Cell worker on : 2.0 DEAL::Cell worker on : 2.1 DEAL::Cell worker on : 2.2 DEAL::Cell worker on : 2.3 -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier DEAL::BOUNDARY ONLY DEAL:: DEAL::Boundary worker on : 1.1, Face : 1 @@ -27,13 +27,13 @@ DEAL::Boundary worker on : 2.0, Face : 0 DEAL::Boundary worker on : 2.0, Face : 2 DEAL::Boundary worker on : 2.1, Face : 2 DEAL::Boundary worker on : 2.2, Face : 0 -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier DEAL::CELLS AND BOUNDARY DEAL:: DEAL::Boundary worker on : 1.1, Face : 1 @@ -53,13 +53,13 @@ DEAL::Cell worker on : 2.1 DEAL::Boundary worker on : 2.2, Face : 0 DEAL::Cell worker on : 2.2 DEAL::Cell worker on : 2.3 -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier DEAL::CELLS FIRST AND BOUNDARY DEAL:: DEAL::Cell worker on : 1.1 @@ -79,13 +79,13 @@ 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 +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier DEAL::ONLY FACES ONCE DEAL:: DEAL::Face worker on : 1.1, Neighbor cell : 1.3, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 4294967295 @@ -98,13 +98,13 @@ DEAL::Face worker on : 2.2, Neighbor cell : 2.3, Face : 1, Neighbor Face : 0, Su DEAL::Face worker on : 2.2, Neighbor cell : 1.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 0 DEAL::Face worker on : 2.3, Neighbor cell : 1.1, Face : 1, Neighbor Face : 0, Subface: 4294967295, Neighbor Subface: 1 DEAL::Face worker on : 2.3, Neighbor cell : 1.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 1 -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier DEAL::ONLY FACES BOTH DEAL:: DEAL::Face worker on : 1.1, Neighbor cell : 1.3, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 4294967295 @@ -127,10 +127,10 @@ DEAL::Face worker on : 1.1, Neighbor cell : 2.3, Face : 0, Neighbor Face : 1, Su DEAL::Face worker on : 2.3, Neighbor cell : 2.1, Face : 2, Neighbor Face : 3, Subface: 4294967295, Neighbor Subface: 4294967295 DEAL::Face worker on : 2.3, Neighbor cell : 1.2, Face : 3, Neighbor Face : 2, Subface: 4294967295, Neighbor Subface: 1 DEAL::Face worker on : 1.2, Neighbor cell : 2.3, Face : 2, Neighbor Face : 3, Subface: 1, Neighbor Subface: 4294967295 -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier diff --git a/tests/meshworker/mesh_loop_03.cc b/tests/meshworker/mesh_loop_03.cc index bcbdbfc1c6..9976aa7959 100644 --- a/tests/meshworker/mesh_loop_03.cc +++ b/tests/meshworker/mesh_loop_03.cc @@ -72,19 +72,19 @@ void test() << ", Neighbor Subface: " << nsf << std::endl; }; - auto copyer = [](const CopyData &) + auto copier = [](const CopyData &) { - deallog << "Copyer" << std::endl; + deallog << "copier" << std::endl; }; deallog << "CELLS ONLY" << std::endl << std::endl; - mesh_loop(cell, endc, cell_worker, copyer, scratch, copy); + mesh_loop(cell, endc, cell_worker, copier, scratch, copy); deallog << "CELLS ONLY WORKSTREAM" << std::endl << std::endl; - WorkStream::run(cell, endc, cell_worker, copyer, scratch, copy); + WorkStream::run(cell, endc, cell_worker, copier, scratch, copy); } diff --git a/tests/meshworker/mesh_loop_03.output b/tests/meshworker/mesh_loop_03.output index 7060a52ee6..0d6bc50211 100644 --- a/tests/meshworker/mesh_loop_03.output +++ b/tests/meshworker/mesh_loop_03.output @@ -8,13 +8,13 @@ DEAL::Cell worker on : 2.0 DEAL::Cell worker on : 2.1 DEAL::Cell worker on : 2.2 DEAL::Cell worker on : 2.3 -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier DEAL::CELLS ONLY WORKSTREAM DEAL:: DEAL::Cell worker on : 1.1 @@ -24,10 +24,10 @@ DEAL::Cell worker on : 2.0 DEAL::Cell worker on : 2.1 DEAL::Cell worker on : 2.2 DEAL::Cell worker on : 2.3 -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer -DEAL::Copyer +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier +DEAL::copier -- 2.39.5