From fce4905d8bfafb926e8d64458f22aff93461be25 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 17 Oct 2014 20:43:56 +0200
Subject: [PATCH] [Cleanup] Fix up includes
---
src/sand-wedge.cc | 5 -----
src/state/ageinglawstateupdater.cc | 1 +
src/state/ageinglawstateupdater.hh | 1 -
src/state/sliplawstateupdater.cc | 1 +
src/state/sliplawstateupdater.hh | 1 -
src/timestepping.cc | 2 --
src/timestepping.hh | 3 ++-
7 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index 3c23e5d2..d529e770 100644
--- a/src/sand-wedge.cc
+++ b/src/sand-wedge.cc
@@ -43,8 +43,6 @@
#include <dune/fufem/functions/basisgridfunction.hh>
#include <dune/fufem/sharedpointermap.hh>
#include <dune/solvers/norms/energynorm.hh>
-#include <dune/solvers/norms/sumnorm.hh>
-#include <dune/solvers/norms/twonorm.hh>
#include <dune/solvers/solvers/loopsolver.hh>
#include <dune/solvers/solvers/solver.hh>
#include <dune/tnnmg/nonlinearities/zerononlinearity.hh>
@@ -56,12 +54,9 @@
#include "adaptivetimestepper.hh" // FIXME
#include "assemblers.hh"
-#include "tobool.hh"
-#include "coupledtimestepper.hh"
#include "distances.hh"
#include "enumparser.hh"
#include "enums.hh"
-#include "fixedpointiterator.hh"
#include "friction_writer.hh"
#include "gridselector.hh"
#include "sand-wedge-data/mybody.hh"
diff --git a/src/state/ageinglawstateupdater.cc b/src/state/ageinglawstateupdater.cc
index 51a91626..f9e48e25 100644
--- a/src/state/ageinglawstateupdater.cc
+++ b/src/state/ageinglawstateupdater.cc
@@ -1,4 +1,5 @@
#include "ageinglawstateupdater.hh"
+#include "../tobool.hh"
template <class ScalarVector, class Vector>
AgeingLawStateUpdater<ScalarVector, Vector>::AgeingLawStateUpdater(
diff --git a/src/state/ageinglawstateupdater.hh b/src/state/ageinglawstateupdater.hh
index 67ebab25..56ee7582 100644
--- a/src/state/ageinglawstateupdater.hh
+++ b/src/state/ageinglawstateupdater.hh
@@ -1,7 +1,6 @@
#ifndef SRC_STATE_AGEINGLAWSTATEUPDATER_HH
#define SRC_STATE_AGEINGLAWSTATEUPDATER_HH
-#include "../tobool.hh"
#include "stateupdater.hh"
template <class ScalarVector, class Vector>
diff --git a/src/state/sliplawstateupdater.cc b/src/state/sliplawstateupdater.cc
index acffc6f2..7afe3065 100644
--- a/src/state/sliplawstateupdater.cc
+++ b/src/state/sliplawstateupdater.cc
@@ -1,4 +1,5 @@
#include "sliplawstateupdater.hh"
+#include "../tobool.hh"
template <class ScalarVector, class Vector>
SlipLawStateUpdater<ScalarVector, Vector>::SlipLawStateUpdater(
diff --git a/src/state/sliplawstateupdater.hh b/src/state/sliplawstateupdater.hh
index 28838aec..851829ca 100644
--- a/src/state/sliplawstateupdater.hh
+++ b/src/state/sliplawstateupdater.hh
@@ -1,7 +1,6 @@
#ifndef SRC_STATE_SLIPLAWSTATEUPDATER_HH
#define SRC_STATE_SLIPLAWSTATEUPDATER_HH
-#include "../tobool.hh"
#include "stateupdater.hh"
template <class ScalarVector, class Vector>
diff --git a/src/timestepping.cc b/src/timestepping.cc
index af9edb2a..56346038 100644
--- a/src/timestepping.cc
+++ b/src/timestepping.cc
@@ -2,8 +2,6 @@
#include "config.h"
#endif
-#include <dune/istl/matrixindexset.hh>
-
#include "timestepping.hh"
#include "timestepping/backward_euler.cc"
diff --git a/src/timestepping.hh b/src/timestepping.hh
index 5ee20dce..524e7699 100644
--- a/src/timestepping.hh
+++ b/src/timestepping.hh
@@ -3,9 +3,10 @@
#include <memory>
-#include "enums.hh"
#include <dune/common/bitsetvector.hh>
+#include "enums.hh"
+
template <class Vector, class Matrix, class Function, size_t dim>
class TimeSteppingScheme {
public:
--
GitLab