From 464f8528b3bbafc309a78e79047edc073d766901 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 22 Jun 2014 13:13:38 +0200
Subject: [PATCH] [Cleanup] Includes
---
dune/tectonic/frictionpotential.hh | 2 +-
dune/tectonic/globalfriction.hh | 2 +-
dune/tectonic/globalratestatefriction.hh | 2 +-
dune/tectonic/localfriction.hh | 2 +-
dune/tectonic/minimisation.hh | 2 +-
dune/tectonic/myblockproblem.hh | 11 +++++------
src/sand-wedge-data/special_writer.hh | 1 +
src/sand-wedge.cc | 2 --
src/state.hh | 2 ++
src/state/ageinglawstateupdater.hh | 2 +-
src/state/sliplawstateupdater.hh | 2 +-
src/timestepping.hh | 2 ++
src/tobool.hh | 2 ++
13 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh
index 272419c0..e3f1d27c 100644
--- a/dune/tectonic/frictionpotential.hh
+++ b/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:
diff --git a/dune/tectonic/globalfriction.hh b/dune/tectonic/globalfriction.hh
index 418a9b49..579134e1 100644
--- a/dune/tectonic/globalfriction.hh
+++ b/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:
diff --git a/dune/tectonic/globalratestatefriction.hh b/dune/tectonic/globalratestatefriction.hh
index 1ec07017..0e30a7ba 100644
--- a/dune/tectonic/globalratestatefriction.hh
+++ b/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>
diff --git a/dune/tectonic/localfriction.hh b/dune/tectonic/localfriction.hh
index d780bf35..5cda30a6 100644
--- a/dune/tectonic/localfriction.hh
+++ b/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:
diff --git a/dune/tectonic/minimisation.hh b/dune/tectonic/minimisation.hh
index 4d4b172b..fcb9106e 100644
--- a/dune/tectonic/minimisation.hh
+++ b/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>
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index f4b17972..177c6fba 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/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);
diff --git a/src/sand-wedge-data/special_writer.hh b/src/sand-wedge-data/special_writer.hh
index dfaa2243..07dfacf7 100644
--- a/src/sand-wedge-data/special_writer.hh
+++ b/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"
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index 7dd1555a..8c562f87 100644
--- a/src/sand-wedge.cc
+++ b/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>
diff --git a/src/state.hh b/src/state.hh
index 1aed2528..cfa60f94 100644
--- a/src/state.hh
+++ b/src/state.hh
@@ -1,6 +1,8 @@
#ifndef SRC_STATE_HH
#define SRC_STATE_HH
+#include <memory>
+
#include <dune/common/bitsetvector.hh>
#include "enums.hh"
diff --git a/src/state/ageinglawstateupdater.hh b/src/state/ageinglawstateupdater.hh
index da2ed02d..abdb39f2 100644
--- a/src/state/ageinglawstateupdater.hh
+++ b/src/state/ageinglawstateupdater.hh
@@ -1,7 +1,7 @@
#ifndef SRC_STATE_AGEINGLAWSTATEUPDATER_HH
#define SRC_STATE_AGEINGLAWSTATEUPDATER_HH
-#include "tobool.hh"
+#include "../tobool.hh"
#include "stateupdater.hh"
template <class ScalarVector, class Vector>
diff --git a/src/state/sliplawstateupdater.hh b/src/state/sliplawstateupdater.hh
index 8f07fce6..fa03bf70 100644
--- a/src/state/sliplawstateupdater.hh
+++ b/src/state/sliplawstateupdater.hh
@@ -1,7 +1,7 @@
#ifndef SRC_STATE_SLIPLAWSTATEUPDATER_HH
#define SRC_STATE_SLIPLAWSTATEUPDATER_HH
-#include "tobool.hh"
+#include "../tobool.hh"
#include "stateupdater.hh"
template <class ScalarVector, class Vector>
diff --git a/src/timestepping.hh b/src/timestepping.hh
index b95dff84..71d99b69 100644
--- a/src/timestepping.hh
+++ b/src/timestepping.hh
@@ -1,6 +1,8 @@
#ifndef SRC_TIMESTEPPING_HH
#define SRC_TIMESTEPPING_HH
+#include <memory>
+
#include "enums.hh"
#include <dune/common/bitsetvector.hh>
diff --git a/src/tobool.hh b/src/tobool.hh
index da60e905..6f699601 100644
--- a/src/tobool.hh
+++ b/src/tobool.hh
@@ -1,6 +1,8 @@
#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];
--
GitLab