From 5d0bafd6a01a5bcc1fa5c44e9f9fc717d7f8b0de Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 13 Dec 2013 02:04:20 +0100
Subject: [PATCH] [Cleanup] Headers
---
src/enum_scheme.cc | 2 ++
src/enum_state_model.cc | 2 ++
src/one-body-sample.cc | 12 +++++-------
src/vtk.cc | 4 ++++
src/vtk.hh | 4 ----
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/enum_scheme.cc b/src/enum_scheme.cc
index 0327b541..bcf55059 100644
--- a/src/enum_scheme.cc
+++ b/src/enum_scheme.cc
@@ -1,5 +1,7 @@
#include <dune/common/exceptions.hh>
+#include "enums.hh"
+
template <> struct StringToEnum<Config::scheme> {
static Config::scheme convert(std::string const &s) {
if (s == "newmark")
diff --git a/src/enum_state_model.cc b/src/enum_state_model.cc
index 7195a016..eb062771 100644
--- a/src/enum_state_model.cc
+++ b/src/enum_state_model.cc
@@ -1,5 +1,7 @@
#include <dune/common/exceptions.hh>
+#include "enums.hh"
+
template <> struct StringToEnum<Config::stateModel> {
static Config::stateModel convert(std::string const &s) {
if (s == "Dieterich")
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 5ff08fd5..aa21696f 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -74,18 +74,16 @@
#include <dune/tectonic/globalnonlinearity.hh>
#include "assemblers.hh"
-#include "friction_writer.hh"
-#include "solverfactory.hh"
-#include "vtk.hh"
-
-#include "enums.hh"
#include "enum_parser.cc"
-#include "enum_state_model.cc"
#include "enum_scheme.cc"
+#include "enum_state_model.cc"
#include "enum_verbosity.cc"
-
+#include "enums.hh"
+#include "friction_writer.hh"
+#include "solverfactory.hh"
#include "state.hh"
#include "timestepping.hh"
+#include "vtk.hh"
size_t const dims = DIM;
diff --git a/src/vtk.cc b/src/vtk.cc
index c01d97a6..7383dfc0 100644
--- a/src/vtk.cc
+++ b/src/vtk.cc
@@ -2,6 +2,10 @@
#include "config.h"
#endif
+#include <dune/grid/io/file/vtk/vtkwriter.hh>
+
+#include <dune/fufem/functions/vtkbasisgridfunction.hh>
+
#include "vtk.hh"
template <class VertexBasis, class CellBasis, class Vector, class ScalarVector>
diff --git a/src/vtk.hh b/src/vtk.hh
index dfa3665a..5b06cd0a 100644
--- a/src/vtk.hh
+++ b/src/vtk.hh
@@ -1,10 +1,6 @@
#ifndef VTK_HH
#define VTK_HH
-#include <dune/grid/io/file/vtk/vtkwriter.hh>
-
-#include <dune/fufem/functions/vtkbasisgridfunction.hh>
-
template <class VertexBasis, class CellBasis, class Vector, class ScalarVector>
void writeVtk(VertexBasis const &vertexBasis, Vector const &displacement,
ScalarVector const &logState, CellBasis const &cellBasis,
--
GitLab