From b81d75b43f0c2d563bbf25bc527a5480f74bbd82 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 22 Feb 2014 19:28:34 +0100
Subject: [PATCH] [Cleanup] Normalise include guards

---
 dune/tectonic/body.hh                        | 5 ++---
 dune/tectonic/ellipticenergy.hh              | 4 ++--
 dune/tectonic/frictiondata.hh                | 5 +++--
 dune/tectonic/frictionpotential.hh           | 4 ++--
 dune/tectonic/globalfrictiondata.hh          | 5 ++---
 dune/tectonic/globalnonlinearity.hh          | 4 ++--
 dune/tectonic/globalruinanonlinearity.hh     | 4 ++--
 dune/tectonic/gravity.hh                     | 4 ++--
 dune/tectonic/localfriction.hh               | 4 ++--
 dune/tectonic/minimisation.hh                | 4 ++--
 dune/tectonic/myblockproblem.hh              | 7 +++----
 dune/tectonic/mydirectionalconvexfunction.hh | 7 +++----
 dune/tectonic/tectonic.hh                    | 7 +++----
 src/assemblers.hh                            | 5 ++---
 src/boundary_writer.hh                       | 4 ++--
 src/enums.hh                                 | 5 +++--
 src/explicitgrid.hh                          | 4 ++++
 src/explicitvectors.hh                       | 4 ++++
 src/friction_writer.hh                       | 5 +++--
 src/sand-wedge-data/mygeometry.hh            | 4 ++--
 src/sand-wedge-data/special_writer.hh        | 5 ++---
 src/solverfactory.hh                         | 5 ++---
 src/state.hh                                 | 4 ++--
 src/timestepping.hh                          | 5 ++---
 src/timestepping/backward_euler.hh           | 4 ++--
 src/timestepping/newmark.hh                  | 4 ++--
 src/tobool.hh                                | 5 ++---
 src/vtk.hh                                   | 5 ++---
 28 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/dune/tectonic/body.hh b/dune/tectonic/body.hh
