From eee81482018c8acf0f41dd0b27cba99dd44843b0 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 13 Aug 2017 16:44:29 -0500 Subject: [PATCH] tests: Update to latest changes --- tests/fe/fe_data_test.cc | 2 -- tests/integrators/cochain_01.cc | 8 +------- tests/lac/sparse_matrices.cc | 16 ---------------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/tests/fe/fe_data_test.cc b/tests/fe/fe_data_test.cc index 54f659cd49..ae910c8335 100644 --- 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 612b43a500..851d725ab4 100644 --- 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 61396d097b..ba55c0ca66 100644 --- 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"); -//#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 block_A_res; check_vmult_quadratic(block_A_res, block_A, "5-BlockSparseMatrix"); -//#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"); -//#ifdef DEBUG check_iterator(E); -//#endif E.print_statistics(deallog, true); E.add(-1., A); if (E.l2_norm() < 1.e-14) -- 2.39.5