Fix up tests

diff --git a/tests/algorithms/theta_01.cc b/tests/algorithms/theta_01.cc
index d11b5e86647234f2722f2e2d1c1bc03b38e4063c..b879610a1a922832c7a16c42e12ac38d00018e38 100644 (file)
--- a/tests/algorithms/theta_01.cc
+++ b/tests/algorithms/theta_01.cc
@@ -24,6 +24,8 @@
 
 #include <iostream>
 
+#include "../tests.h"
+
 using namespace dealii;
 using namespace Algorithms;
 
@@ -67,7 +69,7 @@ main()
   matrix(1, 0) = -numbers::PI;
 
   OutputOperator<Vector<double>> out;
-  out.initialize_stream(logfile);
+  out.initialize_stream(deallog.get_file_stream());
 
   Explicit                          op_explicit(matrix);
   Implicit                          op_implicit(matrix);

diff --git a/tests/bits/christian_1.cc b/tests/bits/christian_1.cc
index 8129cea8848147aff2a03bda4c4e62325ec2bcd2..2245f10216bb72b11f9ba08581a411d8169a5714 100644 (file)
--- a/tests/bits/christian_1.cc
+++ b/tests/bits/christian_1.cc
@@ -181,25 +181,25 @@ main()
   data_out.attach_dof_handler(dof);
   data_out.add_data_vector(sol, "base");
   data_out.build_patches();
-  data_out.write_gnuplot(logfile);
+  data_out.write_gnuplot(deallog.get_file_stream());
 
   data_out.clear();
   data_out.attach_dof_handler(refined_dof);
   data_out.add_data_vector(refined_sol, "refined");
   data_out.build_patches();
-  data_out.write_gnuplot(logfile);
+  data_out.write_gnuplot(deallog.get_file_stream());
 
   data_out.clear();
   data_out.attach_dof_handler(coarse_dof);
   data_out.add_data_vector(coarse_sol, "coarse");
   data_out.build_patches();
-  data_out.write_gnuplot(logfile);
+  data_out.write_gnuplot(deallog.get_file_stream());
 
   data_out.clear();
   data_out.attach_dof_handler(both_dof);
   data_out.add_data_vector(both_sol, "both");
   data_out.build_patches();
-  data_out.write_gnuplot(logfile);
+  data_out.write_gnuplot(deallog.get_file_stream());
 
   // test output using DataOutStack
   DataOutStack<2> data_out_stack;
@@ -209,5 +209,5 @@ main()
   data_out_stack.add_data_vector(sol, "dof");
   data_out_stack.build_patches();
   data_out_stack.finish_parameter_value();
-  data_out_stack.write_gnuplot(logfile);
+  data_out_stack.write_gnuplot(deallog.get_file_stream());
 }

diff --git a/tests/bits/christian_2.cc b/tests/bits/christian_2.cc
index 6464e821de6f841c90be491ba2d8874668730fdf..468b9e0ea87de1a8c6c5d84a8f2beba4b28f2fe1 100644 (file)
--- a/tests/bits/christian_2.cc
+++ b/tests/bits/christian_2.cc
@@ -54,5 +54,5 @@ main()
   data_out_stack.build_patches();
   data_out_stack.finish_parameter_value();
 
-  data_out_stack.write_gnuplot(logfile);
+  data_out_stack.write_gnuplot(deallog.get_file_stream());
 }

diff --git a/tests/bits/solution_transfer.cc b/tests/bits/solution_transfer.cc
index ecfcf056f9ad00e5ffea4f1cf48a0475485fdc1e..9d385c0dca4063bc9b524469338add0527d9aa77 100644 (file)
--- a/tests/bits/solution_transfer.cc
+++ b/tests/bits/solution_transfer.cc
@@ -197,11 +197,11 @@ main()
   initlog();
 
   deallog << "   1D solution transfer" << std::endl;
-  transfer<1>(logfile);
+  transfer<1>(deallog.get_file_stream());
 
   deallog << "   2D solution transfer" << std::endl;
-  transfer<2>(logfile);
+  transfer<2>(deallog.get_file_stream());
 
   deallog << "   3D solution transfer" << std::endl;
-  transfer<3>(logfile);
+  transfer<3>(deallog.get_file_stream());
 }

