From da04680cea980aeb3868d4af475378a6760cf1fa Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 22 Aug 2013 18:37:04 +0000 Subject: [PATCH] Fix some tests git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30429 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/fe/copy_fe.cc | 2 +- tests/fe/fe_face_orientation_nedelec_0.cc | 2 +- tests/fe/fe_face_orientation_nedelec_000.cc | 2 +- tests/fe/fe_face_orientation_nedelec_001.cc | 2 +- tests/fe/fe_face_orientation_nedelec_010.cc | 2 +- tests/fe/fe_face_orientation_nedelec_011.cc | 2 +- tests/fe/fe_face_orientation_nedelec_100.cc | 2 +- tests/fe/fe_face_orientation_nedelec_101.cc | 2 +- tests/fe/fe_face_orientation_nedelec_110.cc | 2 +- tests/fe/fe_face_orientation_nedelec_111.cc | 2 +- tests/fe/fe_prolongation_bdm.cc | 2 +- tests/fe/fe_prolongation_dgp.cc | 2 +- tests/fe/fe_prolongation_dgq.cc | 2 +- tests/fe/fe_prolongation_nedelec.cc | 2 +- tests/fe/fe_prolongation_q.cc | 2 +- tests/fe/fe_prolongation_q_dg0.cc | 2 +- tests/fe/fe_prolongation_q_hierarchical.cc | 2 +- tests/fe/fe_prolongation_q_iso_q1.cc | 2 +- tests/fe/fe_prolongation_rt.cc | 2 +- tests/fe/fe_prolongation_sys_01.cc | 2 +- tests/fe/fe_prolongation_sys_02.cc | 2 +- tests/fe/fe_prolongation_sys_03.cc | 2 +- tests/fe/fe_prolongation_sys_04.cc | 2 +- tests/fe/fe_prolongation_sys_05.cc | 2 +- tests/fe/fe_prolongation_sys_06.cc | 2 +- tests/fe/fe_prolongation_sys_07.cc | 2 +- tests/fe/fe_prolongation_sys_08.cc | 2 +- tests/fe/fe_prolongation_sys_09.cc | 2 +- tests/fe/fe_prolongation_sys_10.cc | 2 +- tests/fe/fe_q_dg0.cc | 3 +-- tests/fe/fe_restriction_bdm.cc | 2 +- tests/fe/fe_restriction_dgp.cc | 2 +- tests/fe/fe_restriction_dgq.cc | 2 +- tests/fe/fe_restriction_nedelec.cc | 2 +- tests/fe/fe_restriction_q.cc | 2 +- tests/fe/fe_restriction_q_dg0.cc | 2 +- tests/fe/fe_restriction_q_hierarchical.cc | 2 +- tests/fe/fe_restriction_q_iso_q1.cc | 2 +- tests/fe/fe_restriction_rt.cc | 2 +- tests/fe/fe_restriction_sys_01.cc | 2 +- tests/fe/fe_restriction_sys_02.cc | 2 +- tests/fe/fe_restriction_sys_03.cc | 2 +- tests/fe/fe_restriction_sys_04.cc | 2 +- tests/fe/fe_restriction_sys_05.cc | 2 +- tests/fe/fe_restriction_sys_06.cc | 2 +- tests/fe/fe_restriction_sys_07.cc | 2 +- tests/fe/fe_restriction_sys_08.cc | 2 +- tests/fe/fe_restriction_sys_09.cc | 2 +- tests/fe/fe_restriction_sys_10.cc | 2 +- tests/fe/fe_support_points_bdm.cc | 2 +- tests/fe/fe_support_points_nedelec.cc | 2 +- tests/fe/fe_support_points_q.cc | 2 +- tests/fe/fe_support_points_q_dg0.cc | 2 +- tests/fe/fe_support_points_q_hierarchical.cc | 2 +- tests/fe/fe_support_points_q_iso_q1.cc | 2 +- tests/fe/fe_support_points_q_qg0.cc | 2 +- tests/fe/fe_support_points_rt.cc | 2 +- tests/fe/fe_support_points_sys_01.cc | 2 +- tests/fe/fe_support_points_sys_02.cc | 2 +- tests/fe/fe_support_points_sys_03.cc | 2 +- tests/fe/fe_support_points_sys_04.cc | 2 +- tests/fe/fe_support_points_sys_05.cc | 2 +- tests/fe/fe_support_points_sys_06.cc | 2 +- tests/fe/fe_support_points_sys_07.cc | 2 +- tests/fe/fe_support_points_sys_08.cc | 2 +- tests/fe/fe_support_points_sys_09.cc | 2 +- tests/fe/fe_support_points_sys_10.cc | 2 +- tests/tests.h | 6 +++--- 68 files changed, 70 insertions(+), 71 deletions(-) diff --git a/tests/fe/copy_fe.cc b/tests/fe/copy_fe.cc index 680af7160f..101ef7d8b0 100644 --- a/tests/fe/copy_fe.cc +++ b/tests/fe/copy_fe.cc @@ -47,7 +47,7 @@ ON__> "void dealii::Subscriptor::do_unsubscribe(const char*) const", int main () { - initlog(__FILE__); + initlog(); { FE_Q<2> fe(1); { diff --git a/tests/fe/fe_face_orientation_nedelec_0.cc b/tests/fe/fe_face_orientation_nedelec_0.cc index a65fae7b91..88c1a630f0 100644 --- a/tests/fe/fe_face_orientation_nedelec_0.cc +++ b/tests/fe/fe_face_orientation_nedelec_0.cc @@ -152,7 +152,7 @@ void set_solution (Vector &vector, const DoFHandler<3> &dof_handler, con int main () { - initlog (__FILE__); + initlog(); deallog.threshold_double (1.e-10); Triangulation<3> tria_ref; diff --git a/tests/fe/fe_face_orientation_nedelec_000.cc b/tests/fe/fe_face_orientation_nedelec_000.cc index be0a0693dd..10cf37fb54 100644 --- a/tests/fe/fe_face_orientation_nedelec_000.cc +++ b/tests/fe/fe_face_orientation_nedelec_000.cc @@ -22,7 +22,7 @@ int main() { - initlog (__FILE__); + initlog(); deallog.threshold_double (1.e-10); run (true, false, false); } diff --git a/tests/fe/fe_face_orientation_nedelec_001.cc b/tests/fe/fe_face_orientation_nedelec_001.cc index 79da709554..d1fbcd920b 100644 --- a/tests/fe/fe_face_orientation_nedelec_001.cc +++ b/tests/fe/fe_face_orientation_nedelec_001.cc @@ -22,7 +22,7 @@ int main() { - initlog (__FILE__); + initlog(); deallog.threshold_double (1.e-10); run (false, false, true); } diff --git a/tests/fe/fe_face_orientation_nedelec_010.cc b/tests/fe/fe_face_orientation_nedelec_010.cc index c7650991e1..6c8637ef16 100644 --- a/tests/fe/fe_face_orientation_nedelec_010.cc +++ b/tests/fe/fe_face_orientation_nedelec_010.cc @@ -22,7 +22,7 @@ int main() { - initlog (__FILE__); + initlog(); deallog.threshold_double (1.e-10); run (false, true, false); } diff --git a/tests/fe/fe_face_orientation_nedelec_011.cc b/tests/fe/fe_face_orientation_nedelec_011.cc index ed839d6d5e..7592bb6f0c 100644 --- a/tests/fe/fe_face_orientation_nedelec_011.cc +++ b/tests/fe/fe_face_orientation_nedelec_011.cc @@ -22,7 +22,7 @@ int main() { - initlog (__FILE__); + initlog(); deallog.threshold_double (1.e-10); run (false, true, true); } diff --git a/tests/fe/fe_face_orientation_nedelec_100.cc b/tests/fe/fe_face_orientation_nedelec_100.cc index db815e94f0..56a2144b23 100644 --- a/tests/fe/fe_face_orientation_nedelec_100.cc +++ b/tests/fe/fe_face_orientation_nedelec_100.cc @@ -22,7 +22,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); run (false, false, false); } diff --git a/tests/fe/fe_face_orientation_nedelec_101.cc b/tests/fe/fe_face_orientation_nedelec_101.cc index 7199567653..a12210923c 100644 --- a/tests/fe/fe_face_orientation_nedelec_101.cc +++ b/tests/fe/fe_face_orientation_nedelec_101.cc @@ -22,7 +22,7 @@ int main() { - initlog (__FILE__); + initlog(); deallog.threshold_double (1.e-10); run (true, false, true); } diff --git a/tests/fe/fe_face_orientation_nedelec_110.cc b/tests/fe/fe_face_orientation_nedelec_110.cc index 5382a8f316..fb6f25a089 100644 --- a/tests/fe/fe_face_orientation_nedelec_110.cc +++ b/tests/fe/fe_face_orientation_nedelec_110.cc @@ -22,7 +22,7 @@ int main() { - initlog (__FILE__); + initlog(); deallog.threshold_double (1.e-10); run (true, true, false); } diff --git a/tests/fe/fe_face_orientation_nedelec_111.cc b/tests/fe/fe_face_orientation_nedelec_111.cc index 2409a96cf1..574b291036 100644 --- a/tests/fe/fe_face_orientation_nedelec_111.cc +++ b/tests/fe/fe_face_orientation_nedelec_111.cc @@ -22,7 +22,7 @@ int main() { - initlog (__FILE__); + initlog(); deallog.threshold_double (1.e-10); run (true, true, true); } diff --git a/tests/fe/fe_prolongation_bdm.cc b/tests/fe/fe_prolongation_bdm.cc index aa16305385..be58a0e9a2 100644 --- a/tests/fe/fe_prolongation_bdm.cc +++ b/tests/fe/fe_prolongation_bdm.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(BDM, 1, 2); diff --git a/tests/fe/fe_prolongation_dgp.cc b/tests/fe/fe_prolongation_dgp.cc index 6f806142fa..5d5c4a1573 100644 --- a/tests/fe/fe_prolongation_dgp.cc +++ b/tests/fe/fe_prolongation_dgp.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(DGP,0,2); diff --git a/tests/fe/fe_prolongation_dgq.cc b/tests/fe/fe_prolongation_dgq.cc index 1037bf5906..8db45a0721 100644 --- a/tests/fe/fe_prolongation_dgq.cc +++ b/tests/fe/fe_prolongation_dgq.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(DGQ,0,2); diff --git a/tests/fe/fe_prolongation_nedelec.cc b/tests/fe/fe_prolongation_nedelec.cc index 9b88dc03f0..7663fe053c 100644 --- a/tests/fe/fe_prolongation_nedelec.cc +++ b/tests/fe/fe_prolongation_nedelec.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Nedelec, 0, 2); diff --git a/tests/fe/fe_prolongation_q.cc b/tests/fe/fe_prolongation_q.cc index 07b0163651..5112363026 100644 --- a/tests/fe/fe_prolongation_q.cc +++ b/tests/fe/fe_prolongation_q.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q,1,2); diff --git a/tests/fe/fe_prolongation_q_dg0.cc b/tests/fe/fe_prolongation_q_dg0.cc index 6894060c65..899df95ac8 100644 --- a/tests/fe/fe_prolongation_q_dg0.cc +++ b/tests/fe/fe_prolongation_q_dg0.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_DG0,1,2); diff --git a/tests/fe/fe_prolongation_q_hierarchical.cc b/tests/fe/fe_prolongation_q_hierarchical.cc index 99c6b78d4b..b8993c2340 100644 --- a/tests/fe/fe_prolongation_q_hierarchical.cc +++ b/tests/fe/fe_prolongation_q_hierarchical.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_Hierarchical,1,2); diff --git a/tests/fe/fe_prolongation_q_iso_q1.cc b/tests/fe/fe_prolongation_q_iso_q1.cc index 908e40af33..736c6a8d23 100644 --- a/tests/fe/fe_prolongation_q_iso_q1.cc +++ b/tests/fe/fe_prolongation_q_iso_q1.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_iso_Q1,1,2); diff --git a/tests/fe/fe_prolongation_rt.cc b/tests/fe/fe_prolongation_rt.cc index 8b685b96a6..ffadb2e7c4 100644 --- a/tests/fe/fe_prolongation_rt.cc +++ b/tests/fe/fe_prolongation_rt.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(RaviartThomas, 0, 2); diff --git a/tests/fe/fe_prolongation_sys_01.cc b/tests/fe/fe_prolongation_sys_01.cc index a4fe5d0b92..15e51491e4 100644 --- a/tests/fe/fe_prolongation_sys_01.cc +++ b/tests/fe/fe_prolongation_sys_01.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS1(FE_Q<2>(1),3,2); diff --git a/tests/fe/fe_prolongation_sys_02.cc b/tests/fe/fe_prolongation_sys_02.cc index b9ced537f4..027373f0d6 100644 --- a/tests/fe/fe_prolongation_sys_02.cc +++ b/tests/fe/fe_prolongation_sys_02.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS1(FE_DGQ<2>(2),2,2); diff --git a/tests/fe/fe_prolongation_sys_03.cc b/tests/fe/fe_prolongation_sys_03.cc index 77c802662d..8110d8ae3a 100644 --- a/tests/fe/fe_prolongation_sys_03.cc +++ b/tests/fe/fe_prolongation_sys_03.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2(FE_Q<2>(1),3,FE_DGQ<2>(2),2,2); diff --git a/tests/fe/fe_prolongation_sys_04.cc b/tests/fe/fe_prolongation_sys_04.cc index 9a1b4196b0..a56f4e5543 100644 --- a/tests/fe/fe_prolongation_sys_04.cc +++ b/tests/fe/fe_prolongation_sys_04.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(3),3,2); diff --git a/tests/fe/fe_prolongation_sys_05.cc b/tests/fe/fe_prolongation_sys_05.cc index 28a892d23a..ad5d57962a 100644 --- a/tests/fe/fe_prolongation_sys_05.cc +++ b/tests/fe/fe_prolongation_sys_05.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3((FESystem<2>(FE_Q<2>(1),3)), 3, diff --git a/tests/fe/fe_prolongation_sys_06.cc b/tests/fe/fe_prolongation_sys_06.cc index 413660a6c4..a3773122fe 100644 --- a/tests/fe/fe_prolongation_sys_06.cc +++ b/tests/fe/fe_prolongation_sys_06.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_prolongation_sys_07.cc b/tests/fe/fe_prolongation_sys_07.cc index 3d00e72940..0aeb6af040 100644 --- a/tests/fe/fe_prolongation_sys_07.cc +++ b/tests/fe/fe_prolongation_sys_07.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2 (FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_prolongation_sys_08.cc b/tests/fe/fe_prolongation_sys_08.cc index 05cfc9b1e8..27236b8017 100644 --- a/tests/fe/fe_prolongation_sys_08.cc +++ b/tests/fe/fe_prolongation_sys_08.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_Nedelec<2>(0), 1, diff --git a/tests/fe/fe_prolongation_sys_09.cc b/tests/fe/fe_prolongation_sys_09.cc index 7b134c87c7..5c8cf0fc5c 100644 --- a/tests/fe/fe_prolongation_sys_09.cc +++ b/tests/fe/fe_prolongation_sys_09.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2 (FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_prolongation_sys_10.cc b/tests/fe/fe_prolongation_sys_10.cc index 0e7ff45fe7..79ea0a7405 100644 --- a/tests/fe/fe_prolongation_sys_10.cc +++ b/tests/fe/fe_prolongation_sys_10.cc @@ -22,7 +22,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_Nedelec<2>(1), 1, diff --git a/tests/fe/fe_q_dg0.cc b/tests/fe/fe_q_dg0.cc index afa2afb9d0..7ee2e630dc 100644 --- a/tests/fe/fe_q_dg0.cc +++ b/tests/fe/fe_q_dg0.cc @@ -18,7 +18,6 @@ // test FE_Q_DG0 (modified step-22) - #include "../tests.h" #include #include @@ -928,7 +927,7 @@ int main () using namespace dealii; using namespace Step22; - initlog(__FILE__); + initlog(); deallog.depth_file (1); diff --git a/tests/fe/fe_restriction_bdm.cc b/tests/fe/fe_restriction_bdm.cc index 27b049eda3..a466a503d2 100644 --- a/tests/fe/fe_restriction_bdm.cc +++ b/tests/fe/fe_restriction_bdm.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(BDM, 1, 2); diff --git a/tests/fe/fe_restriction_dgp.cc b/tests/fe/fe_restriction_dgp.cc index 0262809450..0242b91f35 100644 --- a/tests/fe/fe_restriction_dgp.cc +++ b/tests/fe/fe_restriction_dgp.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(DGP,0,2); diff --git a/tests/fe/fe_restriction_dgq.cc b/tests/fe/fe_restriction_dgq.cc index 6fde644ed4..19dc6eb163 100644 --- a/tests/fe/fe_restriction_dgq.cc +++ b/tests/fe/fe_restriction_dgq.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(DGQ,0,2); diff --git a/tests/fe/fe_restriction_nedelec.cc b/tests/fe/fe_restriction_nedelec.cc index 9e17fdd63b..7227a2ff53 100644 --- a/tests/fe/fe_restriction_nedelec.cc +++ b/tests/fe/fe_restriction_nedelec.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Nedelec, 0, 2); diff --git a/tests/fe/fe_restriction_q.cc b/tests/fe/fe_restriction_q.cc index 5ecf841cad..1138f3415f 100644 --- a/tests/fe/fe_restriction_q.cc +++ b/tests/fe/fe_restriction_q.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q,1,2); diff --git a/tests/fe/fe_restriction_q_dg0.cc b/tests/fe/fe_restriction_q_dg0.cc index ee3a34eb5c..2a8bac5626 100644 --- a/tests/fe/fe_restriction_q_dg0.cc +++ b/tests/fe/fe_restriction_q_dg0.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_DG0,1,2); diff --git a/tests/fe/fe_restriction_q_hierarchical.cc b/tests/fe/fe_restriction_q_hierarchical.cc index a3a968b836..c7ea0d872a 100644 --- a/tests/fe/fe_restriction_q_hierarchical.cc +++ b/tests/fe/fe_restriction_q_hierarchical.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_Hierarchical,1,2); diff --git a/tests/fe/fe_restriction_q_iso_q1.cc b/tests/fe/fe_restriction_q_iso_q1.cc index 8fd4195ee0..6d1170a947 100644 --- a/tests/fe/fe_restriction_q_iso_q1.cc +++ b/tests/fe/fe_restriction_q_iso_q1.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_iso_Q1,1,2); diff --git a/tests/fe/fe_restriction_rt.cc b/tests/fe/fe_restriction_rt.cc index 724e97662f..9745a742be 100644 --- a/tests/fe/fe_restriction_rt.cc +++ b/tests/fe/fe_restriction_rt.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(RaviartThomas, 0, 2); diff --git a/tests/fe/fe_restriction_sys_01.cc b/tests/fe/fe_restriction_sys_01.cc index 137681eebb..79e0f9a140 100644 --- a/tests/fe/fe_restriction_sys_01.cc +++ b/tests/fe/fe_restriction_sys_01.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS1(FE_Q<2>(1),3,2); diff --git a/tests/fe/fe_restriction_sys_02.cc b/tests/fe/fe_restriction_sys_02.cc index ba5ba909bf..3f25bb522c 100644 --- a/tests/fe/fe_restriction_sys_02.cc +++ b/tests/fe/fe_restriction_sys_02.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS1(FE_DGQ<2>(2),2,2); diff --git a/tests/fe/fe_restriction_sys_03.cc b/tests/fe/fe_restriction_sys_03.cc index 982f47779b..38c3a67168 100644 --- a/tests/fe/fe_restriction_sys_03.cc +++ b/tests/fe/fe_restriction_sys_03.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2(FE_Q<2>(1),3,FE_DGQ<2>(2),2,2); diff --git a/tests/fe/fe_restriction_sys_04.cc b/tests/fe/fe_restriction_sys_04.cc index 6c58e07037..438d8b93e4 100644 --- a/tests/fe/fe_restriction_sys_04.cc +++ b/tests/fe/fe_restriction_sys_04.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(3),3,2); diff --git a/tests/fe/fe_restriction_sys_05.cc b/tests/fe/fe_restriction_sys_05.cc index 8fea59815d..63d1e50d23 100644 --- a/tests/fe/fe_restriction_sys_05.cc +++ b/tests/fe/fe_restriction_sys_05.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3((FESystem<2>(FE_Q<2>(1),3)), 3, diff --git a/tests/fe/fe_restriction_sys_06.cc b/tests/fe/fe_restriction_sys_06.cc index 48b4ab5681..ca4b676bed 100644 --- a/tests/fe/fe_restriction_sys_06.cc +++ b/tests/fe/fe_restriction_sys_06.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_restriction_sys_07.cc b/tests/fe/fe_restriction_sys_07.cc index 1928ea30b9..6a7fe1e58c 100644 --- a/tests/fe/fe_restriction_sys_07.cc +++ b/tests/fe/fe_restriction_sys_07.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2 (FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_restriction_sys_08.cc b/tests/fe/fe_restriction_sys_08.cc index 20e5147c96..eb70af4560 100644 --- a/tests/fe/fe_restriction_sys_08.cc +++ b/tests/fe/fe_restriction_sys_08.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_Nedelec<2>(0), 1, diff --git a/tests/fe/fe_restriction_sys_09.cc b/tests/fe/fe_restriction_sys_09.cc index 0c1e4cca58..d81001f4be 100644 --- a/tests/fe/fe_restriction_sys_09.cc +++ b/tests/fe/fe_restriction_sys_09.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2 (FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_restriction_sys_10.cc b/tests/fe/fe_restriction_sys_10.cc index 849d7a8b6b..60af54bfe4 100644 --- a/tests/fe/fe_restriction_sys_10.cc +++ b/tests/fe/fe_restriction_sys_10.cc @@ -22,7 +22,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_Nedelec<2>(1), 1, diff --git a/tests/fe/fe_support_points_bdm.cc b/tests/fe/fe_support_points_bdm.cc index 0ff84093b0..690e42c115 100644 --- a/tests/fe/fe_support_points_bdm.cc +++ b/tests/fe/fe_support_points_bdm.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(BDM, 1, 2); diff --git a/tests/fe/fe_support_points_nedelec.cc b/tests/fe/fe_support_points_nedelec.cc index c86ea8af90..1353198ce8 100644 --- a/tests/fe/fe_support_points_nedelec.cc +++ b/tests/fe/fe_support_points_nedelec.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Nedelec, 0, 2); diff --git a/tests/fe/fe_support_points_q.cc b/tests/fe/fe_support_points_q.cc index bbcf837eab..4821556ec6 100644 --- a/tests/fe/fe_support_points_q.cc +++ b/tests/fe/fe_support_points_q.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q,1,2); diff --git a/tests/fe/fe_support_points_q_dg0.cc b/tests/fe/fe_support_points_q_dg0.cc index b52af2afac..ea9b6942c9 100644 --- a/tests/fe/fe_support_points_q_dg0.cc +++ b/tests/fe/fe_support_points_q_dg0.cc @@ -22,7 +22,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_DG0,1,2); diff --git a/tests/fe/fe_support_points_q_hierarchical.cc b/tests/fe/fe_support_points_q_hierarchical.cc index b90be60424..9d8f024dcc 100644 --- a/tests/fe/fe_support_points_q_hierarchical.cc +++ b/tests/fe/fe_support_points_q_hierarchical.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_Hierarchical,1,2); diff --git a/tests/fe/fe_support_points_q_iso_q1.cc b/tests/fe/fe_support_points_q_iso_q1.cc index 4ee7205a1c..47d2160cbd 100644 --- a/tests/fe/fe_support_points_q_iso_q1.cc +++ b/tests/fe/fe_support_points_q_iso_q1.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_iso_Q1,1,2); diff --git a/tests/fe/fe_support_points_q_qg0.cc b/tests/fe/fe_support_points_q_qg0.cc index cab731f662..6d1e6b1c53 100644 --- a/tests/fe/fe_support_points_q_qg0.cc +++ b/tests/fe/fe_support_points_q_qg0.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(Q_DG0,1,2); diff --git a/tests/fe/fe_support_points_rt.cc b/tests/fe/fe_support_points_rt.cc index fab3b6c246..d92ddd86c2 100644 --- a/tests/fe/fe_support_points_rt.cc +++ b/tests/fe/fe_support_points_rt.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_ALL(RaviartThomas, 0, 2); diff --git a/tests/fe/fe_support_points_sys_01.cc b/tests/fe/fe_support_points_sys_01.cc index 3e199ba2f1..fa0e9133d1 100644 --- a/tests/fe/fe_support_points_sys_01.cc +++ b/tests/fe/fe_support_points_sys_01.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS1(FE_Q<2>(1),3,2); diff --git a/tests/fe/fe_support_points_sys_02.cc b/tests/fe/fe_support_points_sys_02.cc index 7c375f1183..e9f3c55e1e 100644 --- a/tests/fe/fe_support_points_sys_02.cc +++ b/tests/fe/fe_support_points_sys_02.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS1(FE_DGQ<2>(2),2,2); diff --git a/tests/fe/fe_support_points_sys_03.cc b/tests/fe/fe_support_points_sys_03.cc index 7bae625883..f1148e72b5 100644 --- a/tests/fe/fe_support_points_sys_03.cc +++ b/tests/fe/fe_support_points_sys_03.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2(FE_Q<2>(1),3,FE_DGQ<2>(2),2,2); diff --git a/tests/fe/fe_support_points_sys_04.cc b/tests/fe/fe_support_points_sys_04.cc index 2c0d4c4a3f..5225316df3 100644 --- a/tests/fe/fe_support_points_sys_04.cc +++ b/tests/fe/fe_support_points_sys_04.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_DGQ<2>(2),2,FE_DGQ<2>(2),2,FE_Q<2>(3),3,2); diff --git a/tests/fe/fe_support_points_sys_05.cc b/tests/fe/fe_support_points_sys_05.cc index 530829c9b6..0422a65b9e 100644 --- a/tests/fe/fe_support_points_sys_05.cc +++ b/tests/fe/fe_support_points_sys_05.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3((FESystem<2>(FE_Q<2>(1),3)), 3, diff --git a/tests/fe/fe_support_points_sys_06.cc b/tests/fe/fe_support_points_sys_06.cc index cbde6b5330..1953f32489 100644 --- a/tests/fe/fe_support_points_sys_06.cc +++ b/tests/fe/fe_support_points_sys_06.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_support_points_sys_07.cc b/tests/fe/fe_support_points_sys_07.cc index 8fda88894e..8486de8ad1 100644 --- a/tests/fe/fe_support_points_sys_07.cc +++ b/tests/fe/fe_support_points_sys_07.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2 (FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_support_points_sys_08.cc b/tests/fe/fe_support_points_sys_08.cc index 2b983c8a28..e748178280 100644 --- a/tests/fe/fe_support_points_sys_08.cc +++ b/tests/fe/fe_support_points_sys_08.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_Nedelec<2>(0), 1, diff --git a/tests/fe/fe_support_points_sys_09.cc b/tests/fe/fe_support_points_sys_09.cc index b2079a0c41..ab87aead76 100644 --- a/tests/fe/fe_support_points_sys_09.cc +++ b/tests/fe/fe_support_points_sys_09.cc @@ -23,7 +23,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS2 (FE_DGQ<2>(3), 1, diff --git a/tests/fe/fe_support_points_sys_10.cc b/tests/fe/fe_support_points_sys_10.cc index 8233691321..ef7a52a1e0 100644 --- a/tests/fe/fe_support_points_sys_10.cc +++ b/tests/fe/fe_support_points_sys_10.cc @@ -22,7 +22,7 @@ int main() { - initlog(__FILE__); + initlog(); deallog.threshold_double(1.e-10); CHECK_SYS3(FE_Nedelec<2>(1), 1, diff --git a/tests/tests.h b/tests/tests.h index a68e539790..7bc71e9908 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -74,7 +74,7 @@ using namespace dealii; // Function for initialize deallog. Normally, it should be called at // the beginning of main() like // -// initlog(__FILE__); +// initlog(); // // This will open the correct output file, divert log output there and // switch off screen output. If screen output is desired, provide the @@ -84,9 +84,9 @@ std::ofstream deallogfile; inline void -initlog(const char *filename, bool console=false) +initlog(bool console=false) { - deallogname = JobIdentifier::base_name(filename) + std::string("/output"); + deallogname = "/output"; deallogfile.open(deallogname.c_str()); deallog.attach(deallogfile); if (!console) -- 2.39.5