From 86074f16fde9d0dff811a8466d2a7f04471b1187 Mon Sep 17 00:00:00 2001 From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de> Date: Fri, 11 May 2012 09:14:28 +0000 Subject: [PATCH] Fix some includes to make headercheck pass again. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8304 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/decoupled/2p2c/cellData2p2c.hh | 3 +-- dumux/decoupled/2p2c/fluxData2p2c.hh | 4 +++- dumux/material/fluidstates/nonequilibriumfluidstate.hh | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dumux/decoupled/2p2c/cellData2p2c.hh b/dumux/decoupled/2p2c/cellData2p2c.hh index 16b6efb7fd..21b66478c8 100644 --- a/dumux/decoupled/2p2c/cellData2p2c.hh +++ b/dumux/decoupled/2p2c/cellData2p2c.hh @@ -22,8 +22,7 @@ #ifndef DUMUX_ELEMENTDATA2P2C_HH #define DUMUX_ELEMENTDATA2P2C_HH -#include "2p2cproperties.hh" -#include <dumux/decoupled/2p2c/dec2p2cfluidstate.hh> +#include "dec2p2cfluidstate.hh" #include "fluxData2p2c.hh" /** diff --git a/dumux/decoupled/2p2c/fluxData2p2c.hh b/dumux/decoupled/2p2c/fluxData2p2c.hh index f2b893d4d0..eb66f5c001 100644 --- a/dumux/decoupled/2p2c/fluxData2p2c.hh +++ b/dumux/decoupled/2p2c/fluxData2p2c.hh @@ -22,6 +22,8 @@ #ifndef DUMUX_FLUXDATA2P2C_HH #define DUMUX_FLUXDATA2P2C_HH +#include <dumux/decoupled/common/decoupledproperties.hh> + /** * @file * @brief Class including the variables and data of discretized data of the constitutive relations @@ -39,7 +41,7 @@ namespace Dumux * mobilities, fractional flow functions and capillary pressure. Thus, they have to be callculated just once in every time step or every iteration step. * * @tparam TypeTag The Type Tag - 1*/ + */ template<class TypeTag> class FluxData2P2C { diff --git a/dumux/material/fluidstates/nonequilibriumfluidstate.hh b/dumux/material/fluidstates/nonequilibriumfluidstate.hh index 5e4b696159..d18173253f 100644 --- a/dumux/material/fluidstates/nonequilibriumfluidstate.hh +++ b/dumux/material/fluidstates/nonequilibriumfluidstate.hh @@ -29,11 +29,13 @@ #ifndef DUMUX_GENERIC_FLUID_STATE_HH #define DUMUX_GENERIC_FLUID_STATE_HH -#include <dumux/common/valgrind.hh> - #include <cmath> #include <algorithm> +#include <dune/common/exceptions.hh> + +#include <dumux/common/valgrind.hh> + namespace Dumux { /*! -- GitLab