Commit b088adc6 authored by Markus Wolff's avatar Markus Wolff
Browse files

fixed errors of headercheck for decoupled models while the models/tests still compile!



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7519 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent e87a60a0
......@@ -26,7 +26,7 @@
// dumux environment
#include <dumux/decoupled/common/fv/fvpressure.hh>
#include <dumux/decoupled/2p/2pproperties.hh>
#include <dumux/decoupled/2p/diffusion/diffusionproperties2p.hh>
/**
* @file
......
......@@ -29,7 +29,7 @@
*/
#include <dune/grid/common/gridenums.hh>
#include <dumux/decoupled/2p/2pproperties.hh>
#include <dumux/decoupled/2p/diffusion/diffusionproperties2p.hh>
namespace Dumux
{
......
......@@ -25,8 +25,8 @@
// dumux environment
#include <dumux/decoupled/common/fv/fvpressure.hh>
#include "fvmpfaopressureproperties2p.hh"
#include <dumux/decoupled/2p/diffusion/diffusionproperties2p.hh>
#include <dumux/decoupled/common/fv/mpfa/fvmpfaproperties.hh>
/**
* @file
......
......@@ -37,13 +37,18 @@
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
......
......@@ -40,10 +40,8 @@
#include<dune/grid/common/quadraturerules.hh>
#include<dumux/common/boundaryconditions.hh>
#include "localstiffness.hh"
#include "mimeticpressureproperties2p.hh"
#include <dumux/decoupled/2p/diffusion/diffusionproperties2p.hh>
namespace Dumux
{
/*!
......
......@@ -36,8 +36,9 @@
#include <dune/istl/preconditioners.hh>
// dumux environment
#include <dumux/decoupled/2p/diffusion/diffusionproperties2p.hh>
#include <dumux/decoupled/common/mimetic/mimeticproperties.hh>
#include <dumux/decoupled/2p/diffusion/mimetic/mimeticoperator.hh>
#include "mimeticpressureproperties2p.hh"
namespace Dumux
{
......
......@@ -31,22 +31,19 @@
* \brief Defines the properties required for (immiscible) twophase sequential models.
*/
#ifndef DUMUX_MIMETICPROPERTIES_DECOUPLED_HH
#define DUMUX_MIMETICPROPERTIES_DECOUPLED_HH
#ifndef DUMUX_MIMETICPROPERTIES2P_DECOUPLED_HH
#define DUMUX_MIMETICPROPERTIES2P_DECOUPLED_HH
//Dumux-includes
#include <dumux/decoupled/2p/diffusion/diffusionproperties2p.hh>
#include <dumux/decoupled/common/mimetic/mimeticproperties.hh>
namespace Dumux
{
////////////////////////////////
// forward declarations
////////////////////////////////
template <class TypeTag>
class MimeticGroundwaterEquationLocalStiffness;
template <class TypeTag>
class MimeticPressure2P;
////////////////////////////////
// properties
......@@ -58,13 +55,22 @@ namespace Properties
//////////////////////////////////////////////////////////////////
//! The type tag for the two-phase problems
NEW_TYPE_TAG(MimeticPressureTwoP, INHERITS_FROM(PressureTwoP));
NEW_TYPE_TAG(MimeticPressureTwoP, INHERITS_FROM(PressureTwoP, Mimetic))
;
//////////////////////////////////////////////////////////////////
// Property tags
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG( LocalStiffness); //!< The type of communication needed for the mimetic operator
}
}
#include <dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh>
#include <dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh>
namespace Dumux
{
namespace Properties
{
SET_TYPE_PROP(MimeticPressureTwoP, PressureModel, MimeticPressure2P<TypeTag>);
SET_TYPE_PROP(MimeticPressureTwoP, LocalStiffness, MimeticGroundwaterEquationLocalStiffness<TypeTag>);
}
......
......@@ -20,7 +20,7 @@
#ifndef DUMUX_GRIDADAPTIONINDICATOR2P_HH
#define DUMUX_GRIDADAPTIONINDICATOR2P_HH
#include <dumux/decoupled/2p/impes/impesproperties2padaptive.hh>
#include "impesproperties2p.hh"
/**
* @file
......
......@@ -60,6 +60,7 @@ NEW_TYPE_TAG(IMPESTwoPAdaptive, INHERITS_FROM(IMPET, DecoupledTwoP));
#include <dumux/decoupled/common/variableclass_adaptive.hh>
#include <dumux/decoupled/2p/cellData2p_adaptive.hh>
#include "gridadaptionindicator2p.hh"
namespace Dumux
{
......@@ -68,6 +69,7 @@ namespace Properties
SET_BOOL_PROP(IMPESTwoPAdaptive, AdaptiveGrid, true);
SET_TYPE_PROP(IMPESTwoPAdaptive, Variables, Dumux::VariableClassAdaptive<TypeTag>);
SET_TYPE_PROP(IMPESTwoPAdaptive, CellData, Dumux::CellData2PAdaptive<TypeTag>);
SET_TYPE_PROP(IMPESTwoPAdaptive, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
}
}
......
......@@ -24,7 +24,7 @@
#define DUMUX_CAPILLARYDIFFUSION_HH
#include <dumux/decoupled/2p/transport/fv/diffusivepart.hh>
#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
#include "fvtransportproperties2p.hh"
/**
* @file
* @brief Class for defining the diffusive capillary pressure term of a 2p saturation equation
......
......@@ -23,7 +23,7 @@
#ifndef DUMUX_DIFFUSIVEPART_HH
#define DUMUX_DIFFUSIVEPART_HH
#include <dumux/decoupled/2p/2pproperties.hh>
#include <dumux/decoupled/2p/transport/transportproperties2p.hh>
/**
* @file
......
......@@ -22,7 +22,7 @@
#ifndef DUMUX_FVSATURATION2P_HH
#define DUMUX_FVSATURATION2P_HH
#include "fvtransportproperties2p.hh"
#include <dumux/decoupled/2p/transport/transportproperties2p.hh>
#include "dumux/decoupled/common/fv/fvtransport.hh"
/**
......
......@@ -34,18 +34,12 @@
*/
namespace Dumux
{
//////////////////////////////////////////////////////////////////
// Forward Declarations
//////////////////////////////////////////////////////////////////
template <class TypeTag>
class FVSaturation2P;
namespace Properties
{
// \{
//////////////////////////////////////////////////////////////////
// Type tags
// Type tags tags
//////////////////////////////////////////////////////////////////
//! The type tag for models based on the diffusion-scheme
......@@ -54,9 +48,6 @@ NEW_TYPE_TAG(FVTransportTwoP, INHERITS_FROM(TransportTwoP));
//////////////////////////////////////////////////////////////////
// Property tags
//////////////////////////////////////////////////////////////////
NEW_PROP_TAG( CapillaryFlux ); //!< The type of the diffusive part in a transport equation
NEW_PROP_TAG( GravityFlux ); //!< The type of a convective part in a transport equation
NEW_PROP_TAG( PrecomputedConstRels );
}
}
......
......@@ -30,6 +30,7 @@
#include "transportproperties2p.hh"
#include <dumux/decoupled/common/onemodelproblem.hh>
#include <dumux/decoupled/common/fv/velocitydefault.hh>
namespace Dumux
{
......
......@@ -49,21 +49,8 @@ NEW_TYPE_TAG(TransportTwoP, INHERITS_FROM(Transport, DecoupledTwoP));
//////////////////////////////////////////////////////////////////
// Property tags
//////////////////////////////////////////////////////////////////
}
}
#include "gridadaptionindicator2p.hh"
#include <dumux/decoupled/common/fv/velocitydefault.hh>
namespace Dumux
{
namespace Properties
{
//////////////////////////////////////////////////////////////////
// Property tags
//////////////////////////////////////////////////////////////////
SET_TYPE_PROP(TransportTwoP, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
NEW_PROP_TAG( CapillaryFlux ); //!< The type of the diffusive part in a transport equation
NEW_PROP_TAG( GravityFlux ); //!< The type of a convective part in a transport equation
}
}
......
......@@ -88,12 +88,6 @@ namespace Dumux
{
namespace Properties
{
//////////////////////////////////////////////////////////////////
// Forward declarations
//////////////////////////////////////////////////////////////////
template <class TypeTag>
class VariableClass;
//////////////////////////////////////////////////////////////////
// Properties
//////////////////////////////////////////////////////////////////
......
......@@ -26,7 +26,6 @@
// dumux environment
#include "dumux/common/math.hh"
#include <dumux/decoupled/common/decoupledproperties.hh>
#include <dumux/decoupled/common/pressureproperties.hh>
/**
* @file
......
......@@ -30,7 +30,7 @@
#include <dune/grid/common/gridenums.hh>
#include <dumux/decoupled/1p/1pproperties.hh>
#include <dumux/decoupled/common/decoupledproperties.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