]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Testsuite: Avoid c++11isms
authorMatthias Maier <tamiko@43-1.org>
Thu, 27 Aug 2015 23:27:36 +0000 (18:27 -0500)
committerMatthias Maier <tamiko@43-1.org>
Thu, 27 Aug 2015 23:27:36 +0000 (18:27 -0500)
tests/deal.II/grid_tools_halo_layer_03.cc
tests/deal.II/grid_tools_halo_layer_05.cc

index 325efbc96bc1c4bb48f3648d3c528203769b166b..ae0f5235cfe3e97479c8f7ac09e4b315410da4a9 100644 (file)
@@ -88,8 +88,11 @@ void test ()
   }
 
   // Compute a halo layer around material ids 2 and 3 and set it to material id 4
+  std::set<types::material_id> material_ids;
+  material_ids.insert(2);
+  material_ids.insert(3);
   const std::vector<cell_iterator> active_halo_layer
-    = GridTools::compute_active_cell_halo_layer(tria, IteratorFilters::MaterialIdEqualTo({2,3}, true));
+    = GridTools::compute_active_cell_halo_layer(tria, IteratorFilters::MaterialIdEqualTo(material_ids, true));
   AssertThrow(active_halo_layer.size() > 0, ExcMessage("No halo layer found."));
   for (typename std::vector<cell_iterator>::const_iterator
        it = active_halo_layer.begin();
index ff35b09ae01f690da17910a07f84e8d0ae62b89c..6707b201608dd76d86507d276c464e80bd67de6a 100644 (file)
@@ -120,8 +120,11 @@ void test ()
   }
 
   // Compute a halo layer around active fe indices 2,3 and set it to active fe index 4
+  std::set<types::material_id> material_ids;
+  material_ids.insert(2);
+  material_ids.insert(3);
   std::vector<cell_iterator> active_halo_layer
-    = GridTools::compute_active_cell_halo_layer(dof_handler, IteratorFilters::ActiveFEIndexEqualTo({2,3}, true));
+    = GridTools::compute_active_cell_halo_layer(dof_handler, IteratorFilters::ActiveFEIndexEqualTo(material_ids, true));
   AssertThrow(active_halo_layer.size() > 0, ExcMessage("No halo layer found."));
   for (typename std::vector<cell_iterator>::iterator
        it = active_halo_layer.begin();

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.