diff --git a/.gitsuper b/.gitsuper
index 37a7655ea734a93a0fe528a30158d02e0f9e718b..4a610d1809ca59012ce6236c975026fed1d7dd47 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -16,7 +16,7 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
+3f396a59b80174a990fcbf19cd08d52e7156e603 dune-xt-common (heads/master)
+09c52571e22adcb29ff5370d5c482521f139cb5c dune-xt-data (heads/compatible_with_2.6_clang-formatted)
+08a67a827a02a83463691370d5d1a186a18dd43b dune-xt-functions (heads/clang_format_6)
- +664e6fff6abfefdfe9671e52bcb70a8b74cd2390 dune-xt-grid (heads/clang_format_6)
+ +01504450f0448e176e7faa39de37f25a557ebb4e dune-xt-grid (heads/clang_format_6)
+a7b535e1289c88579c4d7e0a0b24af5415e6ba23 dune-xt-la (heads/master)
09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (remotes/origin/HEAD)
commit = a211a5c7ba4c103fc0da57add321c5bdef7b07b5
@@ -103,8 +103,8 @@ commit = 08a67a827a02a83463691370d5d1a186a18dd43b
[submodule.dune-xt-grid]
remote = git@github.com:dune-community/dune-xt-grid.git
-status = +c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 664e6fff6abfefdfe9671e52bcb70a8b74cd2390
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+commit = 01504450f0448e176e7faa39de37f25a557ebb4e
[submodule.dune-xt-la]
remote = git@github.com:dune-community/dune-xt-la.git
diff --git a/dune/xt/grid/boundaryinfo/alldirichlet.hh b/dune/xt/grid/boundaryinfo/alldirichlet.hh
index ec556ec35bdea0ccb5875626f99fc89c57f1a0f4..3aa2df29e17ec8e92183b2228135c8b0a5673c64 100644
--- a/dune/xt/grid/boundaryinfo/alldirichlet.hh
+++ b/dune/xt/grid/boundaryinfo/alldirichlet.hh
@@ -31,8 +31,8 @@ static inline Common::Configuration alldirichlet_boundaryinfo_default_config()
// We do not want to add a virtual destructor (to be able to use this as constexpr),
// so just silence the warning.
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
template <class IntersectionImp>
class AllDirichletBoundaryInfo : public BoundaryInfo<IntersectionImp>
@@ -59,7 +59,7 @@ protected:
static constexpr DirichletBoundary dirichlet_boundary_{};
}; // class AllDirichletBoundaryInfo
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
#endif
template <class I>
diff --git a/dune/xt/grid/boundaryinfo/allneumann.hh b/dune/xt/grid/boundaryinfo/allneumann.hh
index 5c2ace528d691711ae61fe2dd23c12e8290e94d1..776b08977ea8498cc06ce5ce2fb73c32df8c3f3e 100644
--- a/dune/xt/grid/boundaryinfo/allneumann.hh
+++ b/dune/xt/grid/boundaryinfo/allneumann.hh
@@ -31,8 +31,8 @@ static inline Common::Configuration allneumann_boundaryinfo_default_config()
// We do not want to add a virtual destructor (to be able to use this as constexpr),
// so just silence the warning.
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
template <class IntersectionImp>
class AllNeumannBoundaryInfo : public BoundaryInfo<IntersectionImp>
@@ -59,7 +59,7 @@ protected:
static constexpr NeumannBoundary neumann_boundary_{};
}; // class AllNeumannBoundaryInfo
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
#endif
template <class I>
diff --git a/dune/xt/grid/boundaryinfo/allreflecting.hh b/dune/xt/grid/boundaryinfo/allreflecting.hh
index 61cbab711099e9f8adc87fa2582a2172bd8e61ce..5d1c044bd2e37405f54ffe0c9917cda0a68a242f 100644
--- a/dune/xt/grid/boundaryinfo/allreflecting.hh
+++ b/dune/xt/grid/boundaryinfo/allreflecting.hh
@@ -31,8 +31,8 @@ static inline Common::Configuration allreflecting_boundaryinfo_default_config()
// We do not want to add a virtual destructor (to be able to use this as constexpr),
// so just silence the warning.
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
template <class IntersectionImp>
class AllReflectingBoundaryInfo : public BoundaryInfo<IntersectionImp>
@@ -59,7 +59,7 @@ protected:
static constexpr ReflectingBoundary reflecting_boundary_{};
}; // class AllReflectingBoundaryInfo
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
#endif
template <class I>
diff --git a/dune/xt/grid/boundaryinfo/boundarysegment.hh b/dune/xt/grid/boundaryinfo/boundarysegment.hh
index 3a277f7b72afff6508d68339a281c8c918277e83..2ae36e58f237c52646fab9fa1224dd9aaea62a8f 100644
--- a/dune/xt/grid/boundaryinfo/boundarysegment.hh
+++ b/dune/xt/grid/boundaryinfo/boundarysegment.hh
@@ -36,8 +36,8 @@ static inline Common::Configuration boundarysegment_boundaryinfo_default_config(
// We do not want to add a virtual destructor (to be able to use this as constexpr),
// so just silence the warning.
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
template <class IntersectionImp>
class BoundarySegmentIndexBasedBoundaryInfo : public BoundaryInfo<IntersectionImp>
@@ -116,7 +116,7 @@ private:
static constexpr UnknownBoundary unknown_boundary_{};
}; // class BoundarySegmentIndexBasedBoundaryInfo
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
#endif
diff --git a/dune/xt/grid/boundaryinfo/interfaces.hh b/dune/xt/grid/boundaryinfo/interfaces.hh
index 08f27c01ae718a84f999d550cd3cc9eba5539990..87d15ddf22a5fc8199aee573639216962a83c1b9 100644
--- a/dune/xt/grid/boundaryinfo/interfaces.hh
+++ b/dune/xt/grid/boundaryinfo/interfaces.hh
@@ -24,8 +24,8 @@ namespace Grid {
// We do not want to add a virtual destructor (to be able to use this as constexpr), so just silence the warning.
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
@@ -79,7 +79,7 @@ public:
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
#endif
} // namespace Grid
diff --git a/dune/xt/grid/boundaryinfo/normalbased.hh b/dune/xt/grid/boundaryinfo/normalbased.hh
index cda06d51f1ae7e3a2abb6fbd1560d0f6637af9f3..d6e4e4eb4cdd4d6424e9ab496bfd20daf05e8c9c 100644
--- a/dune/xt/grid/boundaryinfo/normalbased.hh
+++ b/dune/xt/grid/boundaryinfo/normalbased.hh
@@ -42,8 +42,8 @@ static inline Common::Configuration normalbased_boundaryinfo_default_config()
// We do not want to add a virtual destructor (to be able to use this as constexpr),
// so just silence the warning.
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
/**
@@ -179,7 +179,7 @@ private:
std::unordered_map<WorldType, std::shared_ptr<BoundaryType>> normal_to_type_map_;
}; // class NormalBasedBoundaryInfo
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
#endif
diff --git a/dune/xt/grid/boundaryinfo/types.hh b/dune/xt/grid/boundaryinfo/types.hh
index 340fef559bd7ae4de1440c5fdf187495ad7c44e8..f5959bbefce91e522ae8dbe35a8db40a3c3ea767 100644
--- a/dune/xt/grid/boundaryinfo/types.hh
+++ b/dune/xt/grid/boundaryinfo/types.hh
@@ -21,8 +21,8 @@ namespace Grid {
// We do not want to add a virtual destructor (to be able to use this as constexpr), so just silence the warning.
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
@@ -192,7 +192,7 @@ public:
#if (defined(BOOST_CLANG) && BOOST_CLANG) || (defined(BOOST_GCC) && BOOST_GCC)
-#pragma GCC diagnostic pop
+# pragma GCC diagnostic pop
#endif
diff --git a/dune/xt/grid/dd/glued.hh b/dune/xt/grid/dd/glued.hh
index 2f363b872332fd8e5a93d88c2a81423995f9662d..f7dd4ad524ea9e34fe4eed5e4378dc5833b9f744 100644
--- a/dune/xt/grid/dd/glued.hh
+++ b/dune/xt/grid/dd/glued.hh
@@ -22,10 +22,10 @@
#include <dune/grid/common/rangegenerators.hh>
#if HAVE_DUNE_GRID_GLUE
-#include <dune/grid-glue/extractors/codim1extractor.hh>
-#include <dune/grid-glue/extractors/extractorpredicate.hh>
-#include <dune/grid-glue/gridglue.hh>
-#include <dune/grid-glue/merging/contactmerge.hh>
+# include <dune/grid-glue/extractors/codim1extractor.hh>
+# include <dune/grid-glue/extractors/extractorpredicate.hh>
+# include <dune/grid-glue/gridglue.hh>
+# include <dune/grid-glue/merging/contactmerge.hh>
#endif // HAVE_DUNE_GRID_GLUE
#include <dune/xt/common/exceptions.hh>
@@ -122,7 +122,7 @@ class Glued
static const bool value = true;
};
-#if HAVE_DUNE_ALUGRID
+# if HAVE_DUNE_ALUGRID
template <class Comm, bool anything>
struct allowed_local_grid<ALUGrid<3, 3, simplex, conforming, Comm>, anything>
{
@@ -134,9 +134,9 @@ class Glued
{
static const bool value = false;
};
-#endif // HAVE_DUNE_ALUGRID
+# endif // HAVE_DUNE_ALUGRID
-#if HAVE_MPI && (HAVE_DUNE_UGGRID || HAVE_UG)
+# if HAVE_MPI && (HAVE_DUNE_UGGRID || HAVE_UG)
// UGGrid does not support multiple parallel instances in parallel and we have no means yet to create multiple
// sequential grids once MPI was found.
template <bool anything>
@@ -150,7 +150,7 @@ class Glued
{
static const bool value = false;
};
-#endif
+# endif
static_assert(allowed_macro_grid<MacroGridImp>::value,
"This macro grid is known to fail, enable on your onw risk by disabling this check!");
@@ -194,11 +194,11 @@ private:
virtual bool contains(const LocalEntityType& element, unsigned int face) const override final
{
const auto local_intersection_ptr = element.template subEntity<1>(face);
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
+# if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
const auto& local_intersection = local_intersection_ptr;
-#else
+# else
const auto& local_intersection = *local_intersection_ptr;
-#endif
+# endif
const auto& local_intersection_geometry = local_intersection.geometry();
// Check if all corners of the local intersection lie within the macro intersection.
for (auto ii : XT::Common::value_range(local_intersection_geometry.corners()))
@@ -447,11 +447,11 @@ public:
const auto& macro_intersection = *macro_intersection_it;
if (macro_intersection.neighbor() && !macro_intersection.boundary()) {
const auto real_neighbor_ptr = macro_intersection.outside();
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
+# if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
const auto& real_neighbor = real_neighbor_ptr;
-#else
+# else
const auto& real_neighbor = *real_neighbor_ptr;
-#endif
+# endif
if (macro_index_set.index(real_neighbor) == neighbor_index)
glues_for_this_entity_neighbor[local_entity_grid_level][local_neighbor_grid_level] =
create_glue(macro_entity,
@@ -624,11 +624,11 @@ public:
for (auto&& macro_intersection : intersections(macro_leaf_view_, macro_entity)) {
if (!macro_intersection.boundary() && macro_intersection.neighbor()) {
const auto macro_neighbor_ptr = macro_intersection.outside();
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
+# if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
const auto& macro_neighbor = macro_neighbor_ptr;
-#else
+# else
const auto& macro_neighbor = *macro_neighbor_ptr;
-#endif
+# endif
const size_t macro_neighbor_index = macro_leaf_view_.indexSet().index(macro_neighbor);
const auto local_neighbor_level = max_local_level(macro_neighbor);
const auto local_neighbor_grid_view =
@@ -822,11 +822,11 @@ private:
const auto& macro_intersection = *macro_intersection_it;
if (macro_intersection.neighbor() && !macro_intersection.boundary()) {
const auto macro_neighbor_ptr = macro_intersection.outside();
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
+# if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
const auto& macro_neighbor = macro_neighbor_ptr;
-#else
+# else
const auto& macro_neighbor = *macro_neighbor_ptr;
-#endif
+# endif
const auto macro_neighbor_index = macro_index_set.index(macro_neighbor);
for (auto local_entity_level :
XT::Common::value_range(local_grids_[macro_entity_index]->grid().maxLevel() + 1))
@@ -872,23 +872,23 @@ private:
for (auto&& micro_entity : elements(local_leaf_view)) {
const size_t micro_index = local_index_set.index(micro_entity);
const auto num_vertices = micro_entity.
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
+# if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
subEntities(dimDomain);
-#else
+# else
template count<dimDomain>();
-#endif
+# endif
entity_to_vertex_ids[macro_index][micro_index] = std::vector<unsigned int>(num_vertices);
geometry_types[macro_index][micro_index] = micro_entity.geometry().type();
for (unsigned int local_vertex_id = 0; local_vertex_id < num_vertices; ++local_vertex_id) {
const unsigned int global_vertex_id = find_insert_vertex(vertices,
micro_entity
.template subEntity<dimDomain>(local_vertex_id)
-#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
+# if DUNE_VERSION_NEWER(DUNE_GRID, 2, 4)
.
-#else
+# else
->
-#endif
+# endif
geometry()
.center());
entity_to_vertex_ids[macro_index][micro_index][local_vertex_id] = global_vertex_id;
diff --git a/dune/xt/grid/functors/bounding-box.hh b/dune/xt/grid/functors/bounding-box.hh
index 85a1f3a7d97aaac0e46489dbcaf291402f4d2c53..ce67df74388c3a0853b21c2848525304fdc24bac 100644
--- a/dune/xt/grid/functors/bounding-box.hh
+++ b/dune/xt/grid/functors/bounding-box.hh
@@ -58,7 +58,7 @@ struct MinMaxCoordinateFunctor : public ElementFunctor<GridViewType>
} // namespace Grid
-} // namespace Stud
+} // namespace XT
} // namespace Dune
#endif // DUNE_XT_GRID_FUNCTORS_BOUNDING_BOX_HH
diff --git a/dune/xt/grid/functors/refinement.hh b/dune/xt/grid/functors/refinement.hh
index 06b111e580936d517fc4dfb48e102b712aba17a5..9f3919d6eb4a5378fa1ede2cf3f9b482ee3c73e5 100644
--- a/dune/xt/grid/functors/refinement.hh
+++ b/dune/xt/grid/functors/refinement.hh
@@ -74,7 +74,7 @@ void enforce_maximum_entity_volume(GridType& grid, const double size_factor)
} // namespace Grid
-} // namespace Stud
+} // namespace XT
} // namespace Dune
#endif // DUNE_XT_GRID_FUNCTORS_REFINEMENT_HH
diff --git a/dune/xt/grid/gridprovider/cube.lib.hh b/dune/xt/grid/gridprovider/cube.lib.hh
index c369d3299155b965c7672f6ceb50d8890c436ab7..e7b042da20ade39683cc87db76433d038f6b12fb 100644
--- a/dune/xt/grid/gridprovider/cube.lib.hh
+++ b/dune/xt/grid/gridprovider/cube.lib.hh
@@ -16,38 +16,38 @@
#if DUNE_XT_WITH_PYTHON_BINDINGS
-#define _DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS_DD_SUBDOMAINS_GRID(_prefix, _GRID) \
- _prefix Dune::XT::Grid::GridProvider<_GRID, Dune::XT::Grid::DD::SubdomainGrid<_GRID>> \
- Dune::XT::Grid::make_cube_dd_subdomains_grid<_GRID>( \
- const Dune::FieldVector<typename _GRID::ctype, _GRID::dimension>&, \
- const Dune::FieldVector<typename _GRID::ctype, _GRID::dimension>&, \
- const std::array<unsigned int, _GRID::dimension>, \
- const unsigned int, \
- const std::array<unsigned int, _GRID::dimension>, \
- const std::array<unsigned int, _GRID::dimension>, \
- const size_t, \
- const size_t)
-
-
-#define DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS(_prefix, _GRID) \
- _DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS_DD_SUBDOMAINS_GRID(_prefix, _GRID); \
- _prefix Dune::XT::Grid::GridProvider<_GRID> Dune::XT::Grid::make_cube_grid<_GRID>( \
- const FieldVector<typename _GRID::ctype, _GRID::dimension>&, \
- const Dune::FieldVector<typename _GRID::ctype, _GRID::dimension>&, \
- const std::array<unsigned int, _GRID::dimension>, \
- const unsigned int, \
- const std::array<unsigned int, _GRID::dimension>); \
- _prefix Dune::XT::Grid::GridProvider<_GRID> Dune::XT::Grid::make_cube_grid<_GRID>(const typename _GRID::ctype&, \
- const typename _GRID::ctype&, \
- const unsigned int, \
- const unsigned int, \
- const unsigned int); \
- _prefix Dune::XT::Grid::GridProvider<_GRID> Dune::XT::Grid::make_cube_grid<_GRID>( \
- const Dune::XT::Common::Configuration&)
-
-#if HAVE_DUNE_ALUGRID
+# define _DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS_DD_SUBDOMAINS_GRID(_prefix, _GRID) \
+ _prefix Dune::XT::Grid::GridProvider<_GRID, Dune::XT::Grid::DD::SubdomainGrid<_GRID>> \
+ Dune::XT::Grid::make_cube_dd_subdomains_grid<_GRID>( \
+ const Dune::FieldVector<typename _GRID::ctype, _GRID::dimension>&, \
+ const Dune::FieldVector<typename _GRID::ctype, _GRID::dimension>&, \
+ const std::array<unsigned int, _GRID::dimension>, \
+ const unsigned int, \
+ const std::array<unsigned int, _GRID::dimension>, \
+ const std::array<unsigned int, _GRID::dimension>, \
+ const size_t, \
+ const size_t)
+
+
+# define DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS(_prefix, _GRID) \
+ _DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS_DD_SUBDOMAINS_GRID(_prefix, _GRID); \
+ _prefix Dune::XT::Grid::GridProvider<_GRID> Dune::XT::Grid::make_cube_grid<_GRID>( \
+ const FieldVector<typename _GRID::ctype, _GRID::dimension>&, \
+ const Dune::FieldVector<typename _GRID::ctype, _GRID::dimension>&, \
+ const std::array<unsigned int, _GRID::dimension>, \
+ const unsigned int, \
+ const std::array<unsigned int, _GRID::dimension>); \
+ _prefix Dune::XT::Grid::GridProvider<_GRID> Dune::XT::Grid::make_cube_grid<_GRID>(const typename _GRID::ctype&, \
+ const typename _GRID::ctype&, \
+ const unsigned int, \
+ const unsigned int, \
+ const unsigned int); \
+ _prefix Dune::XT::Grid::GridProvider<_GRID> Dune::XT::Grid::make_cube_grid<_GRID>( \
+ const Dune::XT::Common::Configuration&)
+
+# if HAVE_DUNE_ALUGRID
DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS(extern template, ALU_2D_SIMPLEX_CONFORMING);
-#endif
+# endif
DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS(extern template, YASP_1D_EQUIDISTANT_OFFSET);
DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS(extern template, YASP_2D_EQUIDISTANT_OFFSET);
DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS(extern template, YASP_3D_EQUIDISTANT_OFFSET);
diff --git a/dune/xt/grid/gridprovider/cube.lib/alu_2d_simplex_conforming.cc b/dune/xt/grid/gridprovider/cube.lib/alu_2d_simplex_conforming.cc
index 2ecfe6562b231a1383707035274ca065bd5dd1f2..0a3ec7f30e39cfbf7e54fe1eef69b359a59c3846 100644
--- a/dune/xt/grid/gridprovider/cube.lib/alu_2d_simplex_conforming.cc
+++ b/dune/xt/grid/gridprovider/cube.lib/alu_2d_simplex_conforming.cc
@@ -12,7 +12,7 @@
#if HAVE_DUNE_ALUGRID
-#include "../cube.lib.hh"
+# include "../cube.lib.hh"
DUNE_XT_GRID_GRIDPROVIDER_CUBE_LIB_FACTORY_METHODS(template, ALU_2D_SIMPLEX_CONFORMING);
diff --git a/dune/xt/grid/gridprovider/dgf.hh b/dune/xt/grid/gridprovider/dgf.hh
index 57d50f5a6aabdb8d3bb3b41ba1cdabd35920af20..c5d86140a4dc69e5917d36820ac49111440753e7 100644
--- a/dune/xt/grid/gridprovider/dgf.hh
+++ b/dune/xt/grid/gridprovider/dgf.hh
@@ -19,7 +19,7 @@
#include <dune/grid/io/file/dgfparser/dgfgridfactory.hh> // How convenient that GridPtr requires DGFGridFactory but ...
#include <dune/grid/io/file/dgfparser.hh>
#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/dgf.hh>
+# include <dune/alugrid/dgf.hh>
#endif
#include <dune/grid/io/file/dgfparser/gridptr.hh> // ... does not include it!
diff --git a/dune/xt/grid/gridprovider/eoc.hh b/dune/xt/grid/gridprovider/eoc.hh
index d3f5dcd6e00d9faf3fd61658b2709ea1af416e59..7a519948ecfb831fba1d317fd23fcdb12fa3d599 100644
--- a/dune/xt/grid/gridprovider/eoc.hh
+++ b/dune/xt/grid/gridprovider/eoc.hh
@@ -13,7 +13,7 @@
#define DUNE_XT_GRID_PROVIDER_EOC_HH
#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/grid.hh>
+# include <dune/alugrid/grid.hh>
#endif
#include <dune/xt/grid/gridprovider/provider.hh>
diff --git a/dune/xt/grid/gridprovider/provider.lib.hh b/dune/xt/grid/gridprovider/provider.lib.hh
index 38f116ecab174e18364526315d6b82233b0de0a7..5eda2675806edfe62ee2d601bd6b58de71aee80f 100644
--- a/dune/xt/grid/gridprovider/provider.lib.hh
+++ b/dune/xt/grid/gridprovider/provider.lib.hh
@@ -16,38 +16,38 @@
#if DUNE_XT_WITH_PYTHON_BINDINGS
-#define _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER_DD_SUBDOMAIN(_prefix, _GRID, _type, _backend) \
- _prefix typename Dune::XT::Grid::Layer<_GRID, \
- Dune::XT::Grid::Layers::_type, \
- Dune::XT::Grid::Backends::_backend, \
- Dune::XT::Grid::DD::SubdomainGrid<_GRID>>::type \
- Dune::XT::Grid::GridProvider<_GRID, Dune::XT::Grid::DD::SubdomainGrid<_GRID>>:: \
- layer<Dune::XT::Grid::Layers::_type, Dune::XT::Grid::Backends::_backend>(const int) const
-
-#define _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER(_prefix, _GRID, _type, _backend) \
- _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER_DD_SUBDOMAIN(_prefix, _GRID, _type, _backend); \
- _prefix \
- typename Dune::XT::Grid::Layer<_GRID, Dune::XT::Grid::Layers::_type, Dune::XT::Grid::Backends::_backend>::type \
- Dune::XT::Grid::GridProvider<_GRID>::layer<Dune::XT::Grid::Layers::_type, Dune::XT::Grid::Backends::_backend>( \
- const int) const
-
-#define _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_ALL_LAYERS(_prefix, _GRID) \
- _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_PART(_prefix, _GRID); \
- _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER(_prefix, _GRID, level, view); \
- _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER(_prefix, _GRID, leaf, view); \
- _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER_DD_SUBDOMAIN(_prefix, _GRID, dd_subdomain, view);
-
-#define _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_DD_SUBDOMAIN(_prefix, _GRID) \
- _prefix class Dune::XT::Grid::GridProvider<_GRID, Dune::XT::Grid::DD::SubdomainGrid<_GRID>>
-
-#define DUNE_XT_GRID_PROVIDER_PROVIDER_LIB(_prefix, _GRID) \
- _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_DD_SUBDOMAIN(_prefix, _GRID); \
- _prefix class Dune::XT::Grid::GridProvider<_GRID>; \
- _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_ALL_LAYERS(_prefix, _GRID)
-
-#if HAVE_DUNE_ALUGRID
+# define _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER_DD_SUBDOMAIN(_prefix, _GRID, _type, _backend) \
+ _prefix typename Dune::XT::Grid::Layer<_GRID, \
+ Dune::XT::Grid::Layers::_type, \
+ Dune::XT::Grid::Backends::_backend, \
+ Dune::XT::Grid::DD::SubdomainGrid<_GRID>>::type \
+ Dune::XT::Grid::GridProvider<_GRID, Dune::XT::Grid::DD::SubdomainGrid<_GRID>>:: \
+ layer<Dune::XT::Grid::Layers::_type, Dune::XT::Grid::Backends::_backend>(const int) const
+
+# define _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER(_prefix, _GRID, _type, _backend) \
+ _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER_DD_SUBDOMAIN(_prefix, _GRID, _type, _backend); \
+ _prefix \
+ typename Dune::XT::Grid::Layer<_GRID, Dune::XT::Grid::Layers::_type, Dune::XT::Grid::Backends::_backend>::type \
+ Dune::XT::Grid::GridProvider<_GRID>::layer<Dune::XT::Grid::Layers::_type, Dune::XT::Grid::Backends::_backend>( \
+ const int) const
+
+# define _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_ALL_LAYERS(_prefix, _GRID) \
+ _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_PART(_prefix, _GRID); \
+ _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER(_prefix, _GRID, level, view); \
+ _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER(_prefix, _GRID, leaf, view); \
+ _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_LAYER_DD_SUBDOMAIN(_prefix, _GRID, dd_subdomain, view);
+
+# define _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_DD_SUBDOMAIN(_prefix, _GRID) \
+ _prefix class Dune::XT::Grid::GridProvider<_GRID, Dune::XT::Grid::DD::SubdomainGrid<_GRID>>
+
+# define DUNE_XT_GRID_PROVIDER_PROVIDER_LIB(_prefix, _GRID) \
+ _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_DD_SUBDOMAIN(_prefix, _GRID); \
+ _prefix class Dune::XT::Grid::GridProvider<_GRID>; \
+ _DUNE_XT_GRID_PROVIDER_PROVIDER_LIB_ALL_LAYERS(_prefix, _GRID)
+
+# if HAVE_DUNE_ALUGRID
DUNE_XT_GRID_PROVIDER_PROVIDER_LIB(extern template, ALU_2D_SIMPLEX_CONFORMING);
-#endif
+# endif
DUNE_XT_GRID_PROVIDER_PROVIDER_LIB(extern template, YASP_1D_EQUIDISTANT_OFFSET);
DUNE_XT_GRID_PROVIDER_PROVIDER_LIB(extern template, YASP_2D_EQUIDISTANT_OFFSET);
DUNE_XT_GRID_PROVIDER_PROVIDER_LIB(extern template, YASP_3D_EQUIDISTANT_OFFSET);
diff --git a/dune/xt/grid/gridprovider/provider.lib/alu_2d_simplex_conforming.cc b/dune/xt/grid/gridprovider/provider.lib/alu_2d_simplex_conforming.cc
index 1c8d9ed5e847470867decf301fc837f75cb8d28d..c124daeb8db8c210554cbcb77ebc80a0fad1ba8f 100644
--- a/dune/xt/grid/gridprovider/provider.lib/alu_2d_simplex_conforming.cc
+++ b/dune/xt/grid/gridprovider/provider.lib/alu_2d_simplex_conforming.cc
@@ -12,7 +12,7 @@
#if HAVE_DUNE_ALUGRID
-#include "../provider.lib.hh"
+# include "../provider.lib.hh"
DUNE_XT_GRID_PROVIDER_PROVIDER_LIB(template, ALU_2D_SIMPLEX_CONFORMING);
diff --git a/dune/xt/grid/grids.hh b/dune/xt/grid/grids.hh
index 55ddffeb1253b612fd5f4da0b11bbd4c2b16fa07..d20334d7b138b3c388062ae55cf4237942f1f4a7 100644
--- a/dune/xt/grid/grids.hh
+++ b/dune/xt/grid/grids.hh
@@ -14,22 +14,22 @@
#define DUNE_XT_GRID_GRIDS_HH
#if HAVE_ALBERTA
-#include <dune/xt/common/disable_warnings.hh>
-#include <dune/grid/albertagrid.hh>
-#include <dune/xt/common/reenable_warnings.hh>
+# include <dune/xt/common/disable_warnings.hh>
+# include <dune/grid/albertagrid.hh>
+# include <dune/xt/common/reenable_warnings.hh>
#endif
#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/grid.hh>
+# include <dune/alugrid/grid.hh>
#endif
#if HAVE_DUNE_SPGRID
-#include <dune/grid/spgrid.hh>
-#include <dune/grid/spgrid/dgfparser.hh>
+# include <dune/grid/spgrid.hh>
+# include <dune/grid/spgrid/dgfparser.hh>
#endif
#if HAVE_DUNE_UGGRID || HAVE_UG
-#include <dune/grid/uggrid.hh>
+# include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/onedgrid.hh>
diff --git a/dune/xt/grid/output/entity_visualization.hh b/dune/xt/grid/output/entity_visualization.hh
index ba0b0bb4f297caf3d92a3ad5aea5ec2d1c2ac429..89c3af6df7c8fd7c118c2d413333155cc0e22f8c 100644
--- a/dune/xt/grid/output/entity_visualization.hh
+++ b/dune/xt/grid/output/entity_visualization.hh
@@ -228,8 +228,8 @@ struct ElementVisualization
}
};
-} // namespace XT
} // namespace Grid
+} // namespace XT
} // namespace Dune
#endif // DUNE_XT_GRID_OUTPUT_ENTITY_VISUALIZATION_HH
diff --git a/dune/xt/grid/output/pgf.hh b/dune/xt/grid/output/pgf.hh
index d3b581a554f49ab082076412fa13d887ee301cff..d6c1bdf8de63f655a898fdd1075642011b79cfe0 100644
--- a/dune/xt/grid/output/pgf.hh
+++ b/dune/xt/grid/output/pgf.hh
@@ -378,8 +378,8 @@ private:
GridType& grid_;
};
-} // namespace XT
} // namespace Grid
+} // namespace XT
} // namespace Dune
#endif // DUNE_XT_GRID_OUTPUT_PGF_HH
diff --git a/dune/xt/grid/parallel/partitioning/ranged.hh b/dune/xt/grid/parallel/partitioning/ranged.hh
index 2572beb97b69a2e832c7736bf00cbbc44bf642b5..f8ef4a01d43f2bbf36a9031ff9cd0db3912d2d8d 100644
--- a/dune/xt/grid/parallel/partitioning/ranged.hh
+++ b/dune/xt/grid/parallel/partitioning/ranged.hh
@@ -14,9 +14,9 @@
#include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_GRID, 3, 9) // EXADUNE
-#include <dune/grid/utility/partitioning/ranged.hh>
+# include <dune/grid/utility/partitioning/ranged.hh>
#else
-#include <dune/xt/grid/parallel/partitioning/ranged-internal.hh>
+# include <dune/xt/grid/parallel/partitioning/ranged-internal.hh>
namespace Dune {
template <class GridView, int codim>
using RangedPartitioning = Dune::XT::Grid::RangedPartitioning<GridView, codim, All_Partition>;
diff --git a/dune/xt/grid/structuredgridfactory.hh b/dune/xt/grid/structuredgridfactory.hh
index b8594fa68393e58ea35225c16b65e202dcfe97e9..d51f13cebd03c939d7e0ffc1b64b8fd4a4685506 100644
--- a/dune/xt/grid/structuredgridfactory.hh
+++ b/dune/xt/grid/structuredgridfactory.hh
@@ -21,19 +21,19 @@
#include <dune/grid/yaspgrid.hh>
#if HAVE_DUNE_SPGRID
-#include <dune/grid/spgrid.hh>
+# include <dune/grid/spgrid.hh>
#endif
#if HAVE_ALBERTA
-#include <dune/grid/albertagrid.hh>
+# include <dune/grid/albertagrid.hh>
#endif
#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/common/structuredgridfactory.hh>
+# include <dune/alugrid/common/structuredgridfactory.hh>
#endif
#if HAVE_DUNE_UGGRID
-#include <dune/grid/uggrid.hh>
+# include <dune/grid/uggrid.hh>
#endif
#include <dune/xt/common/float_cmp.hh>
@@ -173,10 +173,10 @@ public:
{
if (Dune::MPIHelper::isFake)
return Dune::StructuredGridFactory<GridType>::createCubeGrid(lowerLeft, upperRight, elements);
-#if HAVE_MPI
+# if HAVE_MPI
if (mpi_comm == MPI_COMM_WORLD)
return Dune::StructuredGridFactory<GridType>::createCubeGrid(lowerLeft, upperRight, elements);
-#endif
+# endif
DUNE_THROW(InvalidStateException, "Alberta construction cannot handle non-world communicators");
}
@@ -188,10 +188,10 @@ public:
{
if (Dune::MPIHelper::isFake)
return Dune::StructuredGridFactory<GridType>::createSimplexGrid(lowerLeft, upperRight, elements);
-#if HAVE_MPI
+# if HAVE_MPI
if (mpi_comm == MPI_COMM_WORLD)
return Dune::StructuredGridFactory<GridType>::createSimplexGrid(lowerLeft, upperRight, elements);
-#endif
+# endif
DUNE_THROW(InvalidStateException, "UGGRid construction cannot handle non-world communicators");
}
};
@@ -222,10 +222,10 @@ public:
DXTC_LOG_INFO << "Ignoring non-default overlap for alberta cube creation";
if (Dune::MPIHelper::isFake)
return Dune::StructuredGridFactory<GridType>::createCubeGrid(lowerLeft, upperRight, elements);
-#if HAVE_MPI
+# if HAVE_MPI
if (mpi_comm == MPI_COMM_WORLD)
return Dune::StructuredGridFactory<GridType>::createCubeGrid(lowerLeft, upperRight, elements);
-#endif
+# endif
DUNE_THROW(InvalidStateException, "Alberta construction cannot handle non-world communicators");
}
@@ -237,10 +237,10 @@ public:
{
if (Dune::MPIHelper::isFake)
return Dune::StructuredGridFactory<GridType>::createSimplexGrid(lowerLeft, upperRight, elements);
-#if HAVE_MPI
+# if HAVE_MPI
if (mpi_comm == MPI_COMM_WORLD)
return Dune::StructuredGridFactory<GridType>::createSimplexGrid(lowerLeft, upperRight, elements);
-#endif
+# endif
DUNE_THROW(InvalidStateException, "Alberta construction cannot handle non-world communicators");
}
};
@@ -265,10 +265,10 @@ public:
{
if (Dune::MPIHelper::isFake)
return Dune::StructuredGridFactory<GridType>::createCubeGrid(lowerLeft, upperRight, elements);
-#if HAVE_MPI
+# if HAVE_MPI
if (mpi_comm == MPI_COMM_WORLD)
return Dune::StructuredGridFactory<GridType>::createCubeGrid(lowerLeft, upperRight, elements);
-#endif
+# endif
DUNE_THROW(InvalidStateException, "ALUgrid Cube construction cannot handle non-world communicators");
}
};
diff --git a/dune/xt/grid/test/dd_glued.hh b/dune/xt/grid/test/dd_glued.hh
index 2c7a42376af2457d29623912bdf426b81176aee0..4d0816d6f14766d3c6f71319ee4d97424696ad4d 100644
--- a/dune/xt/grid/test/dd_glued.hh
+++ b/dune/xt/grid/test/dd_glued.hh
@@ -12,18 +12,18 @@
#define DUNE_XT_GRID_TEST_DD_GLUED_HH
#if HAVE_DUNE_GRID_GLUE
-#include <map>
-#include <set>
-#include <sstream>
-#include <vector>
+# include <map>
+# include <set>
+# include <sstream>
+# include <vector>
-#include <dune/grid/common/rangegenerators.hh>
+# include <dune/grid/common/rangegenerators.hh>
-#include <dune/xt/common/memory.hh>
-#include <dune/xt/common/test/gtest/gtest.h>
-#include <dune/xt/grid/grids.hh>
-#include <dune/xt/grid/gridprovider.hh>
-#include <dune/xt/grid/dd/glued.hh>
+# include <dune/xt/common/memory.hh>
+# include <dune/xt/common/test/gtest/gtest.h>
+# include <dune/xt/grid/grids.hh>
+# include <dune/xt/grid/gridprovider.hh>
+# include <dune/xt/grid/dd/glued.hh>
template <class T>
@@ -101,7 +101,7 @@ struct GluedDdGridTest : public ::testing::Test
static const constexpr Layers type = Layers::level;
};
-#if HAVE_ALBERTA
+# if HAVE_ALBERTA
template <int d, int dw, bool anything>
struct get_local_layer<AlbertaGrid<d, dw>, anything>
@@ -109,7 +109,7 @@ struct GluedDdGridTest : public ::testing::Test
static const constexpr Layers type = Layers::leaf;
};
-#endif
+# endif
static const constexpr Layers local_layer = get_local_layer<LocalGridType>::type;
diff --git a/dune/xt/grid/test/dd_glued_2d.cc b/dune/xt/grid/test/dd_glued_2d.cc
index 3e045b711f111f2f68420d5ca7db3dee8eefd8f8..eb75c2f5d1e72ea77e413ae7742b7a0ced8a9641 100644
--- a/dune/xt/grid/test/dd_glued_2d.cc
+++ b/dune/xt/grid/test/dd_glued_2d.cc
@@ -46,7 +46,7 @@ struct ExpectedResults<YaspGrid<2, EquidistantOffsetCoordinates<double, 2>>,
}; // struct ExpectedResults<YaspGrid<2, EquidistantOffsetCoordinates<double, 2>>, YaspGrid<2,
// EquidistantOffsetCoordinates<double, 2>>, anything>
-#if HAVE_DUNE_UGGRID || HAVE_UG
+# if HAVE_DUNE_UGGRID || HAVE_UG
template <bool anything>
struct ExpectedResults<YaspGrid<2, EquidistantOffsetCoordinates<double, 2>>, UGGrid<2>, anything>
@@ -72,8 +72,8 @@ struct ExpectedResults<YaspGrid<2, EquidistantOffsetCoordinates<double, 2>>, UGG
}
}; // struct ExpectedResults<YaspGrid<2, EquidistantOffsetCoordinates<double, 2>>, UGGrid<2>, anything>
-#endif // HAVE_DUNE_UGGRID || HAVE_UG
-#if HAVE_ALBERTA
+# endif // HAVE_DUNE_UGGRID || HAVE_UG
+# if HAVE_ALBERTA
template <bool anything>
struct ExpectedResults<YaspGrid<2, EquidistantOffsetCoordinates<double, 2>>, AlbertaGrid<2, 2>, anything>
@@ -99,7 +99,7 @@ struct ExpectedResults<YaspGrid<2, EquidistantOffsetCoordinates<double, 2>>, Alb
}
}; // struct ExpectedResults<YaspGrid<2, EquidistantOffsetCoordinates<double, 2>>, AlbertaGrid<2, 2>, anything>
-#endif // HAVE_ALBERTA
+# endif // HAVE_ALBERTA
} // namespace Grid
diff --git a/dune/xt/grid/test/dd_glued_3d.cc b/dune/xt/grid/test/dd_glued_3d.cc
index 53b1ff7a25ed9422d8beabf4836e0aa2088a1865..4fca05fb122eed079df4e443f844bbe95c13e96b 100644
--- a/dune/xt/grid/test/dd_glued_3d.cc
+++ b/dune/xt/grid/test/dd_glued_3d.cc
@@ -48,7 +48,7 @@ struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>,
}; // struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>, YaspGrid<3,
// EquidistantOffsetCoordinates<double, 3>>, anything>
-#if HAVE_DUNE_ALUGRID
+# if HAVE_DUNE_ALUGRID
template <class Comm, bool anything>
struct ExpectedResults<ALUGrid<3, 3, cube, nonconforming, Comm>,
@@ -104,8 +104,8 @@ struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>,
}; // ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>, ALUGrid<3, 3, cube, nonconforming, Comm>,
// anything>
-#endif // HAVE_DUNE_ALUGRID
-#if HAVE_DUNE_UGGRID || HAVE_UG
+# endif // HAVE_DUNE_ALUGRID
+# if HAVE_DUNE_UGGRID || HAVE_UG
template <bool anything>
struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>, UGGrid<3>, anything>
@@ -132,8 +132,8 @@ struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>, UGG
}
}; // struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>, UGGrid<3>, anything>
-#endif // HAVE_DUNE_UGGRID || HAVE_UG
-#if HAVE_ALBERTA
+# endif // HAVE_DUNE_UGGRID || HAVE_UG
+# if HAVE_ALBERTA
template <bool anything>
struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>, AlbertaGrid<3, 3>, anything>
@@ -159,7 +159,7 @@ struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>, Alb
}
}; // struct ExpectedResults<YaspGrid<3, EquidistantOffsetCoordinates<double, 3>>, AlbertaGrid<3>, anything>
-#endif // HAVE_ALBERTA
+# endif // HAVE_ALBERTA
} // namespace Grid
} // namespace XT
diff --git a/dune/xt/grid/test/gmsh_gridprovider.cc b/dune/xt/grid/test/gmsh_gridprovider.cc
index dc33c385e28c7220b8a762f8925d39736f97a4d1..145b4f85a6b096c5b14265f09ebc4fe53e6ca258 100644
--- a/dune/xt/grid/test/gmsh_gridprovider.cc
+++ b/dune/xt/grid/test/gmsh_gridprovider.cc
@@ -13,7 +13,7 @@
#if HAVE_DUNE_ALUGRID
-#include "provider.hh"
+# include "provider.hh"
struct GmshGridProvider : public GridProviderBase<TESTGRIDTYPE>
diff --git a/dune/xt/grid/test/walker.cc b/dune/xt/grid/test/walker.cc
index abb943b63daee8664eda5615ba2d872f52b49814..87a9e0ff0cb6354a960c1bea43ffb737d97d223c 100644
--- a/dune/xt/grid/test/walker.cc
+++ b/dune/xt/grid/test/walker.cc
@@ -12,7 +12,7 @@
#include <dune/xt/common/test/main.hxx>
#if DUNE_VERSION_NEWER(DUNE_COMMON, 3, 9) && HAVE_TBB // EXADUNE
-#include <dune/grid/utility/partitioning/seedlist.hh>
+# include <dune/grid/utility/partitioning/seedlist.hh>
#endif
#include <dune/xt/common/logstreams.hh>
diff --git a/dune/xt/grid/walker.hh b/dune/xt/grid/walker.hh
index 1dd2c51ba5647d062e8364e4fbbcacb91472dd32..71ef98a2da24e111a92cad6f8d1641666a00cfa5 100644
--- a/dune/xt/grid/walker.hh
+++ b/dune/xt/grid/walker.hh
@@ -18,9 +18,9 @@
#include <vector>
#if HAVE_TBB
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_reduce.h>
-#include <tbb/tbb_stddef.h>
+# include <tbb/blocked_range.h>
+# include <tbb/parallel_reduce.h>
+# include <tbb/tbb_stddef.h>
#endif
#include <dune/common/unused.hh>
@@ -28,7 +28,7 @@
#include <dune/grid/common/rangegenerators.hh>
#if HAVE_TBB
-#include <dune/xt/grid/parallel/partitioning/ranged.hh>
+# include <dune/xt/grid/parallel/partitioning/ranged.hh>
#endif
#include <dune/xt/common/memory.hh>
diff --git a/dune/xt/grid/walker.lib.hh b/dune/xt/grid/walker.lib.hh
index 1940c5a1eb51a3c28f9fba0e602adaa54e322959..369e3e0c19e3b4e29292c0ef4469dc7ad8570880 100644
--- a/dune/xt/grid/walker.lib.hh
+++ b/dune/xt/grid/walker.lib.hh
@@ -19,19 +19,20 @@
#if DUNE_XT_WITH_PYTHON_BINDINGS
-#define _DUNE_XT_GRID_WALKER_LIB(_prefix, _GRID, _type, _backend) \
- _prefix class Dune::XT::Grid::Walker<typename Dune::XT::Grid::Layer<_GRID, \
- Dune::XT::Grid::Layers::_type, \
- Dune::XT::Grid::Backends::_backend, \
- Dune::XT::Grid::DD::SubdomainGrid<_GRID>>::type>
-
-#define DUNE_XT_GRID_WALKER_LIB(_prefix, _GRID) \
- _DUNE_XT_GRID_WALKER_LIB(_prefix, _GRID, level, view); \
- _DUNE_XT_GRID_WALKER_LIB(_prefix, _GRID, leaf, view)
-
-#if HAVE_DUNE_ALUGRID
+# define _DUNE_XT_GRID_WALKER_LIB(_prefix, _GRID, _type, _backend) \
+ _prefix class Dune::XT::Grid::Walker< \
+ typename Dune::XT::Grid::Layer<_GRID, \
+ Dune::XT::Grid::Layers::_type, \
+ Dune::XT::Grid::Backends::_backend, \
+ Dune::XT::Grid::DD::SubdomainGrid<_GRID>>::type>
+
+# define DUNE_XT_GRID_WALKER_LIB(_prefix, _GRID) \
+ _DUNE_XT_GRID_WALKER_LIB(_prefix, _GRID, level, view); \
+ _DUNE_XT_GRID_WALKER_LIB(_prefix, _GRID, leaf, view)
+
+# if HAVE_DUNE_ALUGRID
DUNE_XT_GRID_WALKER_LIB(extern template, ALU_2D_SIMPLEX_CONFORMING);
-#endif
+# endif
DUNE_XT_GRID_WALKER_LIB(extern template, YASP_1D_EQUIDISTANT_OFFSET);
DUNE_XT_GRID_WALKER_LIB(extern template, YASP_2D_EQUIDISTANT_OFFSET);
diff --git a/dune/xt/grid/walker.lib/alu_2d_simplex_conforming.cc b/dune/xt/grid/walker.lib/alu_2d_simplex_conforming.cc
index 42ba7d0d1cac9c687dc7180901f0fdb0a46bc3f4..8179219c4ba6711472bf8a26838fe10d672b3e72 100644
--- a/dune/xt/grid/walker.lib/alu_2d_simplex_conforming.cc
+++ b/dune/xt/grid/walker.lib/alu_2d_simplex_conforming.cc
@@ -12,7 +12,7 @@
#if HAVE_DUNE_ALUGRID
-#include "../walker.lib.hh"
+# include "../walker.lib.hh"
DUNE_XT_GRID_WALKER_LIB(template, ALU_2D_SIMPLEX_CONFORMING);
diff --git a/python/dune/xt/grid/walker/apply-on.bindings.hh b/python/dune/xt/grid/walker/apply-on.bindings.hh
index 7458c65f492fa36fa97266aec6750f0ea7a22d65..d9178425125f8476219084b0c20fdc9fa80a83a7 100644
--- a/python/dune/xt/grid/walker/apply-on.bindings.hh
+++ b/python/dune/xt/grid/walker/apply-on.bindings.hh
@@ -128,10 +128,10 @@ public:
//#endif
#if HAVE_DUNE_ALUGRID
-#define _DUNE_XT_GRID_WALKER_APPLYON_BIND_ALU(_m, _W, _w, _layer, _backend, _class_name) \
- _DUNE_XT_GRID_WALKER_APPLYON_BIND(_m, _W, _w, ALU_2D_SIMPLEX_CONFORMING, _layer, _backend, _class_name)
+# define _DUNE_XT_GRID_WALKER_APPLYON_BIND_ALU(_m, _W, _w, _layer, _backend, _class_name) \
+ _DUNE_XT_GRID_WALKER_APPLYON_BIND(_m, _W, _w, ALU_2D_SIMPLEX_CONFORMING, _layer, _backend, _class_name)
#else
-#define _DUNE_XT_GRID_WALKER_APPLYON_BIND_ALU(_m, _W, _w, _layer, _backend, _class_name)
+# define _DUNE_XT_GRID_WALKER_APPLYON_BIND_ALU(_m, _W, _w, _layer, _backend, _class_name)
#endif
/*#if HAVE_DUNE_UGGRID