From e5226a623cf44684e878aaa1ee46ba695442027e Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 29 Sep 2011 15:44:06 +0000 Subject: [PATCH] Make include paths future proof. git-svn-id: https://svn.dealii.org/trunk@24468 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/bits/count_dofs_per_component_hp_01.cc | 22 +++++++-------- tests/bits/count_dofs_per_component_hp_02.cc | 28 ++++++++++---------- tests/serialization/dof_handler_01.cc | 28 ++++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/tests/bits/count_dofs_per_component_hp_01.cc b/tests/bits/count_dofs_per_component_hp_01.cc index 53d93b2487..96ad381c03 100644 --- a/tests/bits/count_dofs_per_component_hp_01.cc +++ b/tests/bits/count_dofs_per_component_hp_01.cc @@ -1,8 +1,8 @@ //---------------------------------------------------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // -// Copyright (C) 2003, 2004, 2005, 2009 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2009, 2011 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -12,14 +12,14 @@ //---------------------------------------------------------------------- #include "../tests.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // check // DoFTools:: @@ -69,7 +69,7 @@ void test () } -int main () +int main () { std::ofstream logfile("count_dofs_per_component_hp_01/output"); deallog.attach(logfile); diff --git a/tests/bits/count_dofs_per_component_hp_02.cc b/tests/bits/count_dofs_per_component_hp_02.cc index 00aab45536..78a4826955 100644 --- a/tests/bits/count_dofs_per_component_hp_02.cc +++ b/tests/bits/count_dofs_per_component_hp_02.cc @@ -1,8 +1,8 @@ //---------------------------------------------------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // -// Copyright (C) 2003, 2004, 2005, 2009 by the deal.II authors +// Copyright (C) 2003, 2004, 2005, 2009, 2011 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -12,23 +12,23 @@ //---------------------------------------------------------------------- #include "../tests.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // check // DoFTools:: // count_dofs_per_component (...); // for the hp case // -// in contrast to the _01 test also check that this works if the element +// in contrast to the _01 test also check that this works if the element // collection has more than one element @@ -70,7 +70,7 @@ void test () } -int main () +int main () { std::ofstream logfile("count_dofs_per_component_hp_02/output"); deallog.attach(logfile); diff --git a/tests/serialization/dof_handler_01.cc b/tests/serialization/dof_handler_01.cc index 01f0939a0f..842eff65ef 100644 --- a/tests/serialization/dof_handler_01.cc +++ b/tests/serialization/dof_handler_01.cc @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include template bool operator == (const DoFHandler &t1, @@ -60,12 +60,12 @@ bool operator == (const DoFHandler &t1, return false; if (c1->neighbor(f)->index() != c2->neighbor(f)->index()) return false; - } + } } - + if (c1->subdomain_id() != c2->subdomain_id()) return false; - + if (c1->material_id() != c2->material_id()) return false; @@ -77,7 +77,7 @@ bool operator == (const DoFHandler &t1, if (c1->get_fe().get_name() != c2->get_fe().get_name()) return false; - + if (c1->active_fe_index() != c2->active_fe_index()) return false; @@ -86,17 +86,17 @@ bool operator == (const DoFHandler &t1, { std::vector local_dofs_1 (c1->get_fe().dofs_per_cell); std::vector local_dofs_2 (c2->get_fe().dofs_per_cell); - + c1->get_dof_indices (local_dofs_1); c2->get_dof_indices (local_dofs_2); if (local_dofs_1 != local_dofs_2) return false; - + for (unsigned int f=0; f::faces_per_cell; ++f) { std::vector local_dofs_1 (c1->get_fe().dofs_per_face); std::vector local_dofs_2 (c2->get_fe().dofs_per_face); - + c1->face(f)->get_dof_indices (local_dofs_1); c2->face(f)->get_dof_indices (local_dofs_2); if (local_dofs_1 != local_dofs_2) @@ -152,19 +152,19 @@ void test () tria.begin_active()->set_refine_flag (RefinementCase::cut_x); do_boundary (tria); - + FESystem fe (FE_Q(2),dim, FE_Q(1),1); DoFHandler dof_1 (tria); DoFHandler dof_2 (tria); - + dof_1.distribute_dofs (fe); dof_2.distribute_dofs (fe); - + // right now, both DoFHandlers are the same. Renumber one of the them DoFRenumbering::Cuthill_McKee (dof_1); - + verify (dof_1, dof_2); } @@ -182,6 +182,6 @@ int main () test<2,2> (); test<2,3> (); test<3,3> (); - + deallog << "OK" << std::endl; } -- 2.39.5