diff --git a/tests/data_out/data_out_curved_cells.cc b/tests/data_out/data_out_curved_cells.cc
index 9e44933fcc25429319f70005b849bbef71f320f9..88227f3ffc56be60eac1356046b581c48fbff098 100644 (file)
--- a/tests/data_out/data_out_curved_cells.cc
+++ b/tests/data_out/data_out_curved_cells.cc
@@ -84,7 +84,7 @@ laplace_solve(const SparseMatrix<double> &          S,
 // create a rinf grid and compute a MappingQEuler to represent the inner
 // boundary
 void
-curved_grid(std::ofstream &out)
+curved_grid(std::ostream &out)
 {
   // number of cells in radial and
   // circumferential direction
@@ -256,8 +256,7 @@ int
 main()
 {
   initlog();
-  deallog << std::setprecision(4);
-  logfile << std::setprecision(4);
+  deallog.get_file_stream() << std::setprecision(4);
 
-  curved_grid(logfile);
+  curved_grid(deallog.get_file_stream());
 }

diff --git a/tests/data_out/data_out_multi_dh_03.cc b/tests/data_out/data_out_multi_dh_03.cc
index 228ce94f8ddb72b513a95ddc424eb92c085ae4ba..b3242b72e82207770f481aa126e62f78f1be0f68 100644 (file)
--- a/tests/data_out/data_out_multi_dh_03.cc
+++ b/tests/data_out/data_out_multi_dh_03.cc
@@ -77,7 +77,7 @@ main()
   try
     {
       initlog();
-      deallog << std::setprecision(2);
+      deallog.get_file_stream() << std::setprecision(2);
 
       test<1>();
       test<2>();

diff --git a/tests/data_out/data_out_multi_dh_05.cc b/tests/data_out/data_out_multi_dh_05.cc
index e141418d5b7a11fecb8320cd7eb1c170bec17ded..1a46cb6c0980b3b30cad1bf7e7a0efe45831def8 100644 (file)
--- a/tests/data_out/data_out_multi_dh_05.cc
+++ b/tests/data_out/data_out_multi_dh_05.cc
@@ -87,7 +87,7 @@ main()
   try
     {
       initlog();
-      deallog << std::setprecision(2);
+      deallog.get_file_stream() << std::setprecision(2);
 
       test<1>();
       test<2>();

diff --git a/tests/fe/fe_tools.cc b/tests/fe/fe_tools.cc
index 6075479ffbcfefb7f8102d9c7c9348ab3273b6ab..7ebeadac289bf21a303c2eb84209470d81c66138 100644 (file)
--- a/tests/fe/fe_tools.cc
+++ b/tests/fe/fe_tools.cc
@@ -202,9 +202,9 @@ main()
 {
   initlog();
 
-  test_projection<1>(logfile);
-  test_projection<2>(logfile);
-  test_projection<3>(logfile);
+  test_projection<1>(deallog.get_file_stream());
+  test_projection<2>(deallog.get_file_stream());
+  test_projection<3>(deallog.get_file_stream());
 
   test_renumbering<1>();
   test_renumbering<2>();

diff --git a/tests/fe/fe_tools_01.cc b/tests/fe/fe_tools_01.cc
index 636ff52e81b90686c852ffd2a16269f70d1f6f11..27719c29f0604ccd13e38c48953e66921fc59d11 100644 (file)
--- a/tests/fe/fe_tools_01.cc
+++ b/tests/fe/fe_tools_01.cc
@@ -82,7 +82,7 @@ main()
         }
       catch (ExceptionBase &e)
         {
-          logfile << e.what();
+          deallog << e.what();
         }
     }
 }

diff --git a/tests/lac/constraints_inhomogeneous.cc b/tests/lac/constraints_inhomogeneous.cc
index badabb1a699bf3a24a9641034066aa349a13a81c..da65e33ec175d732099d64c99c523c850177e04b 100644 (file)
--- a/tests/lac/constraints_inhomogeneous.cc
+++ b/tests/lac/constraints_inhomogeneous.cc
@@ -59,7 +59,7 @@ int
 main()
 {
   initlog();
-  deallog << std::setprecision(2);
+  deallog.get_file_stream() << std::setprecision(2);
 
   test();
 

diff --git a/tests/lac/copy_transposed.cc b/tests/lac/copy_transposed.cc
index bcb04cb6830a62bb16c71e284eb8af6615fc4605..1b7bb46993bae33c477f4f591d2828de65c2605c 100644 (file)
--- a/tests/lac/copy_transposed.cc
+++ b/tests/lac/copy_transposed.cc
@@ -49,5 +49,5 @@ main()
           << std::endl;
   FullMatrix<float> ff;
   ff.copy_transposed(ez);
-  ff.print_formatted(logfile, 0, false, 5, "~");
+  ff.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
 }

diff --git a/tests/lac/matrices.cc b/tests/lac/matrices.cc
index 928f23a84e777fb6d0534b684b9409a6f80f9fac..42d100d88490059821ef0760a2c6498b83252d43 100644 (file)
--- a/tests/lac/matrices.cc
+++ b/tests/lac/matrices.cc
@@ -49,21 +49,21 @@ main()
           << std::endl;
   FullMatrix<float> ff;
   ff.copy_from(ez);
-  ff.print_formatted(logfile, 0, false, 5, "~");
+  ff.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
 
   deallog << "LAPACKFullMatrix<double>::copy_from  SparseMatrixEZ<double>"
           << std::endl;
   LAPACKFullMatrix<double> lfd;
   lfd.copy_from(ez);
-  lfd.print_formatted(logfile, 0, false, 5, "~");
+  lfd.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
 
   lfd.reinit(2, 3);
   deallog << "LAPACKFullMatrix<double>::fill  SparseMatrixEZ<double>"
           << std::endl;
   lfd.fill(ez, 0, 0, 2, 1);
-  lfd.print_formatted(logfile, 0, false, 5, "~");
+  lfd.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
   deallog << "LAPACKFullMatrix<double>::fill  SparseMatrixEZ<double>"
           << std::endl;
   lfd.fill(ez, 1, 1, 4, 2);
-  lfd.print_formatted(logfile, 0, false, 5, "~");
+  lfd.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
 }

diff --git a/tests/lac/matrices_ez.cc b/tests/lac/matrices_ez.cc
index 3c41414cc247ada897968a1bdfcb6b8880ee10b5..7eb2452db419e2f5a2e661fe716d80cec640bf84 100644 (file)
--- a/tests/lac/matrices_ez.cc
+++ b/tests/lac/matrices_ez.cc
@@ -49,5 +49,5 @@ main()
           << std::endl;
   SparseMatrixEZ<float> ff;
   ff.copy_from(ez);
-  ff.print_formatted(logfile, 0, false, 5, "~");
+  ff.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
 }

