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

index 911899c39c2e9ae9179b999baf8c0eeba5a84d19..27cee7f1b95ccd3fdd728d3698cd959776c36a29 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2014 by the deal.II authors
+// Copyright (C) 2001 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -83,8 +83,8 @@ void test ()
   write_mat_id_to_file(tria);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_no_halo_" + std::to_string(dim) + "d.vtk";
-    std::ofstream f(filename);
+    const std::string filename = "grid_no_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    std::ofstream f(filename.c_str());
     GridOut().write_vtk (tria, f);
   }
 
@@ -103,8 +103,8 @@ void test ()
   write_mat_id_to_file(tria);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_with_halo_" + std::to_string(dim) + "d.vtk";
-    std::ofstream f(filename);
+    const std::string filename = "grid_with_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    std::ofstream f(filename.c_str());
     GridOut().write_vtk (tria, f);
   }
 }
index 8cf6744f6d599e2d605c21c6f0502f2d4e3d176b..ed87b4569faf8909f839895c09508ed23c684514 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2014 by the deal.II authors
+// Copyright (C) 2001 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -77,8 +77,8 @@ void test ()
   write_mat_id_to_file(tria);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_no_halo_" + std::to_string(dim) + "d.vtk";
-    std::ofstream f(filename);
+    const std::string filename = "grid_no_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    std::ofstream f(filename.c_str());
     GridOut().write_vtk (tria, f);
   }
 
@@ -97,8 +97,8 @@ void test ()
   write_mat_id_to_file(tria);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_with_halo_" + std::to_string(dim) + "d.vtk";
-    std::ofstream f(filename);
+    const std::string filename = "grid_with_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    std::ofstream f(filename.c_str());
     GridOut().write_vtk (tria, f);
   }
 }
index c2de9aef7ca1bc225e53b8b1918940367664fb99..325efbc96bc1c4bb48f3648d3c528203769b166b 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2014 by the deal.II authors
+// Copyright (C) 2001 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -82,8 +82,8 @@ void test ()
   write_mat_id_to_file(tria);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_no_halo_" + std::to_string(dim) + "d.vtk";
-    std::ofstream f(filename);
+    const std::string filename = "grid_no_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    std::ofstream f(filename.c_str());
     GridOut().write_vtk (tria, f);
   }
 
@@ -102,8 +102,8 @@ void test ()
   write_mat_id_to_file(tria);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_with_halo_" + std::to_string(dim) + "d.vtk";
-    std::ofstream f(filename);
+    const std::string filename = "grid_with_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    std::ofstream f(filename.c_str());
     GridOut().write_vtk (tria, f);
   }
 }
index 9db8a250ff436680eb1a161fe14dd9b97c931b08..1e934083d0dec288b081d766eabd3a8a49403c0a 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2014 by the deal.II authors
+// Copyright (C) 2001 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -109,8 +109,8 @@ void test ()
   write_active_fe_index_to_file(dof_handler);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_no_halo_" + std::to_string(dim) + "d.vtk";
-    write_vtk(dof_handler, filename);
+    const std::string filename = "grid_no_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    write_vtk(dof_handler, filename.c_str());
   }
 
   // Compute a halo layer around active fe index 2 and set it to active fe index 3
@@ -128,8 +128,8 @@ void test ()
   write_active_fe_index_to_file(dof_handler);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_with_halo_" + std::to_string(dim) + "d.vtk";
-    write_vtk(dof_handler, filename);
+    const std::string filename = "grid_with_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    write_vtk(dof_handler, filename.c_str());
   }
 }
 
index 8edbba36f848cbd57fbcf88a0208e6dbdd422fc4..ff35b09ae01f690da17910a07f84e8d0ae62b89c 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2014 by the deal.II authors
+// Copyright (C) 2001 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -115,8 +115,8 @@ void test ()
   write_active_fe_index_to_file(dof_handler);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_no_halo_" + std::to_string(dim) + "d.vtk";
-    write_vtk(dof_handler, filename);
+    const std::string filename = "grid_no_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    write_vtk(dof_handler, filename.c_str());
   }
 
   // Compute a halo layer around active fe indices 2,3 and set it to active fe index 4
@@ -134,8 +134,8 @@ void test ()
   write_active_fe_index_to_file(dof_handler);
   // Write to file to visually check result
   {
-    const std::string filename = "grid_with_halo_" + std::to_string(dim) + "d.vtk";
-    write_vtk(dof_handler, filename);
+    const std::string filename = "grid_with_halo_" + Utilities::int_to_string(dim) + "d.vtk";
+    write_vtk(dof_handler, filename.c_str());
   }
 }
 
index f8fc22f479e721c0d58565504af0d63b8b5c892e..7eae0972b006bf835b1dec2ab90ef2403f791081 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2001 - 2014 by the deal.II authors
+// Copyright (C) 2001 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -35,10 +35,6 @@ void test ()
   GridGenerator::hyper_cube(tria);
   tria.refine_global(2);
 
-//  // Write to file for visual inspection
-//  const std::string filename = "grid_" + std::to_string(dim) + "d";
-//  tria.write_mesh_vtk(filename.c_str());
-
   typedef typename parallel::distributed::Triangulation<dim>::active_cell_iterator cell_iterator;
 
   // Mark a small block at the corner of the hypercube

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.