index cee4dbf1..f98d5068 100644
--- a/dune/tectonic/body.hh
+++ b/dune/tectonic/body.hh
@@ -1,5 +1,5 @@
-#ifndef BODY_HH
-#define BODY_HH
+#ifndef DUNE_TECTONIC_BODY_HH
+#define DUNE_TECTONIC_BODY_HH
 
 template <int dimension> struct Body {
   using ScalarFunction = Dune::VirtualFunction<
@@ -18,5 +18,4 @@ template <int dimension> struct Body {
   ScalarFunction virtual const &getDensityField() const = 0;
   VectorField virtual const &getGravityField() const = 0;
 };
-
 #endif
diff --git a/dune/tectonic/ellipticenergy.hh b/dune/tectonic/ellipticenergy.hh
index 75b9985f..e3405a1c 100644
--- a/dune/tectonic/ellipticenergy.hh
+++ b/dune/tectonic/ellipticenergy.hh
@@ -1,5 +1,5 @@
-#ifndef ELLIPTIC_ENERGY_HH
-#define ELLIPTIC_ENERGY_HH
+#ifndef DUNE_TECTONIC_ELLIPTICENERGY_HH
+#define DUNE_TECTONIC_ELLIPTICENERGY_HH
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
diff --git a/dune/tectonic/frictiondata.hh b/dune/tectonic/frictiondata.hh
index ee4bde11..96b8a651 100644
--- a/dune/tectonic/frictiondata.hh
+++ b/dune/tectonic/frictiondata.hh
@@ -1,5 +1,6 @@
-#ifndef FRICTIONDATA_HH
-#define FRICTIONDATA_HH
+#ifndef DUNE_TECTONIC_FRICTIONDATA_HH
+#define DUNE_TECTONIC_FRICTIONDATA_HH
+
 #include <dune/common/parametertree.hh>
 
 struct FrictionData {
diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh
index e9fe0d51..042ef2b3 100644
--- a/dune/tectonic/frictionpotential.hh
+++ b/dune/tectonic/frictionpotential.hh
@@ -1,5 +1,5 @@
-#ifndef NICE_FUNCTION_HH
-#define NICE_FUNCTION_HH
+#ifndef DUNE_TECTONIC_FRICTIONPOTENTIAL_HH
+#define DUNE_TECTONIC_FRICTIONPOTENTIAL_HH
 
 #include <algorithm>
 #include <cassert>
diff --git a/dune/tectonic/globalfrictiondata.hh b/dune/tectonic/globalfrictiondata.hh
index 1b2a5bf1..4482e8f6 100644
--- a/dune/tectonic/globalfrictiondata.hh
+++ b/dune/tectonic/globalfrictiondata.hh
@@ -1,5 +1,5 @@
-#ifndef GLOBAL_FRICTION_DATA_HH
-#define GLOBAL_FRICTION_DATA_HH
+#ifndef DUNE_TECTONIC_GLOBALFRICTIONDATA_HH
+#define DUNE_TECTONIC_GLOBALFRICTIONDATA_HH
 
 #include <dune/common/function.hh>
 #include <dune/common/fvector.hh>
@@ -33,5 +33,4 @@ template <int dimension> class GlobalFrictionData {
   VirtualFunction virtual const &b() const = 0;
   double virtual const &mu0() const = 0;
 };
-
 #endif
diff --git a/dune/tectonic/globalnonlinearity.hh b/dune/tectonic/globalnonlinearity.hh
index 0a899a56..2f00da1b 100644
--- a/dune/tectonic/globalnonlinearity.hh
+++ b/dune/tectonic/globalnonlinearity.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH
-#define DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH
+#ifndef DUNE_TECTONIC_GLOBALNONLINEARITY_HH
+#define DUNE_TECTONIC_GLOBALNONLINEARITY_HH
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalruinanonlinearity.hh
index 4dc996d8..4c82a517 100644
--- a/dune/tectonic/globalruinanonlinearity.hh
+++ b/dune/tectonic/globalruinanonlinearity.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_GLOBAL_RUINA_NONLINEARITY_HH
-#define DUNE_TECTONIC_GLOBAL_RUINA_NONLINEARITY_HH
+#ifndef DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH
+#define DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH
 
 #include <vector>
 
diff --git a/dune/tectonic/gravity.hh b/dune/tectonic/gravity.hh
index 9af62f17..d91f6850 100644
--- a/dune/tectonic/gravity.hh
+++ b/dune/tectonic/gravity.hh
@@ -1,5 +1,5 @@
-#ifndef GRAVITY_HH
-#define GRAVITY_HH
+#ifndef DUNE_TECTONIC_GRAVITY_HH
+#define DUNE_TECTONIC_GRAVITY_HH
 
 #include <dune/common/function.hh>
 #include <dune/common/fvector.hh>
diff --git a/dune/tectonic/localfriction.hh b/dune/tectonic/localfriction.hh
index a202e7f2..eaea43c4 100644
--- a/dune/tectonic/localfriction.hh
+++ b/dune/tectonic/localfriction.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_LOCAL_FRICTION_HH
-#define DUNE_TECTONIC_LOCAL_FRICTION_HH
+#ifndef DUNE_TECTONIC_LOCALFRICTION_HH
+#define DUNE_TECTONIC_LOCALFRICTION_HH
 
 #include <cmath>
 #include <limits>
diff --git a/dune/tectonic/minimisation.hh b/dune/tectonic/minimisation.hh
index a7ad57bc..3ae1464a 100644
--- a/dune/tectonic/minimisation.hh
+++ b/dune/tectonic/minimisation.hh
@@ -1,5 +1,5 @@
-#ifndef MINIMISATION_HH
-#define MINIMISATION_HH
+#ifndef DUNE_TECTONIC_MINIMISATION_HH
+#define DUNE_TECTONIC_MINIMISATION_HH
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 6d11407c..dea7dd1b 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -1,7 +1,7 @@
-// Based on dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh
+#ifndef DUNE_TECTONIC_MYBLOCKPROBLEM_HH
+#define DUNE_TECTONIC_MYBLOCKPROBLEM_HH
 
-#ifndef MY_BLOCK_PROBLEM_HH
-#define MY_BLOCK_PROBLEM_HH
+// Based on dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/nullptr.hh>
@@ -271,5 +271,4 @@ class MyBlockProblem<ConvexProblem>::IterateObject {
 
   size_t const localsteps;
 };
-
 #endif
diff --git a/dune/tectonic/mydirectionalconvexfunction.hh b/dune/tectonic/mydirectionalconvexfunction.hh
index 83cd3b40..e815fa48 100644
--- a/dune/tectonic/mydirectionalconvexfunction.hh
+++ b/dune/tectonic/mydirectionalconvexfunction.hh
@@ -1,9 +1,9 @@
+#ifndef DUNE_TECTONIC_MYDIRECTIONALCONVEXFUNCTION_HH
+#define DUNE_TECTONIC_MYDIRECTIONALCONVEXFUNCTION_HH
+
 // Copied from dune/tnnmg/problem-classes/directionalconvexfunction.hh
 // Allows phi to be const
 
-#ifndef MY_DIRECTIONAL_CONVEX_FUNCTION_HH
-#define MY_DIRECTIONAL_CONVEX_FUNCTION_HH
-
 #include <dune/fufem/arithmetic.hh>
 #include <dune/solvers/common/interval.hh>
 
@@ -64,5 +64,4 @@ template <class Nonlinearity> class MyDirectionalConvexFunction {
 
   Dune::Solvers::Interval<double> dom;
 };
-
 #endif
diff --git a/dune/tectonic/tectonic.hh b/dune/tectonic/tectonic.hh
index 7fd374f9..bd921f8f 100644
--- a/dune/tectonic/tectonic.hh
+++ b/dune/tectonic/tectonic.hh
@@ -1,6 +1,5 @@
-#ifndef DUNE_tectonic.hh
-#define DUNE_tectonic .hh
+#ifndef DUNE_TECTONIC_TECTONIC_HH
+#define DUNE_TECTONIC_TECTONIC_HH
 
 // add your classes here
-
-#endif // DUNE_tectonic.hh
+#endif
diff --git a/src/assemblers.hh b/src/assemblers.hh
index 1705b7a5..96f98341 100644
--- a/src/assemblers.hh
+++ b/src/assemblers.hh
@@ -1,5 +1,5 @@
-#ifndef ASSEMBLERS_HH
-#define ASSEMBLERS_HH
+#ifndef SRC_ASSEMBLERS_HH
+#define SRC_ASSEMBLERS_HH
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/function.hh>
@@ -84,5 +84,4 @@ template <class GridView, int dimension> class MyAssembler {
   void assembleVonMisesStress(double youngModulus, double poissonRatio,
                               Vector const &u, ScalarVector &stress);
 };
-
 #endif
diff --git a/src/boundary_writer.hh b/src/boundary_writer.hh
index 5e4b0085..32033a7c 100644
--- a/src/boundary_writer.hh
+++ b/src/boundary_writer.hh
@@ -1,5 +1,5 @@
-#ifndef BOUNDARY_WRITER_HH
-#define BOUNDARY_WRITER_HH
+#ifndef SRC_BOUNDARY_WRITER_HH
+#define SRC_BOUNDARY_WRITER_HH
 
 #include <fstream>
 #include <string>
diff --git a/src/enums.hh b/src/enums.hh
index 5d829afd..681c1ee2 100644
--- a/src/enums.hh
+++ b/src/enums.hh
@@ -1,5 +1,5 @@
-#ifndef ENUMS_HH
-#define ENUMS_HH
+#ifndef SRC_ENUMS_HH
+#define SRC_ENUMS_HH
 
 struct Config {
   enum stateModel {
@@ -11,4 +11,5 @@ struct Config {
     BackwardEuler
   };
 };
+
 #endif
diff --git a/src/explicitgrid.hh b/src/explicitgrid.hh
index 9100b3d3..bf509994 100644
--- a/src/explicitgrid.hh
+++ b/src/explicitgrid.hh
@@ -1,3 +1,6 @@
+#ifndef SRC_EXPLICITGRID_HH
+#define SRC_EXPLICITGRID_HH
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wignored-qualifiers"
 #include <dune/grid/alugrid.hh>
@@ -5,3 +8,4 @@
 
 using Grid = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>;
 using GridView = Grid::LeafGridView;
+#endif
diff --git a/src/explicitvectors.hh b/src/explicitvectors.hh
index 28271cc3..832888e1 100644
--- a/src/explicitvectors.hh
+++ b/src/explicitvectors.hh
@@ -1,3 +1,6 @@
+#ifndef SRC_EXPLICITVECTORS_HH
+#define SRC_EXPLICITVECTORS_HH
+
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
 #include <dune/istl/bcrsmatrix.hh>
@@ -8,3 +11,4 @@ using LocalMatrix = Dune::FieldMatrix<double, DIM, DIM>;
 using Vector = Dune::BlockVector<LocalVector>;
 using Matrix = Dune::BCRSMatrix<LocalMatrix>;
 using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
+#endif
diff --git a/src/friction_writer.hh b/src/friction_writer.hh
index dc78e057..e884d4d6 100644
--- a/src/friction_writer.hh
+++ b/src/friction_writer.hh
@@ -1,5 +1,5 @@
-#ifndef FRICTION_WRITER_HH
-#define FRICTION_WRITER_HH
+#ifndef SRC_FRICTION_WRITER_HH
+#define SRC_FRICTION_WRITER_HH
 
 #include <fstream>
 #include <string>
@@ -26,4 +26,5 @@ class FrictionWriter : public BoundaryWriter<ScalarVector, Vector> {
   std::fstream stateWriter;
   using BW::boundaryNodes;
 };
+
 #endif
diff --git a/src/sand-wedge-data/mygeometry.hh b/src/sand-wedge-data/mygeometry.hh
index d9955b2c..0800e114 100644
--- a/src/sand-wedge-data/mygeometry.hh
+++ b/src/sand-wedge-data/mygeometry.hh
@@ -1,5 +1,5 @@
-#ifndef MY_GEOMETRY_HH
-#define MY_GEOMETRY_HH
+#ifndef SRC_SAND_WEDGE_DATA_MYGEOMETRY_HH
+#define SRC_SAND_WEDGE_DATA_MYGEOMETRY_HH
 
 #include <dune/common/fassign.hh>
 #include <dune/common/fvector.hh>
diff --git a/src/sand-wedge-data/special_writer.hh b/src/sand-wedge-data/special_writer.hh
index a9f3aded..dfaa2243 100644
--- a/src/sand-wedge-data/special_writer.hh
+++ b/src/sand-wedge-data/special_writer.hh
@@ -1,5 +1,5 @@
-#ifndef SPECIAL_WRITER_HH
-#define SPECIAL_WRITER_HH
+#ifndef SRC_SPECIAL_WRITER_HH
+#define SRC_SPECIAL_WRITER_HH
 
 #include <fstream>
 #include <utility>
@@ -80,5 +80,4 @@ template <class GridView, int dimension> class SpecialWriter {
     writer_ << std::endl;
   }
 };
-
 #endif
diff --git a/src/solverfactory.hh b/src/solverfactory.hh
index 75cc3954..93188af4 100644
--- a/src/solverfactory.hh
+++ b/src/solverfactory.hh
@@ -1,5 +1,5 @@
-#ifndef SOLVER_FACTORY_HH
-#define SOLVER_FACTORY_HH
+#ifndef SRC_SOLVERFACTORY_HH
+#define SRC_SOLVERFACTORY_HH
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/parametertree.hh>
@@ -48,5 +48,4 @@ class SolverFactory {
   NonlinearSmoother nonlinearSmoother;
   Solver *multigridStep;
 };
-
 #endif
diff --git a/src/state.hh b/src/state.hh
index 779640d0..9d752b65 100644
--- a/src/state.hh
+++ b/src/state.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_STATE_HH
-#define DUNE_TECTONIC_STATE_HH
+#ifndef SRC_STATE_HH
+#define SRC_STATE_HH
 
 #include <dune/common/bitsetvector.hh>
 
diff --git a/src/timestepping.hh b/src/timestepping.hh
index 25832763..b95dff84 100644
--- a/src/timestepping.hh
+++ b/src/timestepping.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_TIMESTEPPING_HH
-#define DUNE_TECTONIC_TIMESTEPPING_HH
+#ifndef SRC_TIMESTEPPING_HH
+#define SRC_TIMESTEPPING_HH
 
 #include "enums.hh"
 #include <dune/common/bitsetvector.hh>
@@ -47,5 +47,4 @@ initTimeStepper(Config::scheme scheme,
       assert(false);
   }
 }
-
 #endif
diff --git a/src/timestepping/backward_euler.hh b/src/timestepping/backward_euler.hh
index 657b57b5..e6291fd6 100644
--- a/src/timestepping/backward_euler.hh
+++ b/src/timestepping/backward_euler.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_TIMESTEPPING_BACKWARD_EULER_HH
-#define DUNE_TECTONIC_TIMESTEPPING_BACKWARD_EULER_HH
+#ifndef SRC_TIMESTEPPING_BACKWARD_EULER_HH
+#define SRC_TIMESTEPPING_BACKWARD_EULER_HH
 
 template <class Vector, class Matrix, class Function, size_t dim>
 class BackwardEuler : public TimeSteppingScheme<Vector, Matrix, Function, dim> {
diff --git a/src/timestepping/newmark.hh b/src/timestepping/newmark.hh
index a9a6e1b2..bfae9664 100644
--- a/src/timestepping/newmark.hh
+++ b/src/timestepping/newmark.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_TIMESTEPPING_NEWMARK_HH
-#define DUNE_TECTONIC_TIMESTEPPING_NEWMARK_HH
+#ifndef SRC_TIMESTEPPING_NEWMARK_HH
+#define SRC_TIMESTEPPING_NEWMARK_HH
 
 template <class Vector, class Matrix, class Function, size_t dim>
 class Newmark : public TimeSteppingScheme<Vector, Matrix, Function, dim> {
diff --git a/src/tobool.hh b/src/tobool.hh
index d561225d..da60e905 100644
--- a/src/tobool.hh
+++ b/src/tobool.hh
@@ -1,9 +1,8 @@
-#ifndef TO_BOOL_HH
-#define TO_BOOL_HH
+#ifndef SRC_TOBOOL_HH
+#define SRC_TOBOOL_HH
 
 template <class Alloc>
 bool toBool(Dune::BitSetVectorConstReference<1, Alloc> x) {
   return x[0];
 }
-
 #endif
diff --git a/src/vtk.hh b/src/vtk.hh
index ffa89983..c851514c 100644
--- a/src/vtk.hh
+++ b/src/vtk.hh
@@ -1,5 +1,5 @@
-#ifndef VTK_HH
-#define VTK_HH
+#ifndef SRC_VTK_HH
+#define SRC_VTK_HH
 
 #include <string>
 
@@ -16,5 +16,4 @@ template <class VertexBasis, class CellBasis> class MyVTKWriter {
   void write(size_t record, Vector const &u, Vector const &v,
              ScalarVector const &alpha, ScalarVector const &stress) const;
 };
-
 #endif
-- 
GitLab