diff --git a/tests/lac/matrices_ez_add.cc b/tests/lac/matrices_ez_add.cc
index 2646ccdcbac17d27b9e7ffc3911e26d14ed68b0e..a6b94f3d7bfbcdd028fb70c6236dd3e258f0ef78 100644 (file)
--- a/tests/lac/matrices_ez_add.cc
+++ b/tests/lac/matrices_ez_add.cc
@@ -49,5 +49,5 @@ main()
           << std::endl;
   SparseMatrixEZ<float> ff(ez.m(), ez.n());
   ff.add(2, ez);
-  ff.print_formatted(logfile, 0, false, 5, "~");
+  ff.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
 }

diff --git a/tests/lac/matrices_lapack.cc b/tests/lac/matrices_lapack.cc
index 704a7ee727fbcab1632571aa898517c7384b155f..285ac55538815298f900e520b4c61632d77b9995 100644 (file)
--- a/tests/lac/matrices_lapack.cc
+++ b/tests/lac/matrices_lapack.cc
@@ -49,5 +49,5 @@ main()
           << std::endl;
   LAPACKFullMatrix<float> ff;
   ff.copy_from(ez);
-  ff.print_formatted(logfile, 0, false, 5, "~");
+  ff.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
 }

diff --git a/tests/lac/matrices_lapack_fill.cc b/tests/lac/matrices_lapack_fill.cc
index da4997f9b4a387ebb23349ba605fffbd73db3488..4f8422a5b0fd6f66cb7e0af93a7069923e17bb25 100644 (file)
--- a/tests/lac/matrices_lapack_fill.cc
+++ b/tests/lac/matrices_lapack_fill.cc
@@ -50,7 +50,7 @@ main()
             << std::endl;
     LAPACKFullMatrix<float> ff(ez.m(), ez.n());
     ff.fill(ez, 0, 0, 0, 0, 2, false);
-    ff.print_formatted(logfile, 0, false, 5, "~");
+    ff.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
   }
 
   {
@@ -58,6 +58,6 @@ main()
             << std::endl;
     LAPACKFullMatrix<float> ff(ez.n(), ez.m());
     ff.fill(ez, 0, 0, 0, 0, 2, true);
-    ff.print_formatted(logfile, 0, false, 5, "~");
+    ff.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
   }
 }

