Commit 1d8585c8 authored by Andreas Lauser's avatar Andreas Lauser
Browse files

fix 'make headercheck'

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7514 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 834b576e
......@@ -28,6 +28,11 @@
#ifndef DUMUX_MPNC_DIFFUSION_HH
#define DUMUX_MPNC_DIFFUSION_HH
#include <dune/common/fmatrix.hh>
#include <dune/common/fvector.hh>
#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
namespace Dumux {
template <class TypeTag, bool enableDiffusion>
......
......@@ -30,6 +30,12 @@
#ifndef DUMUX_MPNC_ENERGY_FLUX_VARIABLES_HH
#define DUMUX_MPNC_ENERGY_FLUX_VARIABLES_HH
#include <dune/common/fmatrix.hh>
#include <dune/common/fvector.hh>
#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
#include <dumux/common/spline.hh>
namespace Dumux
{
......
......@@ -29,6 +29,8 @@
#ifndef DUMUX_MPNC_LOCAL_RESIDUAL_ENERGY_HH
#define DUMUX_MPNC_LOCAL_RESIDUAL_ENERGY_HH
#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
namespace Dumux {
/*!
......
......@@ -29,6 +29,7 @@
#ifndef DUMUX_MPNC_ENERGY_VOLUME_VARIABLES_HH
#define DUMUX_MPNC_ENERGY_VOLUME_VARIABLES_HH
#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
namespace Dumux
......
......@@ -27,6 +27,8 @@
#ifndef DUMUX_MPNC_MASS_INDICES_HH
#define DUMUX_MPNC_MASS_INDICES_HH
#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
namespace Dumux
{
/*!
......
......@@ -24,9 +24,15 @@
#define DUMUX_MPNC_LOCAL_RESIDUAL_MASS_HH
#include <dune/common/fvector.hh>
#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
#include <dumux/material/constraintsolvers/compositionfromfugacities.hh>
#include <dumux/common/math.hh>
#include <dumux/common/spline.hh>
#include "../diffusion/diffusion.hh"
#include "../energy/MpNclocalresidualenergy.hh"
namespace Dumux
{
......
......@@ -27,6 +27,8 @@
#ifndef DUMUX_MPNC_VOLUME_VARIABLES_MASS_HH
#define DUMUX_MPNC_VOLUME_VARIABLES_MASS_HH
#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
namespace Dumux
......
......@@ -35,8 +35,6 @@
//Dumux-includes
#include <dumux/decoupled/common/decoupledproperties.hh>
#include <dumux/linear/seqsolverbackend.hh>
#include "1pindices.hh"
namespace Dumux
{
......@@ -44,12 +42,15 @@ namespace Dumux
////////////////////////////////
// forward declarations
////////////////////////////////
template <class TypeTag>
class CellData1P;
////////////////////////////////
// properties
////////////////////////////////
namespace Properties
{
//////////////////////////////////////////////////////////////////
// Type tags
//////////////////////////////////////////////////////////////////
......@@ -61,17 +62,18 @@ NEW_TYPE_TAG(DecoupledOneP, INHERITS_FROM(DecoupledModel));
// Property tags
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG( SpatialParameters )
; //!< The type of the spatial parameters object
NEW_PROP_TAG( EnableGravity)
; //!< Returns whether gravity is considered in the problem
NEW_PROP_TAG( Fluid )
; //!< The fluid for one-phase models
NEW_PROP_TAG( SpatialParameters ); //!< The type of the spatial parameters object
NEW_PROP_TAG( EnableGravity); //!< Returns whether gravity is considered in the problem
NEW_PROP_TAG( Fluid ); //!< The fluid for one-phase models
NEW_PROP_TAG( Indices );
NEW_PROP_TAG( CellData );
}
}
#include <dumux/linear/seqsolverbackend.hh>
#include <dumux/decoupled/common/variableclass.hh>
#include <dumux/decoupled/1p/cellData1p.hh>
#include <dumux/decoupled/1p/1pindices.hh>
namespace Dumux
{
......
......@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
#ifndef DUMUX_ELEMENTDATA1P_HH
#define DUMUX_ELEMENTDATA1P_HH
#ifndef DUMUX_CELLDATA1P_HH
#define DUMUX_CELLDATA1P_HH
#include "1pproperties.hh"
#include "fluxData1p.hh"
......@@ -31,6 +31,9 @@
namespace Dumux
{
template<class TypeTag>
class FluxData1P;
/*!
* \ingroup IMPES
*/
......
......@@ -22,6 +22,8 @@
#ifndef DUMUX_FVVELOCITY1P_HH
#define DUMUX_FVVELOCITY1P_HH
#include<dumux/decoupled/1p/1pproperties.hh>
/**
* @file
* @brief Single Phase Finite Volume Model
......
......@@ -41,10 +41,11 @@
namespace Dumux
{
////////////////////////////////
// forward declarations
////////////////////////////////
template <class TypeTag, bool enableCompressibility>
class CellData2P;
////////////////////////////////
// properties
......
......@@ -37,7 +37,7 @@
//Dumux-includes
#include <dumux/decoupled/common/impetproperties.hh>
#include <dumux/decoupled/2p/transport/transportproperties.hh>
#include <dumux/decoupled/common/transportproperties.hh>
#include "2pindices.hh"
namespace Dumux
......
......@@ -31,6 +31,9 @@
namespace Dumux
{
template<class TypeTag>
class FluxData2P;
/*!
* \ingroup IMPES
*/
......@@ -44,8 +47,6 @@ namespace Dumux
template<class TypeTag, bool enableCompressibility>
class CellData2P;
template<class TypeTag>
class CellData2P<TypeTag, false>
{
......
......@@ -29,6 +29,7 @@
*/
#include <dune/grid/common/gridenums.hh>
#include <dumux/decoupled/2p/2pproperties.hh>
namespace Dumux
{
......
......@@ -26,6 +26,8 @@
// dumux environment
#include <dumux/decoupled/common/fv/fvpressure.hh>
#include "fvmpfaopressureproperties2p.hh"
/**
* @file
* @brief Finite Volume MPFA O-method discretization of a pressure equation.
......
......@@ -37,18 +37,13 @@
namespace Dumux
{
template <class TypeTag>
class FVMPFAOVelocity2P;
namespace Properties
{
NEW_TYPE_TAG(FVMPFAOPressurePropertiesTwoP, INHERITS_FROM(PressureTwoP, MPFAProperties));
}
}
#include <dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh>
namespace Dumux
{
namespace Properties
{
SET_TYPE_PROP(FVMPFAOPressurePropertiesTwoP, PressureModel, Dumux::FVMPFAOVelocity2P<TypeTag>);
}
}// end of Dune namespace
......
......@@ -34,6 +34,9 @@
namespace Dumux
{
template<class TypeTag>
class FVMPFAOPressure2P;
/*! \ingroup FV2p
*
* \brief Velocity calculation for the MPFA-O method
......
......@@ -35,7 +35,7 @@
#include<dune/istl/bvector.hh>
#include<dune/istl/matrix.hh>
#include<dumux/common/boundaryconditions.hh>
#include<dumux/decoupled/common/decoupledproperties.hh>
/**
* @file
* @brief defines a class for piecewise linear finite element functions
......
......@@ -40,7 +40,10 @@
#include<dune/grid/common/quadraturerules.hh>
#include<dumux/common/boundaryconditions.hh>
#include "localstiffness.hh"
#include "mimeticpressureproperties2p.hh"
namespace Dumux
{
/*!
......
......@@ -37,6 +37,7 @@
// dumux environment
#include <dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh>
#include "mimeticpressureproperties2p.hh"
namespace Dumux
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment