[Cleanup] Includes

dune/tectonic/frictionpotential.hh

@@ -9,7 +9,7 @@
 #include <dune/common/exceptions.hh>
 #include <dune/common/function.hh>
 
-#include "frictiondata.hh"
+#include <dune/tectonic/frictiondata.hh>
 
 class FrictionPotential {
 public:

dune/tectonic/globalfriction.hh

@@ -9,7 +9,7 @@
 
 #include <dune/solvers/common/interval.hh>
 
-#include "localfriction.hh"
+#include <dune/tectonic/localfriction.hh>
 
 template <class Matrix, class Vector> class GlobalFriction {
 protected:

dune/tectonic/globalratestatefriction.hh

@@ -11,8 +11,8 @@
 #include <dune/istl/bvector.hh>
 
 #include <dune/tectonic/globalfrictiondata.hh>
+#include <dune/tectonic/globalfriction.hh>
 
-#include "globalfriction.hh"
 #include "frictionpotential.hh"
 
 template <class Matrix, class Vector, class GridView>

dune/tectonic/localfriction.hh

@@ -10,7 +10,7 @@
 #include <dune/fufem/arithmetic.hh>
 #include <dune/solvers/common/interval.hh>
 
-#include "frictionpotential.hh"
+#include <dune/tectonic/frictionpotential.hh>
 
 template <size_t dimension> class LocalFriction {
 public:

dune/tectonic/minimisation.hh

@@ -9,7 +9,7 @@
 #include <dune/fufem/interval.hh>
 #include <dune/tnnmg/problem-classes/bisection.hh>
 
-#include "mydirectionalconvexfunction.hh"
+#include <dune/tectonic/mydirectionalconvexfunction.hh>
 
 // Warning: this exploits the property v*x = 0
 template <class Functional>

dune/tectonic/myblockproblem.hh

@@ -14,10 +14,10 @@
 #include <dune/tnnmg/problem-classes/bisection.hh>
 #include <dune/tnnmg/problem-classes/blocknonlineargsproblem.hh>
 
-#include "globalfriction.hh"
-#include "minimisation.hh"
-#include "mydirectionalconvexfunction.hh"
-#include "quadraticenergy.hh"
+#include <dune/tectonic/globalfriction.hh>
+#include <dune/tectonic/minimisation.hh>
+#include <dune/tectonic/mydirectionalconvexfunction.hh>
+#include <dune/tectonic/quadraticenergy.hh>
 
 /** \brief Base class for problems where each block can be solved with a
  * modified gradient method */
@@ -105,8 +105,7 @@ class MyBlockProblem : /* NOT PUBLIC */ BlockNonlinearGSProblem<ConvexProblem> {
 
     v /= vnorm; // Rescale for numerical stability
 
-    MyDirectionalConvexFunction<
-        GlobalFriction<MatrixType, VectorType>> const
+    MyDirectionalConvexFunction<GlobalFriction<MatrixType, VectorType>> const
     psi(computeDirectionalA(problem_.A, v),
         computeDirectionalb(problem_.A, problem_.f, u, v), problem_.phi, u, v);
 

src/sand-wedge-data/special_writer.hh

@@ -6,6 +6,7 @@
 
 #include <dune/common/fvector.hh>
 #include <dune/grid/utility/hierarchicsearch.hh>
+#include <dune/fufem/functions/virtualgridfunction.hh>
 
 #include "mygeometry.hh"
 

src/sand-wedge.cc

@@ -43,7 +43,6 @@
 #pragma clang diagnostic pop
 
 #include <dune/grid/common/mcmgmapper.hh>
-#include <dune/grid/utility/structuredgridfactory.hh>
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/bvector.hh>
 
@@ -54,7 +53,6 @@
 
 #include <dune/fufem/dunepython.hh>
 #include <dune/fufem/functions/basisgridfunction.hh>
-#include <dune/fufem/functionspacebases/p1nodalbasis.hh>
 #include <dune/fufem/sharedpointermap.hh>
 #include <dune/solvers/norms/energynorm.hh>
 #include <dune/solvers/norms/sumnorm.hh>

src/state.hh

 #ifndef SRC_STATE_HH
 #define SRC_STATE_HH
 
+#include <memory>
+
 #include <dune/common/bitsetvector.hh>
 
 #include "enums.hh"

src/state/ageinglawstateupdater.hh

 #ifndef SRC_STATE_AGEINGLAWSTATEUPDATER_HH
 #define SRC_STATE_AGEINGLAWSTATEUPDATER_HH
 
-#include "tobool.hh"
+#include "../tobool.hh"
 #include "stateupdater.hh"
 
 template <class ScalarVector, class Vector>

src/state/sliplawstateupdater.hh

 #ifndef SRC_STATE_SLIPLAWSTATEUPDATER_HH
 #define SRC_STATE_SLIPLAWSTATEUPDATER_HH
 
-#include "tobool.hh"
+#include "../tobool.hh"
 #include "stateupdater.hh"
 
 template <class ScalarVector, class Vector>

src/timestepping.hh

 #ifndef SRC_TIMESTEPPING_HH
 #define SRC_TIMESTEPPING_HH
 
+#include <memory>
+
 #include "enums.hh"
 #include <dune/common/bitsetvector.hh>
 

src/tobool.hh

 #ifndef SRC_TOBOOL_HH
 #define SRC_TOBOOL_HH
 
+#include <dune/common/bitsetvector.hh>
+
 template <class Alloc>
 bool toBool(Dune::BitSetVectorConstReference<1, Alloc> x) {
   return x[0];