Fixed typo

diff --git a/include/deal.II/meshworker/mesh_loop.h b/include/deal.II/meshworker/mesh_loop.h
index b0c8e45d577ef11aaa848692c0d9a8fd9382b61e..2036c7ded4d2bf660dd13849fa686a49d50abfd5 100644 (file)
--- 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<CellIteratorType>::type &end,
 
                  const typename identity<std::function<void (const CellIteratorType &, ScratchData &, CopyData &)>>::type &cell_worker,
-                 const typename identity<std::function<void (const CopyData &)>>::type &copyer,
+                 const typename identity<std::function<void (const CopyData &)>>::type &copier,
 
                  ScratchData &scratch_data,
                  CopyData &copy_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 5aff73ade10bbbfcce204a0e8ffeaf8d7f8517cc..bdd5feffe7264c6300bd405e5ddfb1ffb7da9c73 100644 (file)
--- 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 6239db88871c0068430e6bb57de07ffea28d6871..0bc699789143b82fc1df6db7be6098bbdca3193f 100644 (file)
--- 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 bcbdbfc1c6ac84f872866d52b74fd3b8bc9ea90b..9976aa79597ab1703f4e7ffe15fa8a3eaf8cf0a2 100644 (file)
--- 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 7060a52ee61808ada074a8b85f044a424d3896b4..0d6bc50211ad0c25a12a3c4f0e3769be6395353f 100644 (file)
--- 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