From c862561ebf15ada325657167a250227066a42168 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Tue, 17 Apr 2018 16:53:52 +0200
Subject: [PATCH] [headercheck] Fix large parts of make headercheck
---
dumux/discretization/box/elementfluxvariablescache.hh | 3 +++
dumux/discretization/cellcentered/gridvolumevariables.hh | 1 +
.../cellcentered/mpfa/elementfluxvariablescache.hh | 3 +++
.../cellcentered/mpfa/elementvolumevariables.hh | 4 +++-
.../cellcentered/tpfa/elementfluxvariablescache.hh | 2 ++
.../cellcentered/tpfa/elementvolumevariables.hh | 2 ++
dumux/discretization/fluxvariablesbase.hh | 2 ++
dumux/discretization/staggered/elementfacevariables.hh | 2 ++
dumux/discretization/staggered/elementfluxvariablescache.hh | 2 ++
dumux/discretization/staggered/elementvolumevariables.hh | 3 +++
dumux/discretization/staggered/facesolution.hh | 4 +++-
dumux/freeflow/navierstokes/staggered/fluxvariables.hh | 1 +
dumux/material/fluidsystems/3pimmiscible.hh | 3 ++-
dumux/porousmediumflow/1pnc/volumevariables.hh | 2 ++
dumux/porousmediumflow/1pnc/vtkoutputfields.hh | 2 ++
dumux/porousmediumflow/2p1c/primaryvariableswitch.hh | 2 ++
dumux/porousmediumflow/2p1c/volumevariables.hh | 3 +++
dumux/porousmediumflow/2p2c/primaryvariableswitch.hh | 2 ++
dumux/porousmediumflow/2pnc/primaryvariableswitch.hh | 2 ++
dumux/porousmediumflow/3p3c/primaryvariableswitch.hh | 2 ++
dumux/porousmediumflow/co2/primaryvariableswitch.hh | 2 ++
dumux/porousmediumflow/richardsnc/vtkoutputfields.hh | 2 ++
dumux/porousmediumflow/tracer/vtkoutputfields.hh | 2 ++
test/freeflow/navierstokes/l2error.hh | 3 +++
24 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/dumux/discretization/box/elementfluxvariablescache.hh b/dumux/discretization/box/elementfluxvariablescache.hh
index abd6d85679..dca7bf1a8d 100644
--- a/dumux/discretization/box/elementfluxvariablescache.hh
+++ b/dumux/discretization/box/elementfluxvariablescache.hh
@@ -23,6 +23,9 @@
#ifndef DUMUX_DISCRETIZATION_BOX_ELEMENT_FLUXVARSCACHE_HH
#define DUMUX_DISCRETIZATION_BOX_ELEMENT_FLUXVARSCACHE_HH
+#include <cstddef>
+#include <vector>
+
namespace Dumux {
/*!
diff --git a/dumux/discretization/cellcentered/gridvolumevariables.hh b/dumux/discretization/cellcentered/gridvolumevariables.hh
index be85257c75..b9b250ffd7 100644
--- a/dumux/discretization/cellcentered/gridvolumevariables.hh
+++ b/dumux/discretization/cellcentered/gridvolumevariables.hh
@@ -24,6 +24,7 @@
#ifndef DUMUX_DISCRETIZATION_CC_GRID_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_CC_GRID_VOLUMEVARIABLES_HH
+#include <vector>
#include <type_traits>
//! make the local view function available whenever we use this class
diff --git a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
index 6835c183e1..6be32c1867 100644
--- a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
@@ -25,7 +25,10 @@
#define DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_FLUXVARSCACHE_HH
#include <algorithm>
+#include <cassert>
#include <type_traits>
+#include <vector>
+
#include <dune/common/exceptions.hh>
namespace Dumux {
diff --git a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
index 4e8a7e37c0..926db5889c 100644
--- a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
@@ -24,8 +24,10 @@
#ifndef DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_VOLUMEVARIABLES_HH
-#include <utility>
+#include <algorithm>
#include <type_traits>
+#include <utility>
+#include <vector>
#include <dumux/discretization/cellcentered/elementsolution.hh>
diff --git a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
index b93bb79ad5..36a9d53b07 100644
--- a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
@@ -25,6 +25,8 @@
#define DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_FLUXVARSCACHE_HH
#include <algorithm>
+#include <cassert>
+#include <vector>
#include <dune/common/exceptions.hh>
namespace Dumux {
diff --git a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
index f28036fb48..9612e6c1ea 100644
--- a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
@@ -24,7 +24,9 @@
#ifndef DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_VOLUMEVARIABLES_HH
+#include <algorithm>
#include <type_traits>
+#include <vector>
#include <dumux/discretization/cellcentered/elementsolution.hh>
diff --git a/dumux/discretization/fluxvariablesbase.hh b/dumux/discretization/fluxvariablesbase.hh
index 037e1e8031..1d940072e5 100644
--- a/dumux/discretization/fluxvariablesbase.hh
+++ b/dumux/discretization/fluxvariablesbase.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_DISCRETIZATION_FLUXVARIABLESBASE_HH
#define DUMUX_DISCRETIZATION_FLUXVARIABLESBASE_HH
+#include <vector>
+
namespace Dumux {
/*!
diff --git a/dumux/discretization/staggered/elementfacevariables.hh b/dumux/discretization/staggered/elementfacevariables.hh
index 79b26709c8..c4aec037e1 100644
--- a/dumux/discretization/staggered/elementfacevariables.hh
+++ b/dumux/discretization/staggered/elementfacevariables.hh
@@ -25,6 +25,8 @@
#define DUMUX_DISCRETIZATION_STAGGERED_ELEMENTFACEVARIABLES_HH
#include <algorithm>
+#include <cassert>
+#include <vector>
namespace Dumux {
diff --git a/dumux/discretization/staggered/elementfluxvariablescache.hh b/dumux/discretization/staggered/elementfluxvariablescache.hh
index e0a5274ad4..7be5655c75 100644
--- a/dumux/discretization/staggered/elementfluxvariablescache.hh
+++ b/dumux/discretization/staggered/elementfluxvariablescache.hh
@@ -25,7 +25,9 @@
#define DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_FLUXVARSCACHE_HH
#include <algorithm>
+#include <cassert>
#include <iterator>
+#include <vector>
namespace Dumux {
diff --git a/dumux/discretization/staggered/elementvolumevariables.hh b/dumux/discretization/staggered/elementvolumevariables.hh
index 885a47a636..20cf881b72 100644
--- a/dumux/discretization/staggered/elementvolumevariables.hh
+++ b/dumux/discretization/staggered/elementvolumevariables.hh
@@ -25,7 +25,10 @@
#define DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_VOLUMEVARIABLES_HH
#include <algorithm>
+#include <cassert>
#include <iterator>
+#include <vector>
+
#include <dune/common/exceptions.hh>
namespace Dumux {
diff --git a/dumux/discretization/staggered/facesolution.hh b/dumux/discretization/staggered/facesolution.hh
index 745a81eec3..e497d64629 100644
--- a/dumux/discretization/staggered/facesolution.hh
+++ b/dumux/discretization/staggered/facesolution.hh
@@ -24,8 +24,10 @@
#ifndef DUMUX_DISCRETIZATION_STAGGERED_FACE_SOLUTION_HH
#define DUMUX_DISCRETIZATION_STAGGERED_FACE_SOLUTION_HH
-#include <vector>
+#include <algorithm>
+#include <cassert>
#include <type_traits>
+#include <vector>
namespace Dumux
{
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index b2c646b2b8..a264e7d2ed 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -25,6 +25,7 @@
#define DUMUX_NAVIERSTOKES_STAGGERED_FLUXVARIABLES_HH
#include <dumux/common/math.hh>
+#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/discretization/fluxvariablesbase.hh>
diff --git a/dumux/material/fluidsystems/3pimmiscible.hh b/dumux/material/fluidsystems/3pimmiscible.hh
index 9a66695f16..dda3c6ba50 100644
--- a/dumux/material/fluidsystems/3pimmiscible.hh
+++ b/dumux/material/fluidsystems/3pimmiscible.hh
@@ -24,8 +24,9 @@
#ifndef DUMUX_3P_IMMISCIBLE_FLUID_SYSTEM_HH
#define DUMUX_3P_IMMISCIBLE_FLUID_SYSTEM_HH
-#include <limits>
#include <cassert>
+#include <limits>
+#include <iostream>
#include <dune/common/exceptions.hh>
diff --git a/dumux/porousmediumflow/1pnc/volumevariables.hh b/dumux/porousmediumflow/1pnc/volumevariables.hh
index c0312d5fea..5a1f33dbb8 100644
--- a/dumux/porousmediumflow/1pnc/volumevariables.hh
+++ b/dumux/porousmediumflow/1pnc/volumevariables.hh
@@ -25,6 +25,8 @@
#ifndef DUMUX_1PNC_VOLUME_VARIABLES_HH
#define DUMUX_1PNC_VOLUME_VARIABLES_HH
+#include <dune/common/fvector.hh>
+
#include <dumux/porousmediumflow/volumevariables.hh>
namespace Dumux {
diff --git a/dumux/porousmediumflow/1pnc/vtkoutputfields.hh b/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
index 94d4d09214..aca6f54dd1 100644
--- a/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_ONEPNC_VTK_OUTPUT_FIELDS_HH
#define DUMUX_ONEPNC_VTK_OUTPUT_FIELDS_HH
+#include <string>
+
namespace Dumux {
/*!
diff --git a/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh b/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
index 0403405132..95b529e98a 100644
--- a/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2p1c/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_2P1C_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_2P1C_PRIMARY_VARIABLE_SWITCH_HH
+#include <iostream>
+
#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
namespace Dumux {
diff --git a/dumux/porousmediumflow/2p1c/volumevariables.hh b/dumux/porousmediumflow/2p1c/volumevariables.hh
index 13583f6b3f..c75c929a3d 100644
--- a/dumux/porousmediumflow/2p1c/volumevariables.hh
+++ b/dumux/porousmediumflow/2p1c/volumevariables.hh
@@ -24,6 +24,9 @@
#ifndef DUMUX_2P1C_VOLUME_VARIABLES_HH
#define DUMUX_2P1C_VOLUME_VARIABLES_HH
+#include <dune/common/exceptions.hh>
+
+#include <dumux/common/valgrind.hh>
#include <dumux/porousmediumflow/volumevariables.hh>
namespace Dumux {
diff --git a/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh b/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh
index 339d15a74f..7bc46bb83e 100644
--- a/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2p2c/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_2P2C_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_2P2C_PRIMARY_VARIABLE_SWITCH_HH
+#include <iostream>
+
#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
#include <dumux/porousmediumflow/2p/formulation.hh>
diff --git a/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh b/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
index db9ccb3425..56d9a72a04 100644
--- a/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2pnc/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_2PNC_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_2PNC_PRIMARY_VARIABLE_SWITCH_HH
+#include <iostream>
+
#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
#include <dumux/porousmediumflow/2p/formulation.hh>
diff --git a/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh b/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
index d2ce4ffc37..d68ba0da96 100644
--- a/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/3p3c/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_3P3C_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_3P3C_PRIMARY_VARIABLE_SWITCH_HH
+#include <iostream>
+
#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
namespace Dumux {
diff --git a/dumux/porousmediumflow/co2/primaryvariableswitch.hh b/dumux/porousmediumflow/co2/primaryvariableswitch.hh
index 30307aea24..32bc3211b8 100644
--- a/dumux/porousmediumflow/co2/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/co2/primaryvariableswitch.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_2P2C_CO2_PRIMARY_VARIABLE_SWITCH_HH
#define DUMUX_2P2C_CO2_PRIMARY_VARIABLE_SWITCH_HH
+#include <iostream>
+
#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
#include <dumux/porousmediumflow/2p/formulation.hh>
diff --git a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
index 8d760dfa8e..dbf43f0a00 100644
--- a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_RICHARDSNC_VTK_OUTPUT_FIELDS_HH
#define DUMUX_RICHARDSNC_VTK_OUTPUT_FIELDS_HH
+#include <dumux/common/parameters.hh>
+
namespace Dumux {
/*!
diff --git a/dumux/porousmediumflow/tracer/vtkoutputfields.hh b/dumux/porousmediumflow/tracer/vtkoutputfields.hh
index 7fd8bc6b0d..f8b3aa6c0d 100644
--- a/dumux/porousmediumflow/tracer/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/tracer/vtkoutputfields.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_TRACER_VTK_OUTPUT_FIELDS_HH
#define DUMUX_TRACER_VTK_OUTPUT_FIELDS_HH
+#include <string>
+
namespace Dumux {
/*!
diff --git a/test/freeflow/navierstokes/l2error.hh b/test/freeflow/navierstokes/l2error.hh
index 353a028af7..a714341166 100644
--- a/test/freeflow/navierstokes/l2error.hh
+++ b/test/freeflow/navierstokes/l2error.hh
@@ -24,6 +24,9 @@
#ifndef DUMUX_TEST_L2_ERROR_HH
#define DUMUX_TEST_L2_ERROR_HH
+#include <vector>
+#include <cmath>
+
namespace Dumux
{
--
GitLab