tests: Update to latest changes

diff --git a/tests/fe/fe_data_test.cc b/tests/fe/fe_data_test.cc
index 54f659cd49cea3cb4012c98dfaba6f28033c076b..ae910c833531a4fa11e325052975046c9691887e 100644 (file)
--- a/tests/fe/fe_data_test.cc
+++ b/tests/fe/fe_data_test.cc
@@ -277,8 +277,6 @@ void test_fe_datas()
 int main()
 {
   initlog();
-//  deallog.log_execution_time(true);
-//  deallog.log_time_differences(true);
 
   test_fe_datas<1>();
   test_fe_datas<2>();

diff --git a/tests/integrators/cochain_01.cc b/tests/integrators/cochain_01.cc
index 612b43a500f1e19651aff18582b54985043be384..851d725ab4807e8acb090bbb5b9054654aca2c2d 100644 (file)
--- a/tests/integrators/cochain_01.cc
+++ b/tests/integrators/cochain_01.cc
@@ -296,13 +296,7 @@ void run3d (unsigned int degree)
 
 int main()
 {
-  const std::string logname = "output";
-  std::ofstream logfile(logname.c_str());
-  deallog.attach(logfile);
-  deallog.log_execution_time(false);
-  if (!debugging)
-    {
-    }
+  initlog();
 
   run2d(0);
   run2d(1);

diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc
index 61396d097b76dce3d0e7ea1f1173c378003189db..ba55c0ca66e0b92a6bbc60e14e7f690d36c8d39e 100644 (file)
--- a/tests/lac/sparse_matrices.cc
+++ b/tests/lac/sparse_matrices.cc
@@ -276,18 +276,8 @@ int main()
   deallog << std::setprecision(3);
   deallog.attach(logfile);
 
-  // Switch between regression test
-  // and benchmark
-//#ifdef DEBUG
   const unsigned int size = 5;
   const unsigned int row_length = 3;
-  /*#else
-    deallog.depth_console(1000);
-    deallog.log_execution_time(true);
-    deallog.log_time_differences(true);
-    const unsigned int size = 50;
-    const unsigned int row_length = 9;
-    #endif*/
 
   check_ez_iterator();
   check_conjugate(logfile);
@@ -309,9 +299,7 @@ int main()
     deallog << "Assemble" << std::endl;
     testproblem.five_point(A, true);
     check_vmult_quadratic(A_res, A, "5-SparseMatrix<double>");
-//#ifdef DEBUG
     check_iterator(A);
-//#endif
   }
 
   // block sparse matrix with only
@@ -328,9 +316,7 @@ int main()
     testproblem.five_point(block_A, true);
     std::vector<double> block_A_res;
     check_vmult_quadratic(block_A_res, block_A, "5-BlockSparseMatrix<double>");
-//#ifdef DEBUG
     check_iterator(block_A);
-//#endif
   }
 
   // ez sparse matrix
@@ -339,9 +325,7 @@ int main()
     deallog << "Assemble" << std::endl;
     testproblem.five_point(E, true);
     check_vmult_quadratic(E_res, E, "5-SparseMatrixEZ<double>");
-//#ifdef DEBUG
     check_iterator(E);
-//#endif
     E.print_statistics(deallog, true);
     E.add(-1., A);
     if (E.l2_norm() < 1.e-14)