Skip to content
Snippets Groups Projects
Commit b81d75b4 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Normalise include guards

parent 88374d79
Branches
No related tags found
No related merge requests found
Showing
with 50 additions and 45 deletions
#ifndef BODY_HH #ifndef DUNE_TECTONIC_BODY_HH
#define BODY_HH #define DUNE_TECTONIC_BODY_HH
template <int dimension> struct Body { template <int dimension> struct Body {
using ScalarFunction = Dune::VirtualFunction< using ScalarFunction = Dune::VirtualFunction<
...@@ -18,5 +18,4 @@ template <int dimension> struct Body { ...@@ -18,5 +18,4 @@ template <int dimension> struct Body {
ScalarFunction virtual const &getDensityField() const = 0; ScalarFunction virtual const &getDensityField() const = 0;
VectorField virtual const &getGravityField() const = 0; VectorField virtual const &getGravityField() const = 0;
}; };
#endif #endif
#ifndef ELLIPTIC_ENERGY_HH #ifndef DUNE_TECTONIC_ELLIPTICENERGY_HH
#define ELLIPTIC_ENERGY_HH #define DUNE_TECTONIC_ELLIPTICENERGY_HH
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
......
#ifndef FRICTIONDATA_HH #ifndef DUNE_TECTONIC_FRICTIONDATA_HH
#define FRICTIONDATA_HH #define DUNE_TECTONIC_FRICTIONDATA_HH
#include <dune/common/parametertree.hh> #include <dune/common/parametertree.hh>
struct FrictionData { struct FrictionData {
......
#ifndef NICE_FUNCTION_HH #ifndef DUNE_TECTONIC_FRICTIONPOTENTIAL_HH
#define NICE_FUNCTION_HH #define DUNE_TECTONIC_FRICTIONPOTENTIAL_HH
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
......
#ifndef GLOBAL_FRICTION_DATA_HH #ifndef DUNE_TECTONIC_GLOBALFRICTIONDATA_HH
#define GLOBAL_FRICTION_DATA_HH #define DUNE_TECTONIC_GLOBALFRICTIONDATA_HH
#include <dune/common/function.hh> #include <dune/common/function.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
...@@ -33,5 +33,4 @@ template <int dimension> class GlobalFrictionData { ...@@ -33,5 +33,4 @@ template <int dimension> class GlobalFrictionData {
VirtualFunction virtual const &b() const = 0; VirtualFunction virtual const &b() const = 0;
double virtual const &mu0() const = 0; double virtual const &mu0() const = 0;
}; };
#endif #endif
#ifndef DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH #ifndef DUNE_TECTONIC_GLOBALNONLINEARITY_HH
#define DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH #define DUNE_TECTONIC_GLOBALNONLINEARITY_HH
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
......
#ifndef DUNE_TECTONIC_GLOBAL_RUINA_NONLINEARITY_HH #ifndef DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH
#define DUNE_TECTONIC_GLOBAL_RUINA_NONLINEARITY_HH #define DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH
#include <vector> #include <vector>
......
#ifndef GRAVITY_HH #ifndef DUNE_TECTONIC_GRAVITY_HH
#define GRAVITY_HH #define DUNE_TECTONIC_GRAVITY_HH
#include <dune/common/function.hh> #include <dune/common/function.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
......
#ifndef DUNE_TECTONIC_LOCAL_FRICTION_HH #ifndef DUNE_TECTONIC_LOCALFRICTION_HH
#define DUNE_TECTONIC_LOCAL_FRICTION_HH #define DUNE_TECTONIC_LOCALFRICTION_HH
#include <cmath> #include <cmath>
#include <limits> #include <limits>
......
#ifndef MINIMISATION_HH #ifndef DUNE_TECTONIC_MINIMISATION_HH
#define MINIMISATION_HH #define DUNE_TECTONIC_MINIMISATION_HH
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
......
// Based on dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh #ifndef DUNE_TECTONIC_MYBLOCKPROBLEM_HH
#define DUNE_TECTONIC_MYBLOCKPROBLEM_HH
#ifndef MY_BLOCK_PROBLEM_HH // Based on dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh
#define MY_BLOCK_PROBLEM_HH
#include <dune/common/bitsetvector.hh> #include <dune/common/bitsetvector.hh>
#include <dune/common/nullptr.hh> #include <dune/common/nullptr.hh>
...@@ -271,5 +271,4 @@ class MyBlockProblem<ConvexProblem>::IterateObject { ...@@ -271,5 +271,4 @@ class MyBlockProblem<ConvexProblem>::IterateObject {
size_t const localsteps; size_t const localsteps;
}; };
#endif #endif
#ifndef DUNE_TECTONIC_MYDIRECTIONALCONVEXFUNCTION_HH
#define DUNE_TECTONIC_MYDIRECTIONALCONVEXFUNCTION_HH
// Copied from dune/tnnmg/problem-classes/directionalconvexfunction.hh // Copied from dune/tnnmg/problem-classes/directionalconvexfunction.hh
// Allows phi to be const // Allows phi to be const
#ifndef MY_DIRECTIONAL_CONVEX_FUNCTION_HH
#define MY_DIRECTIONAL_CONVEX_FUNCTION_HH
#include <dune/fufem/arithmetic.hh> #include <dune/fufem/arithmetic.hh>
#include <dune/solvers/common/interval.hh> #include <dune/solvers/common/interval.hh>
...@@ -64,5 +64,4 @@ template <class Nonlinearity> class MyDirectionalConvexFunction { ...@@ -64,5 +64,4 @@ template <class Nonlinearity> class MyDirectionalConvexFunction {
Dune::Solvers::Interval<double> dom; Dune::Solvers::Interval<double> dom;
}; };
#endif #endif
#ifndef DUNE_tectonic.hh #ifndef DUNE_TECTONIC_TECTONIC_HH
#define DUNE_tectonic .hh #define DUNE_TECTONIC_TECTONIC_HH
// add your classes here // add your classes here
#endif
#endif // DUNE_tectonic.hh
#ifndef ASSEMBLERS_HH #ifndef SRC_ASSEMBLERS_HH
#define ASSEMBLERS_HH #define SRC_ASSEMBLERS_HH
#include <dune/common/bitsetvector.hh> #include <dune/common/bitsetvector.hh>
#include <dune/common/function.hh> #include <dune/common/function.hh>
...@@ -84,5 +84,4 @@ template <class GridView, int dimension> class MyAssembler { ...@@ -84,5 +84,4 @@ template <class GridView, int dimension> class MyAssembler {
void assembleVonMisesStress(double youngModulus, double poissonRatio, void assembleVonMisesStress(double youngModulus, double poissonRatio,
Vector const &u, ScalarVector &stress); Vector const &u, ScalarVector &stress);
}; };
#endif #endif
#ifndef BOUNDARY_WRITER_HH #ifndef SRC_BOUNDARY_WRITER_HH
#define BOUNDARY_WRITER_HH #define SRC_BOUNDARY_WRITER_HH
#include <fstream> #include <fstream>
#include <string> #include <string>
......
#ifndef ENUMS_HH #ifndef SRC_ENUMS_HH
#define ENUMS_HH #define SRC_ENUMS_HH
struct Config { struct Config {
enum stateModel { enum stateModel {
...@@ -11,4 +11,5 @@ struct Config { ...@@ -11,4 +11,5 @@ struct Config {
BackwardEuler BackwardEuler
}; };
}; };
#endif #endif
#ifndef SRC_EXPLICITGRID_HH
#define SRC_EXPLICITGRID_HH
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wignored-qualifiers" #pragma clang diagnostic ignored "-Wignored-qualifiers"
#include <dune/grid/alugrid.hh> #include <dune/grid/alugrid.hh>
...@@ -5,3 +8,4 @@ ...@@ -5,3 +8,4 @@
using Grid = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>; using Grid = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>;
using GridView = Grid::LeafGridView; using GridView = Grid::LeafGridView;
#endif
#ifndef SRC_EXPLICITVECTORS_HH
#define SRC_EXPLICITVECTORS_HH
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
...@@ -8,3 +11,4 @@ using LocalMatrix = Dune::FieldMatrix<double, DIM, DIM>; ...@@ -8,3 +11,4 @@ using LocalMatrix = Dune::FieldMatrix<double, DIM, DIM>;
using Vector = Dune::BlockVector<LocalVector>; using Vector = Dune::BlockVector<LocalVector>;
using Matrix = Dune::BCRSMatrix<LocalMatrix>; using Matrix = Dune::BCRSMatrix<LocalMatrix>;
using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>; using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
#endif
#ifndef FRICTION_WRITER_HH #ifndef SRC_FRICTION_WRITER_HH
#define FRICTION_WRITER_HH #define SRC_FRICTION_WRITER_HH
#include <fstream> #include <fstream>
#include <string> #include <string>
...@@ -26,4 +26,5 @@ class FrictionWriter : public BoundaryWriter<ScalarVector, Vector> { ...@@ -26,4 +26,5 @@ class FrictionWriter : public BoundaryWriter<ScalarVector, Vector> {
std::fstream stateWriter; std::fstream stateWriter;
using BW::boundaryNodes; using BW::boundaryNodes;
}; };
#endif #endif
#ifndef MY_GEOMETRY_HH #ifndef SRC_SAND_WEDGE_DATA_MYGEOMETRY_HH
#define MY_GEOMETRY_HH #define SRC_SAND_WEDGE_DATA_MYGEOMETRY_HH
#include <dune/common/fassign.hh> #include <dune/common/fassign.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment