Avoid global logfile variable for matrix-free tests

dealii · Mar 11, 2020 · 5d792b0 · 5d792b0
1 parent 6fa3d5e
commit 5d792b0
Show file tree

Hide file tree

Showing 118 changed files with 81 additions and 361 deletions.
diff --git a/tests/matrix_free/additional_data_copy.cc b/tests/matrix_free/additional_data_copy.cc
@@ -21,7 +21,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
 
 template <typename T>
 bool

diff --git a/tests/matrix_free/advect_1d.cc b/tests/matrix_free/advect_1d.cc
@@ -37,7 +37,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
 
 
 template <int dim,

diff --git a/tests/matrix_free/advect_1d_system.cc b/tests/matrix_free/advect_1d_system.cc
@@ -37,7 +37,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
 
 
 template <int dim,

diff --git a/tests/matrix_free/advect_1d_vectorization_mask.cc b/tests/matrix_free/advect_1d_vectorization_mask.cc
@@ -36,7 +36,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
 
 
 template <int dim,

diff --git a/tests/matrix_free/assemble_matrix_01.cc b/tests/matrix_free/assemble_matrix_01.cc
@@ -36,9 +36,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
-
 
 template <int dim, int fe_degree>
 void
@@ -158,7 +155,7 @@ test()
 int
 main()
 {
-  deallog.attach(logfile);
+  initlog();
 
   deallog << std::setprecision(3);
 

diff --git a/tests/matrix_free/assemble_matrix_02.cc b/tests/matrix_free/assemble_matrix_02.cc
@@ -36,8 +36,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
 
 const unsigned int degree_p = 1;
 
@@ -215,7 +213,7 @@ test()
 int
 main()
 {
-  deallog.attach(logfile);
+  initlog();
 
   deallog << std::setprecision(3);
 

diff --git a/tests/matrix_free/assemble_matrix_03.cc b/tests/matrix_free/assemble_matrix_03.cc
@@ -39,8 +39,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
 
 namespace Assembly
 {
@@ -198,7 +196,7 @@ test()
 int
 main()
 {
-  deallog.attach(logfile);
+  initlog();
 
   deallog << std::setprecision(3);
 

diff --git a/tests/matrix_free/cell_categorization.cc b/tests/matrix_free/cell_categorization.cc
@@ -32,7 +32,6 @@
 
 #include "create_mesh.h"
 
-std::ofstream logfile("output");
 
 template <int dim>
 void

diff --git a/tests/matrix_free/cell_categorization_02.cc b/tests/matrix_free/cell_categorization_02.cc
@@ -39,7 +39,6 @@
 
 #include "create_mesh.h"
 
-std::ofstream logfile("output");
 
 template <int dim>
 void

diff --git a/tests/matrix_free/compress_constraints.cc b/tests/matrix_free/compress_constraints.cc
@@ -38,8 +38,6 @@
 
 #include "create_mesh.h"
 
-std::ofstream logfile("output");
-
 
 
 template <int dim>
@@ -97,7 +95,7 @@ test()
 int
 main()
 {
-  deallog.attach(logfile);
+  initlog();
 
   deallog << std::setprecision(3);
 

diff --git a/tests/matrix_free/compress_mapping.cc b/tests/matrix_free/compress_mapping.cc
@@ -37,8 +37,6 @@
 
 #include "create_mesh.h"
 
-std::ofstream logfile("output");
-
 
 
 template <int dim>
@@ -182,7 +180,7 @@ test_parallelogram()
 int
 main()
 {
-  deallog.attach(logfile);
+  initlog();
 
   deallog << std::setprecision(3);
 

diff --git a/tests/matrix_free/copy.cc b/tests/matrix_free/copy.cc
@@ -23,8 +23,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 #include "matrix_vector_common.h"
 
 

diff --git a/tests/matrix_free/copy_feevaluation.cc b/tests/matrix_free/copy_feevaluation.cc
@@ -19,10 +19,6 @@
 // the heap (using AlignedVector) instead of allocating it on the stack. Tests
 // also copy constructors of FEEvaluation.
 
-#include "../tests.h"
-
-std::ofstream logfile("output");
-
 #include <deal.II/base/aligned_vector.h>
 #include <deal.II/base/utilities.h>
 
@@ -52,6 +48,8 @@ std::ofstream logfile("output");
 #include <complex>
 #include <iostream>
 
+#include "../tests.h"
+
 
 
 template <int dim, int degree_p, typename VectorType>
@@ -336,7 +334,7 @@ test()
 int
 main()
 {
-  deallog.attach(logfile);
+  initlog();
 
   deallog << std::setprecision(3);
 

diff --git a/tests/matrix_free/dg_pbc_01.cc b/tests/matrix_free/dg_pbc_01.cc
@@ -32,7 +32,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
 
 
 // We want to use the matrix-vector product provided by this function (which

diff --git a/tests/matrix_free/dg_pbc_02.cc b/tests/matrix_free/dg_pbc_02.cc
@@ -35,8 +35,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 
 
 template <int dim>

diff --git a/tests/matrix_free/estimate_condition_number_mass.cc b/tests/matrix_free/estimate_condition_number_mass.cc
@@ -19,10 +19,6 @@
 // different polynomial degrees. The mesh uses a hypercube mesh with no
 // hanging nodes and no other constraints
 
-#include "../tests.h"
-
-std::ofstream logfile("output");
-
 #include <deal.II/base/function_lib.h>
 
 #include <deal.II/fe/fe_dgq.h>
@@ -40,6 +36,8 @@ std::ofstream logfile("output");
 
 #include <deal.II/numerics/vector_tools.h>
 
+#include "../tests.h"
+
 
 void
 output_double_number(double input, const std::string &text)
@@ -156,7 +154,7 @@ test(const FiniteElement<dim> &fe, const unsigned int n_iterations)
 int
 main()
 {
-  deallog.attach(logfile);
+  initlog();
 
   deallog << std::setprecision(2);
 

diff --git a/tests/matrix_free/faces_value_optimization.cc b/tests/matrix_free/faces_value_optimization.cc
@@ -30,7 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
 
 template <int dim, int fe_degree, typename number>
 class MatrixFreeTest

diff --git a/tests/matrix_free/faces_value_optimization_02.cc b/tests/matrix_free/faces_value_optimization_02.cc
@@ -31,7 +31,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
 
 template <int dim, int fe_degree, typename number>
 class MatrixFreeTest

diff --git a/tests/matrix_free/get_functions_cartesian.cc b/tests/matrix_free/get_functions_cartesian.cc
@@ -23,9 +23,6 @@
 
 #include "../tests.h"
 
-
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"
 
 

diff --git a/tests/matrix_free/get_functions_circle.cc b/tests/matrix_free/get_functions_circle.cc
@@ -23,8 +23,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"
 
 

diff --git a/tests/matrix_free/get_functions_common.h b/tests/matrix_free/get_functions_common.h
@@ -274,8 +274,7 @@ do_test(const DoFHandler<dim> &          dof,
 int
 main()
 {
-  deallog.attach(logfile);
-  deallog.depth_console(0);
+  initlog();
 
   deallog << std::setprecision(3);
   {

diff --git a/tests/matrix_free/get_functions_constraints.cc b/tests/matrix_free/get_functions_constraints.cc
@@ -21,8 +21,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"
 
 

diff --git a/tests/matrix_free/get_functions_faces.cc b/tests/matrix_free/get_functions_faces.cc
@@ -33,8 +33,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 
 
 template <int dim, int fe_degree, typename number>

diff --git a/tests/matrix_free/get_functions_float.cc b/tests/matrix_free/get_functions_float.cc
@@ -25,9 +25,6 @@
 #include "../tests.h"
 
 #include "create_mesh.h"
-
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"
 
 

diff --git a/tests/matrix_free/get_functions_gl.cc b/tests/matrix_free/get_functions_gl.cc
@@ -23,9 +23,6 @@
 
 #include "../tests.h"
 
-
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"
 
 

diff --git a/tests/matrix_free/get_functions_mappingq.cc b/tests/matrix_free/get_functions_mappingq.cc
@@ -23,8 +23,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"
 
 

diff --git a/tests/matrix_free/get_functions_multife.cc b/tests/matrix_free/get_functions_multife.cc
@@ -44,8 +44,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
 
 template <int dim,
           int fe_degree,
@@ -291,11 +289,8 @@ test()
 int
 main()
 {
-  deallog.attach(logfile);
-  // need to set quite a loose tolerance because
-  // FEValues approximates Hessians with finite
-  // differences, which are not so accurate
-  deallog << std::setprecision(3);
+  initlog();
+  deallog << std::setprecision(7);
 
   {
     deallog.push("2d");

diff --git a/tests/matrix_free/get_functions_multife2.cc b/tests/matrix_free/get_functions_multife2.cc
@@ -46,8 +46,6 @@
 #include "../tests.h"
 
 
-std::ofstream logfile("output");
-
 
 template <int dim,
           int fe_degree,
@@ -342,11 +340,8 @@ test()
 int
 main()
 {
-  deallog.attach(logfile);
-  // need to set quite a loose tolerance because
-  // FEValues approximates Hessians with finite
-  // differences, which are not so accurate
-  deallog << std::setprecision(3);
+  initlog();
+  deallog << std::setprecision(7);
 
   {
     deallog.push("2d");

diff --git a/tests/matrix_free/get_functions_notempl.cc b/tests/matrix_free/get_functions_notempl.cc
@@ -24,8 +24,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"
 
 

diff --git a/tests/matrix_free/get_functions_q_hierarchical.cc b/tests/matrix_free/get_functions_q_hierarchical.cc
@@ -30,8 +30,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"
 
 

diff --git a/tests/matrix_free/get_functions_rect.cc b/tests/matrix_free/get_functions_rect.cc
@@ -24,8 +24,6 @@
 
 #include "../tests.h"
 
-std::ofstream logfile("output");
-
 #include "get_functions_common.h"