From 9c2a3e716a01b3f149b95c4e2de4bac2e05bfcc2 Mon Sep 17 00:00:00 2001
From: yue <tkdxwb@gmail.com>
Date: Thu, 1 Oct 2020 16:15:11 +0200
Subject: [PATCH] [cleanup] Remove clutter after header guards
---
bin/util/remove_clutter_after_last_endif.py | 2 +-
dumux/adaptive/adapt.hh | 2 +-
dumux/adaptive/griddatatransfer.hh | 2 +-
dumux/adaptive/markelements.hh | 2 +-
dumux/assembly/staggeredlocalresidual.hh | 2 +-
dumux/common/dimensionlessnumbers.hh | 2 +-
dumux/common/doubleexpintegrationconstants.hh | 2 +-
dumux/common/indextraits.hh | 2 +-
dumux/common/properties.hh | 2 +-
dumux/common/reorderingdofmapper.hh | 2 +-
dumux/common/valgrind.hh | 2 +-
dumux/discretization/functionspacebasis.hh | 2 +-
dumux/discretization/projection/projector.hh | 2 +-
dumux/discretization/staggered/freeflow/connectivitymap.hh | 2 +-
dumux/flux/traits.hh | 2 +-
dumux/freeflow/compositional/kepsilonncmodel.hh | 2 +-
dumux/freeflow/compositional/komegancmodel.hh | 2 +-
dumux/freeflow/compositional/lowrekepsilonncmodel.hh | 2 +-
dumux/freeflow/compositional/navierstokesncmodel.hh | 2 +-
dumux/freeflow/compositional/oneeqncmodel.hh | 2 +-
dumux/freeflow/compositional/zeroeqncmodel.hh | 2 +-
dumux/freeflow/navierstokes/localresidual.hh | 2 +-
dumux/freeflow/navierstokes/model.hh | 2 +-
dumux/freeflow/navierstokes/staggered/fluxvariables.hh | 2 +-
dumux/freeflow/navierstokes/staggered/localresidual.hh | 2 +-
dumux/freeflow/navierstokes/staggered/velocitygradients.hh | 2 +-
dumux/freeflow/navierstokes/volumevariables.hh | 2 +-
dumux/freeflow/nonisothermal/indices.hh | 2 +-
dumux/freeflow/rans/model.hh | 2 +-
dumux/freeflow/rans/oneeq/model.hh | 2 +-
dumux/freeflow/rans/twoeq/kepsilon/model.hh | 2 +-
dumux/freeflow/rans/twoeq/komega/model.hh | 2 +-
dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh | 2 +-
dumux/freeflow/rans/zeroeq/model.hh | 2 +-
dumux/freeflow/rans/zeroeq/volumevariables.hh | 2 +-
dumux/freeflow/shallowwater/localresidual.hh | 2 +-
dumux/freeflow/shallowwater/model.hh | 2 +-
dumux/freeflow/staggeredupwindmethods.hh | 2 +-
dumux/freeflow/turbulenceproperties.hh | 2 +-
dumux/freeflow/volumevariables.hh | 2 +-
dumux/geometry/makegeometry.hh | 2 +-
dumux/io/gnuplotinterface.hh | 2 +-
dumux/io/ploteffectivediffusivitymodel.hh | 2 +-
dumux/io/plotmateriallaw.hh | 2 +-
dumux/io/plotmateriallaw3p.hh | 2 +-
dumux/io/plotthermalconductivitymodel.hh | 2 +-
dumux/io/rasterimagereader.hh | 2 +-
dumux/linear/amgbackend.hh | 2 +-
dumux/linear/istlsolverfactorybackend.hh | 2 +-
dumux/linear/istlsolverregistry.hh | 2 +-
dumux/linear/linearsolverparameters.hh | 2 +-
dumux/linear/linearsolvertraits.hh | 2 +-
dumux/linear/parallelhelpers.hh | 2 +-
dumux/linear/preconditioners.hh | 2 +-
dumux/linear/scotchbackend.hh | 2 +-
dumux/material/binarycoefficients/henryiapws.hh | 2 +-
dumux/material/components/constant.hh | 2 +-
dumux/material/fluidmatrixinteractions/2p/brookscorey.hh | 2 +-
.../fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh | 2 +-
.../fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh | 2 +-
.../fluidmatrixinteractions/diffusivityconstanttortuosity.hh | 2 +-
.../fluidmatrixinteractions/frictionlaws/frictionlaw.hh | 2 +-
dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh | 2 +-
.../material/fluidmatrixinteractions/frictionlaws/nikuradse.hh | 2 +-
dumux/material/spatialparams/fvnonequilibrium.hh | 2 +-
dumux/multidomain/boundary/stokesdarcy/couplingdata.hh | 2 +-
dumux/multidomain/facet/box/couplingmapper.hh | 2 +-
dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh | 2 +-
dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh | 2 +-
dumux/multidomain/facet/couplingmapper.hh | 2 +-
dumux/multidomain/facet/couplingmapperbase.hh | 2 +-
dumux/multidomain/facet/gmshreader.hh | 2 +-
dumux/multidomain/facet/gridmanager.hh | 2 +-
dumux/parallel/vectorcommdatahandle.hh | 2 +-
dumux/porousmediumflow/2p/gridadaptindicator.hh | 2 +-
dumux/porousmediumflow/2p/griddatatransfer.hh | 2 +-
dumux/porousmediumflow/2p1c/darcyslaw.hh | 2 +-
dumux/porousmediumflow/2p1c/model.hh | 2 +-
dumux/porousmediumflow/nonequilibrium/newtonsolver.hh | 2 +-
dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh | 2 +-
dumux/porousmediumflow/sequential/gridadapt.hh | 2 +-
test/freeflow/navierstokes/sincos/problem.hh | 2 +-
test/io/gridmanager/gmshboundaryflagtest.hh | 2 +-
test/material/fluidsystems/checkfluidsystem.hh | 2 +-
test/material/solidsystems/checksolidsystem.hh | 2 +-
.../1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh | 2 +-
.../1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh | 2 +-
.../multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh | 2 +-
.../boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh | 2 +-
.../multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh | 2 +-
.../boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh | 2 +-
.../multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh | 2 +-
.../boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh | 2 +-
.../boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh | 2 +-
.../stokesdarcy/1p_1p/convergencetest/problem_stokes.hh | 2 +-
.../boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh | 2 +-
.../boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh | 2 +-
test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh | 2 +-
test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh | 2 +-
test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh | 2 +-
test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh | 2 +-
.../1p/implicit/convergence/analyticsolution/spatialparams.hh | 2 +-
.../1p/implicit/nonisothermal/problem_conduction.hh | 2 +-
.../1p/implicit/nonisothermal/problem_convection.hh | 2 +-
.../porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh | 2 +-
test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh | 2 +-
.../2p2c/sequential/test_adaptive2p2c3dproblem.hh | 2 +-
test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh | 2 +-
.../implicit/thermalnonequilibrium/combustionlocalresidual.hh | 2 +-
.../mpnc/implicit/thermalnonequilibrium/spatialparams.hh | 2 +-
.../richards/implicit/nonisothermal/conduction/problem.hh | 2 +-
.../richards/implicit/nonisothermal/convection/problem.hh | 2 +-
112 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/bin/util/remove_clutter_after_last_endif.py b/bin/util/remove_clutter_after_last_endif.py
index 8cbdd81e65..afeeed8fec 100644
--- a/bin/util/remove_clutter_after_last_endif.py
+++ b/bin/util/remove_clutter_after_last_endif.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
import os
# replace everything after last #endif with new line
diff --git a/dumux/adaptive/adapt.hh b/dumux/adaptive/adapt.hh
index ce28cb3a20..b5cc28e80f 100644
--- a/dumux/adaptive/adapt.hh
+++ b/dumux/adaptive/adapt.hh
@@ -60,4 +60,4 @@ bool adapt(Grid& grid, GridDataTransfer& dataTransfer)
} // end namespace Dumux
-#endif /* DUMUX_ADAPTIVE_ADAPT_HH */
+#endif
diff --git a/dumux/adaptive/griddatatransfer.hh b/dumux/adaptive/griddatatransfer.hh
index b14ae2b314..043b3686f4 100644
--- a/dumux/adaptive/griddatatransfer.hh
+++ b/dumux/adaptive/griddatatransfer.hh
@@ -45,4 +45,4 @@ public:
} // end namespace Dumux
-#endif /* DUMUX_ADAPTIVE_GRIDDATATRANSFER_HH */
+#endif
diff --git a/dumux/adaptive/markelements.hh b/dumux/adaptive/markelements.hh
index 195d74656d..a33b417aee 100644
--- a/dumux/adaptive/markelements.hh
+++ b/dumux/adaptive/markelements.hh
@@ -71,4 +71,4 @@ bool markElements(Grid& grid, const Indicator& indicator, bool verbose = true)
} //end namespace Dumux
-#endif /* DUMUX_ADAPTIVE_MARKELEMENTS_HH */
+#endif
diff --git a/dumux/assembly/staggeredlocalresidual.hh b/dumux/assembly/staggeredlocalresidual.hh
index 0ee69271b9..927f01d144 100644
--- a/dumux/assembly/staggeredlocalresidual.hh
+++ b/dumux/assembly/staggeredlocalresidual.hh
@@ -335,4 +335,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_CC_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/common/dimensionlessnumbers.hh b/dumux/common/dimensionlessnumbers.hh
index f61b11a6ad..b13b71f814 100644
--- a/dumux/common/dimensionlessnumbers.hh
+++ b/dumux/common/dimensionlessnumbers.hh
@@ -300,4 +300,4 @@ static Scalar thermalDiffusivity(const Scalar & thermalConductivity ,
} // end namespace Dumux
-#endif // DIMENSIONLESS_NUMBERS_HH
+#endif
diff --git a/dumux/common/doubleexpintegrationconstants.hh b/dumux/common/doubleexpintegrationconstants.hh
index be4b5f8f58..eb969e4845 100644
--- a/dumux/common/doubleexpintegrationconstants.hh
+++ b/dumux/common/doubleexpintegrationconstants.hh
@@ -499,4 +499,4 @@ constexpr double doubleExponentialIntegrationWeights[] =
} // end namespace Dumux
-#endif // include guard
+#endif
diff --git a/dumux/common/indextraits.hh b/dumux/common/indextraits.hh
index 604a1d3f6e..dedb1214b5 100644
--- a/dumux/common/indextraits.hh
+++ b/dumux/common/indextraits.hh
@@ -43,4 +43,4 @@ struct IndexTraits
} // namespace Dumux
-#endif // DUMUX_COMMON_INDEX_TRAITS_HH
+#endif
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 90f7b1ff16..764efe8946 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -292,4 +292,4 @@ struct TimeManager { using type = UndefinedProperty; };
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_PROPERTIES_HH
+#endif
diff --git a/dumux/common/reorderingdofmapper.hh b/dumux/common/reorderingdofmapper.hh
index f8454f0124..ff4c87a523 100644
--- a/dumux/common/reorderingdofmapper.hh
+++ b/dumux/common/reorderingdofmapper.hh
@@ -192,4 +192,4 @@ using ReorderingDofMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
} // end namespace Dumux
#endif // HAVE_PTSCOTCH
-#endif // DUMUX_COMMON_REORDERING_DOF_MAPPER_HH
+#endif
diff --git a/dumux/common/valgrind.hh b/dumux/common/valgrind.hh
index d10ac3a796..9a1d2ee1b0 100644
--- a/dumux/common/valgrind.hh
+++ b/dumux/common/valgrind.hh
@@ -167,4 +167,4 @@ inline void SetNoAccess(const T *value, int n)
#endif // HAVE_VALGRIND
-#endif // DUMUX_VALGRIND_HH
+#endif
diff --git a/dumux/discretization/functionspacebasis.hh b/dumux/discretization/functionspacebasis.hh
index ec371baecf..dc7cad7fb9 100644
--- a/dumux/discretization/functionspacebasis.hh
+++ b/dumux/discretization/functionspacebasis.hh
@@ -91,4 +91,4 @@ struct FunctionSpaceBasisTraits<GridGeometry, DiscretizationMethod::fem>
} // end namespace Dumux
#endif // HAVE_DUNE_FUNCTIONS
-#endif // DUMUX_FUNCTION_SPACE_BASIS_HH
+#endif
diff --git a/dumux/discretization/projection/projector.hh b/dumux/discretization/projection/projector.hh
index 6125cd66a0..74d878244a 100644
--- a/dumux/discretization/projection/projector.hh
+++ b/dumux/discretization/projection/projector.hh
@@ -683,4 +683,4 @@ auto makeProjectionMatrices(const FEBasisDomain& feBasisDomain,
} // end namespace Dumux
-#endif // DUMUX_PROJECTOR_HH
+#endif
diff --git a/dumux/discretization/staggered/freeflow/connectivitymap.hh b/dumux/discretization/staggered/freeflow/connectivitymap.hh
index c9a06874f9..648462b8bb 100644
--- a/dumux/discretization/staggered/freeflow/connectivitymap.hh
+++ b/dumux/discretization/staggered/freeflow/connectivitymap.hh
@@ -194,4 +194,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_STAGGERED_FREEFLOW_CONNECTIVITY_MAP_HH
+#endif
diff --git a/dumux/flux/traits.hh b/dumux/flux/traits.hh
index 831a0a2527..3d1948d7cb 100644
--- a/dumux/flux/traits.hh
+++ b/dumux/flux/traits.hh
@@ -50,4 +50,4 @@ struct FluxTraits
} // namespace Dumux
-#endif // DUMUX_FLUX_TRAITS_HH
+#endif
diff --git a/dumux/freeflow/compositional/kepsilonncmodel.hh b/dumux/freeflow/compositional/kepsilonncmodel.hh
index b66f570c88..e718f40eea 100644
--- a/dumux/freeflow/compositional/kepsilonncmodel.hh
+++ b/dumux/freeflow/compositional/kepsilonncmodel.hh
@@ -223,4 +223,4 @@ public:
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_KEPSILON_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/komegancmodel.hh b/dumux/freeflow/compositional/komegancmodel.hh
index 0aa09c71ae..1c63e37ea1 100644
--- a/dumux/freeflow/compositional/komegancmodel.hh
+++ b/dumux/freeflow/compositional/komegancmodel.hh
@@ -228,4 +228,4 @@ public:
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_KOMEGA_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/lowrekepsilonncmodel.hh b/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
index 1c78eb69a8..4997e145b2 100644
--- a/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
+++ b/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
@@ -228,4 +228,4 @@ public:
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_LOWREKEPSILON_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/navierstokesncmodel.hh b/dumux/freeflow/compositional/navierstokesncmodel.hh
index 63a26feb04..6063306a10 100644
--- a/dumux/freeflow/compositional/navierstokesncmodel.hh
+++ b/dumux/freeflow/compositional/navierstokesncmodel.hh
@@ -249,4 +249,4 @@ struct HeatConductionType<TypeTag, TTag::NavierStokesNCNI> { using type = Fourie
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_FREEFLOW_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/oneeqncmodel.hh b/dumux/freeflow/compositional/oneeqncmodel.hh
index 01a96fcb40..ef4c6cd5cc 100644
--- a/dumux/freeflow/compositional/oneeqncmodel.hh
+++ b/dumux/freeflow/compositional/oneeqncmodel.hh
@@ -228,4 +228,4 @@ public:
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_ONEEQ_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/zeroeqncmodel.hh b/dumux/freeflow/compositional/zeroeqncmodel.hh
index 8d0ee38b41..d4d0875d52 100644
--- a/dumux/freeflow/compositional/zeroeqncmodel.hh
+++ b/dumux/freeflow/compositional/zeroeqncmodel.hh
@@ -177,4 +177,4 @@ public:
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_ZEROEQ_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/localresidual.hh b/dumux/freeflow/navierstokes/localresidual.hh
index de1cf4900d..f8305acca1 100644
--- a/dumux/freeflow/navierstokes/localresidual.hh
+++ b/dumux/freeflow/navierstokes/localresidual.hh
@@ -46,4 +46,4 @@ using NavierStokesResidual = NavierStokesResidualImpl<TypeTag, GetPropType<TypeT
} // end namespace Dumux
-#endif // DUMUX_NAVIERSTOKES_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/model.hh b/dumux/freeflow/navierstokes/model.hh
index 39059a1bfe..d55348b452 100644
--- a/dumux/freeflow/navierstokes/model.hh
+++ b/dumux/freeflow/navierstokes/model.hh
@@ -236,4 +236,4 @@ struct IOFields<TypeTag, TTag::NavierStokesNI> { using type = FreeflowNonIsother
} // end namespace
-#endif // DUMUX_NAVIERSTOKES_MODEL_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index 4acfc7496a..8552a18670 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -697,4 +697,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_NAVIERSTOKES_STAGGERED_FLUXVARIABLES_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/staggered/localresidual.hh b/dumux/freeflow/navierstokes/staggered/localresidual.hh
index b797a4b64a..69d2835e7c 100644
--- a/dumux/freeflow/navierstokes/staggered/localresidual.hh
+++ b/dumux/freeflow/navierstokes/staggered/localresidual.hh
@@ -379,4 +379,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_STAGGERED_NAVIERSTOKES_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
index 932e1687ac..d3c2c3d340 100644
--- a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
+++ b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
@@ -386,4 +386,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_NAVIERSTOKES_STAGGERED_VELOCITYGRADIENTS_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/volumevariables.hh b/dumux/freeflow/navierstokes/volumevariables.hh
index 4def704e93..f651e2d5f2 100644
--- a/dumux/freeflow/navierstokes/volumevariables.hh
+++ b/dumux/freeflow/navierstokes/volumevariables.hh
@@ -161,4 +161,4 @@ protected:
} // end namespace Dumux
-#endif // DUMUX_NAVIERSTOKES_VOLUME_VARIABLES_HH
+#endif
diff --git a/dumux/freeflow/nonisothermal/indices.hh b/dumux/freeflow/nonisothermal/indices.hh
index e4286e5dab..daf27f2e83 100644
--- a/dumux/freeflow/nonisothermal/indices.hh
+++ b/dumux/freeflow/nonisothermal/indices.hh
@@ -43,4 +43,4 @@ public:
} // end namespace Dumux
-#endif // DUMUX_NAVIERSTOKES_NI_INDICES_HH
+#endif
diff --git a/dumux/freeflow/rans/model.hh b/dumux/freeflow/rans/model.hh
index b6d8159175..11e8850209 100644
--- a/dumux/freeflow/rans/model.hh
+++ b/dumux/freeflow/rans/model.hh
@@ -125,4 +125,4 @@ struct HeatConductionType<TypeTag, TTag::RANSNI> { using type = FouriersLaw<Type
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_RANS_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/oneeq/model.hh b/dumux/freeflow/rans/oneeq/model.hh
index 34bd92a79e..52eff461ac 100644
--- a/dumux/freeflow/rans/oneeq/model.hh
+++ b/dumux/freeflow/rans/oneeq/model.hh
@@ -234,4 +234,4 @@ struct IOFields<TypeTag, TTag::OneEqNI> { using type = FreeflowNonIsothermalIOFi
} // end namespace Dumux::Properties
-#endif // DUMUX_ONEEQ_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/model.hh b/dumux/freeflow/rans/twoeq/kepsilon/model.hh
index e0340dc4b1..6d87a2f9fc 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/model.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/model.hh
@@ -221,4 +221,4 @@ struct IOFields<TypeTag, TTag::KEpsilonNI> { using type = FreeflowNonIsothermalI
} // end properties
} // end namespace
-#endif // DUMUX_KEPSILON_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/twoeq/komega/model.hh b/dumux/freeflow/rans/twoeq/komega/model.hh
index 9c9e75f0ac..eb404167da 100644
--- a/dumux/freeflow/rans/twoeq/komega/model.hh
+++ b/dumux/freeflow/rans/twoeq/komega/model.hh
@@ -227,4 +227,4 @@ struct IOFields<TypeTag, TTag::KOmegaNI> { using type = FreeflowNonIsothermalIOF
} // end properties
} // end namespace
-#endif // DUMUX_KOMEGA_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
index a42cde2e73..6045d5b576 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
@@ -234,4 +234,4 @@ struct IOFields<TypeTag, TTag::LowReKEpsilonNI> { using type = FreeflowNonIsothe
} // end properties
} // end namespace
-#endif // DUMUX_LOWREKEPSILON_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/zeroeq/model.hh b/dumux/freeflow/rans/zeroeq/model.hh
index 88140ce6ae..57b92a9aba 100644
--- a/dumux/freeflow/rans/zeroeq/model.hh
+++ b/dumux/freeflow/rans/zeroeq/model.hh
@@ -146,4 +146,4 @@ public:
} // end namespace Dumux::Properties
-#endif // DUMUX_ZEROEQ_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/zeroeq/volumevariables.hh b/dumux/freeflow/rans/zeroeq/volumevariables.hh
index a0a933714e..e8b3560be8 100644
--- a/dumux/freeflow/rans/zeroeq/volumevariables.hh
+++ b/dumux/freeflow/rans/zeroeq/volumevariables.hh
@@ -160,4 +160,4 @@ protected:
} // end namespace Dumux
-#endif // DUMUX_ZEROEQ_VOLUME_VARIABLES_HH
+#endif
diff --git a/dumux/freeflow/shallowwater/localresidual.hh b/dumux/freeflow/shallowwater/localresidual.hh
index a7cb6e94e4..c186b5b064 100644
--- a/dumux/freeflow/shallowwater/localresidual.hh
+++ b/dumux/freeflow/shallowwater/localresidual.hh
@@ -103,4 +103,4 @@ public:
};
} // end namespace Dumux
-#endif // DUMUX_SHALLOW_WATER_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/freeflow/shallowwater/model.hh b/dumux/freeflow/shallowwater/model.hh
index db9b06b6a9..15094351f5 100644
--- a/dumux/freeflow/shallowwater/model.hh
+++ b/dumux/freeflow/shallowwater/model.hh
@@ -165,4 +165,4 @@ struct AdvectionType<TypeTag, TTag::ShallowWater>
} // end properties
} // end namespace Dumux
-#endif // DUMUX_FREEFLOW_SHALLOW_WATER_MODEL_HH
+#endif
diff --git a/dumux/freeflow/staggeredupwindmethods.hh b/dumux/freeflow/staggeredupwindmethods.hh
index bc1d606568..bc4a00583e 100644
--- a/dumux/freeflow/staggeredupwindmethods.hh
+++ b/dumux/freeflow/staggeredupwindmethods.hh
@@ -454,4 +454,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_UPWINDING_METHODS_HH
+#endif
diff --git a/dumux/freeflow/turbulenceproperties.hh b/dumux/freeflow/turbulenceproperties.hh
index 8d6ca770bf..b9ef8debf3 100644
--- a/dumux/freeflow/turbulenceproperties.hh
+++ b/dumux/freeflow/turbulenceproperties.hh
@@ -222,4 +222,4 @@ public:
};
} // end namespace Dumux
-#endif // DUMUX_TURBULENCE_PROPERTIES_HH
+#endif
diff --git a/dumux/freeflow/volumevariables.hh b/dumux/freeflow/volumevariables.hh
index eeeeb61f2f..c2de40c93e 100644
--- a/dumux/freeflow/volumevariables.hh
+++ b/dumux/freeflow/volumevariables.hh
@@ -228,4 +228,4 @@ public:
};
} // end namespace Dumux
-#endif // DUMUX_FREEFLOW_VOLUME_VARIABLES_HH
+#endif
diff --git a/dumux/geometry/makegeometry.hh b/dumux/geometry/makegeometry.hh
index 7148063a3d..680951b9e8 100644
--- a/dumux/geometry/makegeometry.hh
+++ b/dumux/geometry/makegeometry.hh
@@ -207,4 +207,4 @@ auto makeDuneQuadrilaterial(const std::vector<Dune::FieldVector<CoordScalar, 3>>
} // end namespace Dumux
-#endif // DUMUX_MAKE_GEOMETRY_HH
+#endif
diff --git a/dumux/io/gnuplotinterface.hh b/dumux/io/gnuplotinterface.hh
index 22950c5edd..4d52b5eaa0 100644
--- a/dumux/io/gnuplotinterface.hh
+++ b/dumux/io/gnuplotinterface.hh
@@ -444,4 +444,4 @@ private:
std::string gnuplotPath_;
};
} // end namespace Dumux
-#endif // DUMUX_GNUPLOT_INTERFACE_HH
+#endif
diff --git a/dumux/io/ploteffectivediffusivitymodel.hh b/dumux/io/ploteffectivediffusivitymodel.hh
index d283eeec0a..279938d73e 100644
--- a/dumux/io/ploteffectivediffusivitymodel.hh
+++ b/dumux/io/ploteffectivediffusivitymodel.hh
@@ -118,4 +118,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_PLOT_EFFECTIVE_DIFFUSIVITY_MODEL_HH
+#endif
diff --git a/dumux/io/plotmateriallaw.hh b/dumux/io/plotmateriallaw.hh
index 7983e2067d..92488748d5 100644
--- a/dumux/io/plotmateriallaw.hh
+++ b/dumux/io/plotmateriallaw.hh
@@ -366,4 +366,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_PLOT_FLUID_MATRIX_LAW_HH
+#endif
diff --git a/dumux/io/plotmateriallaw3p.hh b/dumux/io/plotmateriallaw3p.hh
index bd73c10f3b..7f4082a02e 100644
--- a/dumux/io/plotmateriallaw3p.hh
+++ b/dumux/io/plotmateriallaw3p.hh
@@ -309,4 +309,4 @@ private:
};
} // end of namespace Dumux
-#endif // DUMUX_PLOT_FLUID_MATRIX_LAW_HH
+#endif
diff --git a/dumux/io/plotthermalconductivitymodel.hh b/dumux/io/plotthermalconductivitymodel.hh
index c89c8b0e37..2b3342e78b 100644
--- a/dumux/io/plotthermalconductivitymodel.hh
+++ b/dumux/io/plotthermalconductivitymodel.hh
@@ -166,4 +166,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH
+#endif
diff --git a/dumux/io/rasterimagereader.hh b/dumux/io/rasterimagereader.hh
index ec4badcf3d..d3ff963332 100644
--- a/dumux/io/rasterimagereader.hh
+++ b/dumux/io/rasterimagereader.hh
@@ -493,4 +493,4 @@ private:
} // namespace Dumux
-#endif // DUMUX_RASTER_IMAGE_READER_HH
+#endif
diff --git a/dumux/linear/amgbackend.hh b/dumux/linear/amgbackend.hh
index 77572ca104..1509e06f15 100644
--- a/dumux/linear/amgbackend.hh
+++ b/dumux/linear/amgbackend.hh
@@ -229,4 +229,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_AMGBACKEND_HH
+#endif
diff --git a/dumux/linear/istlsolverfactorybackend.hh b/dumux/linear/istlsolverfactorybackend.hh
index 0d49a66147..a2865f455e 100644
--- a/dumux/linear/istlsolverfactorybackend.hh
+++ b/dumux/linear/istlsolverfactorybackend.hh
@@ -309,4 +309,4 @@ private:
} // end namespace Dumux
-#endif // header guard
+#endif
diff --git a/dumux/linear/istlsolverregistry.hh b/dumux/linear/istlsolverregistry.hh
index 2746af7d0e..a2d6f2ecb5 100644
--- a/dumux/linear/istlsolverregistry.hh
+++ b/dumux/linear/istlsolverregistry.hh
@@ -53,4 +53,4 @@ struct MultiTypeBlockMatrixDirectSolverTag {};
} // end namespace
} // end namespace Dumux
-#endif // DUMUX_LINEAR_ISTL_SOLVER_REGISTRY_HH
+#endif
diff --git a/dumux/linear/linearsolverparameters.hh b/dumux/linear/linearsolverparameters.hh
index bf33ed39e3..b222c9dc71 100644
--- a/dumux/linear/linearsolverparameters.hh
+++ b/dumux/linear/linearsolverparameters.hh
@@ -138,4 +138,4 @@ LinearSolverParameters<LinearSolverTraits>::dumuxToIstlSolverParams =
} // end namespace Dumux
-#endif // DUMUX_LINEAR_SOLVER_PARAMETERS_HH
+#endif
diff --git a/dumux/linear/linearsolvertraits.hh b/dumux/linear/linearsolvertraits.hh
index b61ba21e14..9ed580bc38 100644
--- a/dumux/linear/linearsolvertraits.hh
+++ b/dumux/linear/linearsolvertraits.hh
@@ -184,4 +184,4 @@ struct LinearSolverTraitsImpl<GridGeometry, DiscretizationMethod::staggered>
} // end namespace Dumux
-#endif // DUMUX_LINEAR_SOLVER_TRAITS_HH
+#endif
diff --git a/dumux/linear/parallelhelpers.hh b/dumux/linear/parallelhelpers.hh
index a69bac2507..0de4246ab1 100644
--- a/dumux/linear/parallelhelpers.hh
+++ b/dumux/linear/parallelhelpers.hh
@@ -820,4 +820,4 @@ void prepareLinearAlgebraParallel(Matrix& A, Vector& b,
} // end namespace Dumux
#endif // HAVE_MPI
-#endif // DUMUX_PARALLELHELPERS_HH
+#endif
diff --git a/dumux/linear/preconditioners.hh b/dumux/linear/preconditioners.hh
index 08b10a7eff..0776e9b54c 100644
--- a/dumux/linear/preconditioners.hh
+++ b/dumux/linear/preconditioners.hh
@@ -335,4 +335,4 @@ DUMUX_REGISTER_PRECONDITIONER("uzawa", Dumux::MultiTypeBlockMatrixPreconditioner
} // end namespace Dumux
-#endif // DUMUX_LINEAR_PRECONDITIONERS_HH
+#endif
diff --git a/dumux/linear/scotchbackend.hh b/dumux/linear/scotchbackend.hh
index 2d96791d84..1d8ee92832 100644
--- a/dumux/linear/scotchbackend.hh
+++ b/dumux/linear/scotchbackend.hh
@@ -173,4 +173,4 @@ public:
} // end namespace Dumux
-#endif // DUMUX_SCOTCH_BACKEND_HH
+#endif
diff --git a/dumux/material/binarycoefficients/henryiapws.hh b/dumux/material/binarycoefficients/henryiapws.hh
index ee65c32be8..4c130c8bb7 100644
--- a/dumux/material/binarycoefficients/henryiapws.hh
+++ b/dumux/material/binarycoefficients/henryiapws.hh
@@ -94,4 +94,4 @@ inline Scalar henryIAPWS(Scalar E,
}
}
-#endif // DUMUX_HENRY_IAPWS_HH
+#endif
diff --git a/dumux/material/components/constant.hh b/dumux/material/components/constant.hh
index a6380e183b..e673dfdda4 100644
--- a/dumux/material/components/constant.hh
+++ b/dumux/material/components/constant.hh
@@ -218,4 +218,4 @@ public:
} // end namespace Dumux
-#endif // DUMUX_COMPONENTS_CONSTANT_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
index cc9827550a..c74214cbc2 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
@@ -273,4 +273,4 @@ public:
} // end namespace Dumux
-#endif // BROOKS_COREY_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
index 97930ffbb0..87c8afeed4 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
@@ -75,4 +75,4 @@ public:
} // namespace Dumux
-#endif // REGULARIZED_VAN_GENUCHTEN_OF_TEMPERATURE_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh
index 841a17748b..7b3b390b46 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh
@@ -92,4 +92,4 @@ private:
};
} // namespace Dumux
-#endif //AWN_SURFACE_EXP_SW_PC_TO_3_PARAMS
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh b/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
index df2b9c7085..28e1001f19 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
@@ -70,4 +70,4 @@ public:
};
} // end namespace Dumux
-#endif // DIFFUSIVITY_CONSTANT_TORTUOSITY_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
index df64949e2b..3a3153cdf8 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
@@ -104,4 +104,4 @@ public:
} // end namespace Dumux
-#endif // DUMUX_FRICTIONLAW_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
index 0286cd4752..538a739e6d 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
@@ -85,4 +85,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_FRICTIONLAW_MANNING_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
index f3882891b3..7a85827458 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
@@ -84,4 +84,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_FRICTIONLAW_NIKURADSE_HH
+#endif
diff --git a/dumux/material/spatialparams/fvnonequilibrium.hh b/dumux/material/spatialparams/fvnonequilibrium.hh
index 492d18d248..2abfdb0161 100644
--- a/dumux/material/spatialparams/fvnonequilibrium.hh
+++ b/dumux/material/spatialparams/fvnonequilibrium.hh
@@ -131,4 +131,4 @@ public:
} // end namespace Dumux
-#endif // GUARDIAN
+#endif
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
index 6368527a94..a4afec061f 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
@@ -1141,4 +1141,4 @@ protected:
} // end namespace Dumux
-#endif // DUMUX_STOKES_DARCY_COUPLINGDATA_HH
+#endif
diff --git a/dumux/multidomain/facet/box/couplingmapper.hh b/dumux/multidomain/facet/box/couplingmapper.hh
index b54a1c5ddc..5e29524f20 100644
--- a/dumux/multidomain/facet/box/couplingmapper.hh
+++ b/dumux/multidomain/facet/box/couplingmapper.hh
@@ -232,4 +232,4 @@ public:
} // end namespace Dumux
-#endif // DUMUX_FACETCOUPLING_CCTPFA_COUPLING_MAPPER_HH
+#endif
diff --git a/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh b/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
index 8905592da9..4c4b6906c7 100644
--- a/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
+++ b/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
@@ -258,4 +258,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_FACETCOUPLING_CCMPFA_COUPLING_MAPPER_HH
+#endif
diff --git a/dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh b/dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh
index 1bd84f6991..40ea941edd 100644
--- a/dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh
+++ b/dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh
@@ -172,4 +172,4 @@ public:
} // end namespace Dumux
-#endif // DUMUX_FACETCOUPLING_CCTPFA_COUPLING_MAPPER_HH
+#endif
diff --git a/dumux/multidomain/facet/couplingmapper.hh b/dumux/multidomain/facet/couplingmapper.hh
index 1daeb34e35..844e8bccb3 100644
--- a/dumux/multidomain/facet/couplingmapper.hh
+++ b/dumux/multidomain/facet/couplingmapper.hh
@@ -140,4 +140,4 @@ public:
#include <dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh>
#include <dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh>
-#endif // DUMUX_FACETCOUPLING_COUPLING_MAPPER_HH
+#endif
diff --git a/dumux/multidomain/facet/couplingmapperbase.hh b/dumux/multidomain/facet/couplingmapperbase.hh
index df6bac359a..da4e3dccba 100644
--- a/dumux/multidomain/facet/couplingmapperbase.hh
+++ b/dumux/multidomain/facet/couplingmapperbase.hh
@@ -251,4 +251,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_FACETCOUPLING_COUPLING_MAPPER_BASE_HH
+#endif
diff --git a/dumux/multidomain/facet/gmshreader.hh b/dumux/multidomain/facet/gmshreader.hh
index 17e76355e0..af4c43d0b7 100644
--- a/dumux/multidomain/facet/gmshreader.hh
+++ b/dumux/multidomain/facet/gmshreader.hh
@@ -425,4 +425,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_FACETCOUPLING_GMSH_READER_HH
+#endif
diff --git a/dumux/multidomain/facet/gridmanager.hh b/dumux/multidomain/facet/gridmanager.hh
index bc97199113..304b94eb06 100644
--- a/dumux/multidomain/facet/gridmanager.hh
+++ b/dumux/multidomain/facet/gridmanager.hh
@@ -464,4 +464,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_FACETCOUPLING_GRID_CREATOR_HH
+#endif
diff --git a/dumux/parallel/vectorcommdatahandle.hh b/dumux/parallel/vectorcommdatahandle.hh
index f89c3e896c..bb7d45696b 100644
--- a/dumux/parallel/vectorcommdatahandle.hh
+++ b/dumux/parallel/vectorcommdatahandle.hh
@@ -136,4 +136,4 @@ using VectorCommDataHandleMax = VectorCommDataHandle<Mapper,Vector, codim, Detai
} // end namespace Dumux
-#endif // DUMUX_VECTOR_COMM_DATA_HANDLE_HH
+#endif
diff --git a/dumux/porousmediumflow/2p/gridadaptindicator.hh b/dumux/porousmediumflow/2p/gridadaptindicator.hh
index e413924f1d..098498e6f9 100644
--- a/dumux/porousmediumflow/2p/gridadaptindicator.hh
+++ b/dumux/porousmediumflow/2p/gridadaptindicator.hh
@@ -280,4 +280,4 @@ private:
} // end namespace Dumux
-#endif /* DUMUX_TWOP_ADAPTION_INDICATOR_HH */
+#endif
diff --git a/dumux/porousmediumflow/2p/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh
index e28be7a2fb..a10fff8980 100644
--- a/dumux/porousmediumflow/2p/griddatatransfer.hh
+++ b/dumux/porousmediumflow/2p/griddatatransfer.hh
@@ -445,4 +445,4 @@ public:
} // end namespace Dumux
-#endif /* DUMUX_TWOP_GRIDDATA_TRANSFER_HH */
+#endif
diff --git a/dumux/porousmediumflow/2p1c/darcyslaw.hh b/dumux/porousmediumflow/2p1c/darcyslaw.hh
index c453a7c690..f687bfd1c4 100644
--- a/dumux/porousmediumflow/2p1c/darcyslaw.hh
+++ b/dumux/porousmediumflow/2p1c/darcyslaw.hh
@@ -149,4 +149,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_2P1C_SPURIOUS_FLUX_BLOCKING_DARCYS_LAW_HH
+#endif
diff --git a/dumux/porousmediumflow/2p1c/model.hh b/dumux/porousmediumflow/2p1c/model.hh
index 83055d4224..e3192d6f52 100644
--- a/dumux/porousmediumflow/2p1c/model.hh
+++ b/dumux/porousmediumflow/2p1c/model.hh
@@ -222,4 +222,4 @@ struct IOFields<TypeTag, TTag::TwoPOneCNI> { using type = EnergyIOFields<TwoPOne
} // end namespace Properties
} // end namespace Dumux
-#endif // DUMUX_2P1C_MODEL_HH
+#endif
diff --git a/dumux/porousmediumflow/nonequilibrium/newtonsolver.hh b/dumux/porousmediumflow/nonequilibrium/newtonsolver.hh
index d94cbe850c..87b34a8e4b 100644
--- a/dumux/porousmediumflow/nonequilibrium/newtonsolver.hh
+++ b/dumux/porousmediumflow/nonequilibrium/newtonsolver.hh
@@ -58,4 +58,4 @@ public:
};
} // end namespace Dumux
-#endif // DUMUX_NONEQUILIBRIUM_NEWTON_SOLVER_HH
+#endif
diff --git a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
index 8aa4a73bf6..8647db84e4 100644
--- a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
+++ b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
@@ -419,4 +419,4 @@ public:
};
} // end namespace Dumux
-#endif //
+#endif
diff --git a/dumux/porousmediumflow/sequential/gridadapt.hh b/dumux/porousmediumflow/sequential/gridadapt.hh
index 45ac878363..9d123472c7 100644
--- a/dumux/porousmediumflow/sequential/gridadapt.hh
+++ b/dumux/porousmediumflow/sequential/gridadapt.hh
@@ -484,4 +484,4 @@ public:
};
}
-#endif /* DUMUX_GRIDADAPT_HH */
+#endif
diff --git a/test/freeflow/navierstokes/sincos/problem.hh b/test/freeflow/navierstokes/sincos/problem.hh
index 619c4095aa..39c6090b9a 100644
--- a/test/freeflow/navierstokes/sincos/problem.hh
+++ b/test/freeflow/navierstokes/sincos/problem.hh
@@ -307,4 +307,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_SINCOS_TEST_PROBLEM_HH
+#endif
diff --git a/test/io/gridmanager/gmshboundaryflagtest.hh b/test/io/gridmanager/gmshboundaryflagtest.hh
index 4f67a03803..472195c835 100644
--- a/test/io/gridmanager/gmshboundaryflagtest.hh
+++ b/test/io/gridmanager/gmshboundaryflagtest.hh
@@ -108,4 +108,4 @@ private:
} // end namespace Dumux
-#endif /* DUMUX_TEST_IO_GMSHBOUNDARYFLAG_TEST_HH */
+#endif
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 0136f37445..83e3830532 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -667,4 +667,4 @@ int checkFluidSystem(bool enablePhaseRestriction = true)
} // end namespace Dumux
-#endif // DUMUX_CHECK_FLUIDSYSTEM_HH
+#endif
diff --git a/test/material/solidsystems/checksolidsystem.hh b/test/material/solidsystems/checksolidsystem.hh
index a542004789..e92fcf0d28 100644
--- a/test/material/solidsystems/checksolidsystem.hh
+++ b/test/material/solidsystems/checksolidsystem.hh
@@ -138,4 +138,4 @@ int checkSolidSystem()
} // end namespace Dumux
-#endif // DUMUX_CHECK_SOLIDSYSTEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
index 4ae5b9639c..a5111a6d58 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
@@ -273,4 +273,4 @@ private:
};
} // end namespace Dumux
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
index 1d1ab1b7e3..e5d7ef4df6 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
@@ -329,4 +329,4 @@ private:
};
} // end namespace Dumux
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
index ce1ac8bf01..e1cc391831 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
@@ -306,4 +306,4 @@ private:
};
} // end namespace Dumux
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
index e5456d4dce..2a3980f7a7 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
@@ -381,4 +381,4 @@ private:
};
} // end namespace Dumux
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
index e861194670..9ff44f6abc 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
@@ -342,4 +342,4 @@ private:
};
} // end namespace Dumux
-#endif //DUMUX_DARCY2P2C_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
index 1dfcb69a13..1a1c91a9fc 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
@@ -416,4 +416,4 @@ private:
};
} // end namespace Dumux
-#endif // DUMUX_STOKES1P2C_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
index 13555be963..c92a8d3f6e 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
@@ -267,4 +267,4 @@ private:
};
} // end namespace Dumux
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
index 5b16159b3a..b371fc02d8 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
@@ -292,4 +292,4 @@ private:
};
} // end namespace Dumux
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
index e1a116a2ff..df692f3b43 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
@@ -394,4 +394,4 @@ private:
};
} // end namespace Dumux
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
index 8c03263bdf..4c1d0beeef 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
@@ -396,4 +396,4 @@ private:
};
} // end namespace Dumux
-#endif // DUMUX_FREEFLOW_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh
index 7001a20935..0f0c9f2b18 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh
@@ -128,4 +128,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_CONVERGENCE_TEST_SPATIALPARAMS_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh
index ebca2389a0..39aaaf7dc0 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh
@@ -34,4 +34,4 @@ enum class TestCase
} // end namespace Dumux
-#endif // DUMUX_CONVERGENCE_TEST_TESTCASE_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
index bfeb060efd..57e4745f4f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
@@ -251,4 +251,4 @@ private:
};
} // end namespace Dumux
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
index bdfc62aaca..389e340fa7 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
@@ -308,4 +308,4 @@ private:
};
} // end namespace Dumux
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
index f92a3933ea..65fe8b6ee9 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
@@ -287,4 +287,4 @@ private:
};
} // end namespace Dumux
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
index 78757dad66..74f33a7569 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
@@ -272,4 +272,4 @@ private:
};
} // end namespace Dumux
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh b/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh
index d57ca0acdf..2ab8465c67 100644
--- a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh
@@ -100,4 +100,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_CONVERGENCE_TEST_ONEP_SPATIALPARAMS_HH
+#endif
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
index b1ee93e219..b233b5bab3 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
@@ -289,4 +289,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_1PNI_CONDUCTION_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
index 578207283f..0bfd075707 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
@@ -342,4 +342,4 @@ private:
} // end namespace Dumux
-#endif // DUMUX_1PNI_CONVECTION_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
index 2ecfd19a8e..228dafa236 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
@@ -255,4 +255,4 @@ private:
};
} //end namespace
-#endif // DUMUX_TEST_IMPES_ADAPTIVE_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 4d28a2ff4d..964e6e2c67 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -449,4 +449,4 @@ McWhorterAnalytic<TypeTag> analyticSolution_;
};
} //end namespace
-#endif // DUMUX_TEST_MPFA2P_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index 3fd1d97294..2bc16993b1 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -271,4 +271,4 @@ static constexpr Scalar eps_ = 1e-6;
};
} //end namespace
-#endif // DUMUX_TEST_ADAPTIVE3D_2P2C_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
index c1c3b4ff8b..fda52a9e4d 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
@@ -407,4 +407,4 @@ private:
} // end namespace Dumux
-#endif // GUARDIAN
+#endif
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh
index 9548939219..0ad703c303 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh
@@ -218,4 +218,4 @@ public:
};
} // end namespace Dumux
-#endif //
+#endif
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
index 47999c82dd..32ef6c727d 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
@@ -225,4 +225,4 @@ private:
}
-#endif // GUARDIAN
+#endif
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
index 206e394077..d1270c794d 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
@@ -318,4 +318,4 @@ private:
};
} // end namespace Dumux
-#endif // DUMUX_RICHARDSNINI_CONDUCTION_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
index 639272dd09..89f8851c8e 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
@@ -340,4 +340,4 @@ private:
};
} // end namespace
-#endif // DUMUX_RICHARDSNI_CONVECTION_PROBLEM_HH
+#endif
--
GitLab