From 0cb8de0c912e302b39b8372c75ef9be3ff9fbc08 Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Tue, 20 May 2025 12:25:22 +0200 Subject: [PATCH] Added cgal and vtk folders to .clang-format. --- .clang-format | 4 ++++ include/deal.II/cgal/surface_mesh.h | 3 ++- include/deal.II/cgal/triangulation.h | 7 ++++--- include/deal.II/cgal/utilities.h | 3 ++- include/deal.II/grid/grid_generator.h | 4 ++-- source/cgal/intersections.cc | 3 ++- source/grid/grid_generator_cgal.cc | 3 ++- tests/cgal/cgal_intersect_simplices_1d_2d.cc | 4 ++-- tests/cgal/cgal_intersect_simplices_1d_3d.cc | 4 ++-- tests/cgal/cgal_intersect_simplices_2d_2d.cc | 4 ++-- tests/cgal/cgal_intersect_simplices_2d_3d.cc | 4 ++-- tests/cgal/cgal_intersect_simplices_3d_3d_01.cc | 4 ++-- tests/cgal/cgal_intersect_simplices_3d_3d_02.cc | 6 +++--- tests/cgal/cgal_intersect_simplices_with_vertices.cc | 6 +++--- tests/cgal/cgal_mesh_criteria.cc | 3 ++- tests/cgal/cgal_point_01.cc | 3 ++- tests/cgal/cgal_quadrature_01.cc | 3 ++- tests/cgal/cgal_quadrature_02.cc | 3 ++- tests/cgal/cgal_remesh_surface.cc | 5 +++-- tests/cgal/cgal_surface_mesh_01.cc | 3 ++- tests/cgal/cgal_surface_mesh_02.cc | 3 ++- tests/cgal/cgal_surface_mesh_03.cc | 3 ++- tests/cgal/cgal_surface_mesh_04.cc | 5 +++-- tests/cgal/cgal_surface_mesh_05.cc | 7 ++++--- tests/cgal/cgal_surface_mesh_06.cc | 6 +++--- tests/cgal/cgal_surface_mesh_07.cc | 6 +++--- tests/cgal/cgal_surface_triangulation_01.cc | 3 ++- tests/cgal/cgal_surface_triangulation_02.cc | 3 ++- tests/cgal/cgal_surface_triangulation_03.cc | 3 ++- tests/cgal/cgal_triangulation_01.cc | 3 ++- tests/cgal/cgal_triangulation_02.cc | 3 ++- tests/cgal/cgal_triangulation_03.cc | 3 ++- tests/cgal/cgal_triangulation_04.cc | 3 ++- tests/cgal/cgal_triangulation_05.cc | 3 ++- tests/cgal/cgal_triangulation_06.cc | 7 ++++--- tests/cgal/cgal_triangulation_07.cc | 4 ++-- 36 files changed, 86 insertions(+), 58 deletions(-) diff --git a/.clang-format b/.clang-format index 265b96679e..88a3c6223b 100644 --- a/.clang-format +++ b/.clang-format @@ -79,6 +79,8 @@ IncludeCategories: Priority: 120 - Regex: "deal.II/boost_adaptors/.*\\.h" Priority: 125 + - Regex: "deal.II/cgal/.*\\.h" + Priority: 127 - Regex: "deal.II/differentiation/.*\\.h" Priority: 130 - Regex: "deal.II/distributed/.*\\.h" @@ -119,6 +121,8 @@ IncludeCategories: Priority: 310 - Regex: "deal.II/trilinos/.*\\.h" Priority: 320 + - Regex: "deal.II/vtk/.*\\.h" + Priority: 330 # put boost right after deal: - Regex: "" Priority: 500 diff --git a/include/deal.II/cgal/surface_mesh.h b/include/deal.II/cgal/surface_mesh.h index 6f50ee388e..82e184e5db 100644 --- a/include/deal.II/cgal/surface_mesh.h +++ b/include/deal.II/cgal/surface_mesh.h @@ -23,9 +23,10 @@ #ifdef DEAL_II_WITH_CGAL +# include + # include # include -# include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/cgal/triangulation.h b/include/deal.II/cgal/triangulation.h index afa1b0a86e..1c2938bae2 100644 --- a/include/deal.II/cgal/triangulation.h +++ b/include/deal.II/cgal/triangulation.h @@ -20,13 +20,15 @@ #include #include +#include + #include #include -#include - #ifdef DEAL_II_WITH_CGAL +# include + # include # include @@ -43,7 +45,6 @@ # include # include # include -# include DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/cgal/utilities.h b/include/deal.II/cgal/utilities.h index a1cdb2a43e..640d4f07f1 100644 --- a/include/deal.II/cgal/utilities.h +++ b/include/deal.II/cgal/utilities.h @@ -41,6 +41,8 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include DEAL_II_ENABLE_EXTRA_DIAGNOSTICS +# include + # include # include # include @@ -53,7 +55,6 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include # include -# include # include # include diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h index c081235abc..cde0209066 100644 --- a/include/deal.II/grid/grid_generator.h +++ b/include/deal.II/grid/grid_generator.h @@ -23,11 +23,11 @@ #include #include +#include + #include #include -#include - #include #include #include diff --git a/source/cgal/intersections.cc b/source/cgal/intersections.cc index e96a99906d..3b1420e0f3 100644 --- a/source/cgal/intersections.cc +++ b/source/cgal/intersections.cc @@ -31,6 +31,8 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include DEAL_II_ENABLE_EXTRA_DIAGNOSTICS +# include + # include # include # include @@ -53,7 +55,6 @@ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include # include -# include # include # include diff --git a/source/grid/grid_generator_cgal.cc b/source/grid/grid_generator_cgal.cc index f6d2191a2b..1440d66674 100644 --- a/source/grid/grid_generator_cgal.cc +++ b/source/grid/grid_generator_cgal.cc @@ -19,10 +19,11 @@ #ifdef DEAL_II_WITH_CGAL // Functions needed by the CGAL mesh generation utilities are inside +# include + # include # include # include -# include #endif diff --git a/tests/cgal/cgal_intersect_simplices_1d_2d.cc b/tests/cgal/cgal_intersect_simplices_1d_2d.cc index c9e67e38a8..62c092b81e 100644 --- a/tests/cgal/cgal_intersect_simplices_1d_2d.cc +++ b/tests/cgal/cgal_intersect_simplices_1d_2d.cc @@ -18,14 +18,14 @@ #include +#include + #include #include #include #include -#include - #include "../tests.h" using namespace CGALWrappers; diff --git a/tests/cgal/cgal_intersect_simplices_1d_3d.cc b/tests/cgal/cgal_intersect_simplices_1d_3d.cc index df9961e61f..76cba9f70f 100644 --- a/tests/cgal/cgal_intersect_simplices_1d_3d.cc +++ b/tests/cgal/cgal_intersect_simplices_1d_3d.cc @@ -17,6 +17,8 @@ #include +#include + #include #include @@ -24,8 +26,6 @@ #include #include -#include - #include "../tests.h" diff --git a/tests/cgal/cgal_intersect_simplices_2d_2d.cc b/tests/cgal/cgal_intersect_simplices_2d_2d.cc index 656596ed0d..4590ca2002 100644 --- a/tests/cgal/cgal_intersect_simplices_2d_2d.cc +++ b/tests/cgal/cgal_intersect_simplices_2d_2d.cc @@ -18,14 +18,14 @@ #include +#include + #include #include #include #include -#include - #include "../tests.h" using namespace CGALWrappers; diff --git a/tests/cgal/cgal_intersect_simplices_2d_3d.cc b/tests/cgal/cgal_intersect_simplices_2d_3d.cc index 833c6db74f..87773e0ece 100644 --- a/tests/cgal/cgal_intersect_simplices_2d_3d.cc +++ b/tests/cgal/cgal_intersect_simplices_2d_3d.cc @@ -17,6 +17,8 @@ #include +#include + #include #include @@ -24,8 +26,6 @@ #include #include -#include - #include "../tests.h" struct swap_coordinates diff --git a/tests/cgal/cgal_intersect_simplices_3d_3d_01.cc b/tests/cgal/cgal_intersect_simplices_3d_3d_01.cc index 088922700d..4aac056708 100644 --- a/tests/cgal/cgal_intersect_simplices_3d_3d_01.cc +++ b/tests/cgal/cgal_intersect_simplices_3d_3d_01.cc @@ -16,14 +16,14 @@ #include +#include + #include #include #include #include -#include - #include "../tests.h" void diff --git a/tests/cgal/cgal_intersect_simplices_3d_3d_02.cc b/tests/cgal/cgal_intersect_simplices_3d_3d_02.cc index 7a2f892e93..7efa5c1e5e 100644 --- a/tests/cgal/cgal_intersect_simplices_3d_3d_02.cc +++ b/tests/cgal/cgal_intersect_simplices_3d_3d_02.cc @@ -15,15 +15,15 @@ // Compute intersection of two 3D cells. This additional test is added because // intersections are not found with inexact kernels. +#include +#include + #include #include #include #include -#include -#include - #include "../tests.h" void diff --git a/tests/cgal/cgal_intersect_simplices_with_vertices.cc b/tests/cgal/cgal_intersect_simplices_with_vertices.cc index 2724914c2d..913bd82926 100644 --- a/tests/cgal/cgal_intersect_simplices_with_vertices.cc +++ b/tests/cgal/cgal_intersect_simplices_with_vertices.cc @@ -19,15 +19,15 @@ #include +#include +#include + #include #include #include #include -#include -#include - #include "../tests.h" using namespace CGALWrappers; diff --git a/tests/cgal/cgal_mesh_criteria.cc b/tests/cgal/cgal_mesh_criteria.cc index 0d8e1bf96b..44dae38376 100644 --- a/tests/cgal/cgal_mesh_criteria.cc +++ b/tests/cgal/cgal_mesh_criteria.cc @@ -16,12 +16,13 @@ #include +#include + #include #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_point_01.cc b/tests/cgal/cgal_point_01.cc index 4cbff3da41..edd9b94b41 100644 --- a/tests/cgal/cgal_point_01.cc +++ b/tests/cgal/cgal_point_01.cc @@ -16,9 +16,10 @@ #include +#include + #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_quadrature_01.cc b/tests/cgal/cgal_quadrature_01.cc index 4773dc8115..47475d4d6b 100644 --- a/tests/cgal/cgal_quadrature_01.cc +++ b/tests/cgal/cgal_quadrature_01.cc @@ -17,13 +17,14 @@ #include +#include + #include #include #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_quadrature_02.cc b/tests/cgal/cgal_quadrature_02.cc index 96286555bf..ffda5beff0 100644 --- a/tests/cgal/cgal_quadrature_02.cc +++ b/tests/cgal/cgal_quadrature_02.cc @@ -17,6 +17,8 @@ #include +#include + #include #include @@ -26,7 +28,6 @@ #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_remesh_surface.cc b/tests/cgal/cgal_remesh_surface.cc index ebd0a09a8e..cc014f52e4 100644 --- a/tests/cgal/cgal_remesh_surface.cc +++ b/tests/cgal/cgal_remesh_surface.cc @@ -19,13 +19,14 @@ #include +#include +#include + #include #include #include #include -#include -#include #include #include "../tests.h" diff --git a/tests/cgal/cgal_surface_mesh_01.cc b/tests/cgal/cgal_surface_mesh_01.cc index 681cb4c81c..8e7624b6ec 100644 --- a/tests/cgal/cgal_surface_mesh_01.cc +++ b/tests/cgal/cgal_surface_mesh_01.cc @@ -18,13 +18,14 @@ #include +#include + #include #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_surface_mesh_02.cc b/tests/cgal/cgal_surface_mesh_02.cc index 38f3ec97b4..5a7300669a 100644 --- a/tests/cgal/cgal_surface_mesh_02.cc +++ b/tests/cgal/cgal_surface_mesh_02.cc @@ -17,12 +17,13 @@ #include +#include + #include #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_surface_mesh_03.cc b/tests/cgal/cgal_surface_mesh_03.cc index 87286b20b3..c1aa51bbb0 100644 --- a/tests/cgal/cgal_surface_mesh_03.cc +++ b/tests/cgal/cgal_surface_mesh_03.cc @@ -16,11 +16,12 @@ #include +#include + #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_surface_mesh_04.cc b/tests/cgal/cgal_surface_mesh_04.cc index af85f8829c..98477f1083 100644 --- a/tests/cgal/cgal_surface_mesh_04.cc +++ b/tests/cgal/cgal_surface_mesh_04.cc @@ -20,12 +20,13 @@ #include +#include +#include + #include #include #include -#include -#include #include #include "../tests.h" diff --git a/tests/cgal/cgal_surface_mesh_05.cc b/tests/cgal/cgal_surface_mesh_05.cc index 8508ef2a02..397edfe09a 100644 --- a/tests/cgal/cgal_surface_mesh_05.cc +++ b/tests/cgal/cgal_surface_mesh_05.cc @@ -19,14 +19,15 @@ #include +#include +#include +#include + #include #include #include #include -#include -#include -#include #include #include "../tests.h" diff --git a/tests/cgal/cgal_surface_mesh_06.cc b/tests/cgal/cgal_surface_mesh_06.cc index 927f9f83ce..4bf689287b 100644 --- a/tests/cgal/cgal_surface_mesh_06.cc +++ b/tests/cgal/cgal_surface_mesh_06.cc @@ -18,14 +18,14 @@ #include +#include +#include + #include #include #include -#include -#include - #include "../tests.h" using K = CGAL::Exact_predicates_inexact_constructions_kernel; diff --git a/tests/cgal/cgal_surface_mesh_07.cc b/tests/cgal/cgal_surface_mesh_07.cc index db829946fa..f860e97d3f 100644 --- a/tests/cgal/cgal_surface_mesh_07.cc +++ b/tests/cgal/cgal_surface_mesh_07.cc @@ -19,14 +19,14 @@ #include +#include +#include + #include #include #include -#include -#include - #include "../tests.h" using K = CGAL::Exact_predicates_inexact_constructions_kernel; diff --git a/tests/cgal/cgal_surface_triangulation_01.cc b/tests/cgal/cgal_surface_triangulation_01.cc index 3a941461d5..15b22970c8 100644 --- a/tests/cgal/cgal_surface_triangulation_01.cc +++ b/tests/cgal/cgal_surface_triangulation_01.cc @@ -17,12 +17,13 @@ #include +#include + #include #include #include #include -#include #include diff --git a/tests/cgal/cgal_surface_triangulation_02.cc b/tests/cgal/cgal_surface_triangulation_02.cc index a7e85ed709..5071536607 100644 --- a/tests/cgal/cgal_surface_triangulation_02.cc +++ b/tests/cgal/cgal_surface_triangulation_02.cc @@ -17,12 +17,13 @@ #include +#include + #include #include #include #include -#include #include diff --git a/tests/cgal/cgal_surface_triangulation_03.cc b/tests/cgal/cgal_surface_triangulation_03.cc index 5eb1bc3408..1db6a172c3 100644 --- a/tests/cgal/cgal_surface_triangulation_03.cc +++ b/tests/cgal/cgal_surface_triangulation_03.cc @@ -17,12 +17,13 @@ #include +#include + #include #include #include #include -#include #include diff --git a/tests/cgal/cgal_triangulation_01.cc b/tests/cgal/cgal_triangulation_01.cc index 9cbc1920e2..6ea630588d 100644 --- a/tests/cgal/cgal_triangulation_01.cc +++ b/tests/cgal/cgal_triangulation_01.cc @@ -16,12 +16,13 @@ #include +#include + #include #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_triangulation_02.cc b/tests/cgal/cgal_triangulation_02.cc index a7f2cad438..f5554da92d 100644 --- a/tests/cgal/cgal_triangulation_02.cc +++ b/tests/cgal/cgal_triangulation_02.cc @@ -16,12 +16,13 @@ #include +#include + #include #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_triangulation_03.cc b/tests/cgal/cgal_triangulation_03.cc index fddb83bf0e..6b7902f9c6 100644 --- a/tests/cgal/cgal_triangulation_03.cc +++ b/tests/cgal/cgal_triangulation_03.cc @@ -16,13 +16,14 @@ #include +#include + #include #include #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_triangulation_04.cc b/tests/cgal/cgal_triangulation_04.cc index 67a511886d..52e272a592 100644 --- a/tests/cgal/cgal_triangulation_04.cc +++ b/tests/cgal/cgal_triangulation_04.cc @@ -16,13 +16,14 @@ #include +#include + #include #include #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_triangulation_05.cc b/tests/cgal/cgal_triangulation_05.cc index ca8583223d..c0dbc8ddba 100644 --- a/tests/cgal/cgal_triangulation_05.cc +++ b/tests/cgal/cgal_triangulation_05.cc @@ -20,6 +20,8 @@ #include +#include + #include #include #include @@ -27,7 +29,6 @@ #include #include #include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_triangulation_06.cc b/tests/cgal/cgal_triangulation_06.cc index 63564f8b48..c5bff5de9d 100644 --- a/tests/cgal/cgal_triangulation_06.cc +++ b/tests/cgal/cgal_triangulation_06.cc @@ -17,14 +17,15 @@ #include +#include +#include +#include + #include #include #include #include -#include -#include -#include #include "../tests.h" diff --git a/tests/cgal/cgal_triangulation_07.cc b/tests/cgal/cgal_triangulation_07.cc index c3f01efec6..78e68bc1e1 100644 --- a/tests/cgal/cgal_triangulation_07.cc +++ b/tests/cgal/cgal_triangulation_07.cc @@ -16,13 +16,13 @@ #include +#include + #include #include #include #include -#include - #include "../tests.h" using namespace CGALWrappers; -- 2.39.5