diff --git a/tests/lac/print_formatted_ez_01.cc b/tests/lac/print_formatted_ez_01.cc
index 42e219e9140ba036bd7f1b5d96a60903fa297162..319c1f23749be97f54d23a8b48e77a2b1000ce28 100644 (file)
--- a/tests/lac/print_formatted_ez_01.cc
+++ b/tests/lac/print_formatted_ez_01.cc
@@ -42,5 +42,5 @@ main()
   ez.set(4, 2, 13.);
   ez.set(4, 3, 14.);
 
-  ez.print_formatted(logfile, 0, false, 5, "~");
+  ez.print_formatted(deallog.get_file_stream(), 0, false, 5, "~");
 }

diff --git a/tests/lac/solver_control_01.cc b/tests/lac/solver_control_01.cc
index 06a0ec171b32653885d0a3ad615c96fe3d88ae2e..5608548bf7af1ccdcd7ddfc0cfa59f1000446808 100644 (file)
--- a/tests/lac/solver_control_01.cc
+++ b/tests/lac/solver_control_01.cc
@@ -68,7 +68,7 @@ int
 main(int argc, char **argv)
 {
   initlog();
-  deallog << std::setprecision(4);
+  deallog.get_file_stream() << std::setprecision(4);
 
   {
     const unsigned int size = 32;

diff --git a/tests/lac/solver_control_02.cc b/tests/lac/solver_control_02.cc
index 27b092e7a116e69794b2802efef19ea7b5e31558..8bf385853c497cf309869bcf070883be5cf7cc11 100644 (file)
--- a/tests/lac/solver_control_02.cc
+++ b/tests/lac/solver_control_02.cc
@@ -68,7 +68,7 @@ int
 main(int argc, char **argv)
 {
   initlog();
-  deallog << std::setprecision(4);
+  deallog.get_file_stream() << std::setprecision(4);
 
 
   {

diff --git a/tests/lac/solver_control_03.cc b/tests/lac/solver_control_03.cc
index 00194c22d1c58a935a815dbbc4a536193272d4d0..5c05b73d30439756147b8dc0f366e657cb41de6d 100644 (file)
--- a/tests/lac/solver_control_03.cc
+++ b/tests/lac/solver_control_03.cc
@@ -68,7 +68,7 @@ int
 main(int argc, char **argv)
 {
   initlog();
-  deallog << std::setprecision(4);
+  deallog.get_file_stream() << std::setprecision(4);
 
 
   {

diff --git a/tests/lac/solver_control_04.cc b/tests/lac/solver_control_04.cc
index b114635378531afbd8e6ce0ce9f49dbc6a219333..8afb2482159bf6d97e6383a2d8f9afc703962426 100644 (file)
--- a/tests/lac/solver_control_04.cc
+++ b/tests/lac/solver_control_04.cc
@@ -68,7 +68,7 @@ int
 main(int argc, char **argv)
 {
   initlog();
-  deallog << std::setprecision(4);
+  deallog.get_file_stream() << std::setprecision(4);
 
   {
     const unsigned int size = 32;

diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc
index 2d937a601e1024f6350d85f8336e91be4b2f123d..1be8e0c55329a3dd0149a0f57c1dc6c56074564b 100644 (file)
--- a/tests/lac/sparse_matrices.cc
+++ b/tests/lac/sparse_matrices.cc
@@ -288,7 +288,7 @@ main()
   const unsigned int row_length = 3;
 
   check_ez_iterator();
-  check_conjugate(logfile);
+  check_conjugate(deallog.get_file_stream());
 
   FDMatrix     testproblem(size, size);
   unsigned int dim = (size - 1) * (size - 1);

diff --git a/tests/opencascade/circle_normal_projection.cc b/tests/opencascade/circle_normal_projection.cc
index d1789dd1323ff3fc981f537e06979414439ac9d7..f47018de69515502d92a4b32898e721dbae7ba83 100644 (file)
--- a/tests/opencascade/circle_normal_projection.cc
+++ b/tests/opencascade/circle_normal_projection.cc
@@ -89,7 +89,7 @@ main()
   // You can open the generated file
   // with paraview.
   GridOut gridout;
-  gridout.write_ucd(tria, logfile);
+  gridout.write_ucd(tria, deallog.get_file_stream());
 
   return 0;
 }

diff --git a/tests/opencascade/interpolation_curve_boundary.cc b/tests/opencascade/interpolation_curve_boundary.cc
index 7c0997f8358d5e0cf60d6f28679b8bcef4aeca2b..e1619f0035868f2689955f981f92da241346b587 100644 (file)
--- a/tests/opencascade/interpolation_curve_boundary.cc
+++ b/tests/opencascade/interpolation_curve_boundary.cc
@@ -76,7 +76,7 @@ main()
 
   // You can open the generated file with gmsh.
   GridOut gridout;
-  gridout.write_msh(tria, logfile);
+  gridout.write_msh(tria, deallog.get_file_stream());
 
   return 0;
 }

diff --git a/tests/physics/elasticity-kinematics_02.cc b/tests/physics/elasticity-kinematics_02.cc
index 41f01072d9244ff9118c919df85e2d41a07f25e7..10ef530719ade41fef02d886e1efb2f8cabb3bd1 100644 (file)
--- a/tests/physics/elasticity-kinematics_02.cc
+++ b/tests/physics/elasticity-kinematics_02.cc
@@ -103,5 +103,4 @@ main()
           deallog << "Not OK" << std::endl;
 
   deallog << "OK" << std::endl;
-  logfile.close();
 }

diff --git a/tests/sparsity/block_dynamic_01.cc b/tests/sparsity/block_dynamic_01.cc
index 070a08dcdf3ed1e1144544c21f45844cffb5788a..2a1bc266a836fa324f7fa643ea75b3afe40b9a8f 100644 (file)
--- a/tests/sparsity/block_dynamic_01.cc
+++ b/tests/sparsity/block_dynamic_01.cc
@@ -47,7 +47,7 @@ main()
   deallog << "size block(1,0):" << csp.block(1, 0).n_rows() << "x"
           << csp.block(1, 0).n_cols() << std::endl;
 
-  csp.print(logfile);
+  csp.print(deallog.get_file_stream());
 
   deallog << std::endl;
   for (unsigned int i = 0; i < 3; ++i)

diff --git a/tests/sparsity/block_dynamic_sparsity_pattern_indexset_01.cc b/tests/sparsity/block_dynamic_sparsity_pattern_indexset_01.cc
index 4a7bcd61acbdc1ef9022b9e2aafb2301086ee935..5b8f496182702da39ed70f2d67995fa9d115d393 100644 (file)
--- a/tests/sparsity/block_dynamic_sparsity_pattern_indexset_01.cc
+++ b/tests/sparsity/block_dynamic_sparsity_pattern_indexset_01.cc
@@ -64,7 +64,7 @@ main()
         }
     }
 
-  csp.print(logfile);
+  csp.print(deallog.get_file_stream());
 
   return 0;
 }

diff --git a/tests/sparsity/block_sparsity_pattern_01.cc b/tests/sparsity/block_sparsity_pattern_01.cc
index e307ecc6303e7fe1a18aa3cf2d8cc618243d6d22..eab0c7cb607db2d6e4b4547c0a8b98d71834cad0 100644 (file)
--- a/tests/sparsity/block_sparsity_pattern_01.cc
+++ b/tests/sparsity/block_sparsity_pattern_01.cc
@@ -69,7 +69,7 @@ main()
             sparsity.add(ii, cols.local_to_global(jb, j));
       }
 
-  sparsity.print(logfile);
+  sparsity.print(deallog.get_file_stream());
 
   return 0;
 }

diff --git a/tests/tensors/tensor_05.cc b/tests/tensors/tensor_05.cc
index 5e1e0cebb00e1b5547fa9a89201270e04c79367b..0e48b8c64c6d3fdf7d9c7bb0fe084ba64e1cb097 100644 (file)
--- a/tests/tensors/tensor_05.cc
+++ b/tests/tensors/tensor_05.cc
@@ -25,7 +25,8 @@
 int
 main()
 {
-  initlog() deallog << std::setprecision(3);
+  initlog();
+  deallog << std::setprecision(3);
 
   double a[3][3] = {{1, 2, 3}, {3, 4, 5}, {6, 7, 8}};
 

diff --git a/tests/tensors/tensor_08.cc b/tests/tensors/tensor_08.cc
index ee7f2ac2d6b41854b6adeb4441a0899365f104ae..ae8838fd8a9bf65379bbbfeb19b1499ccff6de62 100644 (file)
--- a/tests/tensors/tensor_08.cc
+++ b/tests/tensors/tensor_08.cc
@@ -47,7 +47,8 @@ test_select(double f1, double f2)
 int
 main()
 {
-  initlog() deallog << std::setprecision(3);
+  initlog();
+  deallog << std::setprecision(3);
 
   test_select<2>(1., 1.);
   test_select<3>(1., 1.);