Commit da948ebb authored by Thomas Fetzer's avatar Thomas Fetzer
Browse files

[headercheck]

fixed headercheck by forward declaration of properties and includes of
the correct headers

reviewed by martins and timok


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15059 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 61601c0b
......@@ -19,9 +19,12 @@
#ifndef DUMUX_ADAPTATIONHELPER_HH
#define DUMUX_ADAPTATIONHELPER_HH
#include <dune/common/version.hh>
#include <dune/grid/common/gridenums.hh>
#include <dune/grid/utility/persistentcontainer.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
//#include <dumux/linear/vectorexchange.hh>
#include <dumux/common/propertysystem.hh>
/**
* @file
......@@ -31,6 +34,15 @@
namespace Dumux
{
namespace Properties
{
NEW_PROP_TAG(GridView);
NEW_PROP_TAG(ImplicitIsBox);
NEW_PROP_TAG(PrimaryVariables);
NEW_PROP_TAG(Problem);
NEW_PROP_TAG(Scalar);
}
template<class TypeTag>
class AdaptationHelper
{
......
......@@ -29,9 +29,16 @@
#include <dune/common/exceptions.hh>
#include <dumux/common/propertysystem.hh>
namespace Dumux
{
namespace Properties
{
NEW_PROP_TAG(SolutionVector);
}
/*!\ingroup ImplicitGridAdapt
* @brief Standard Module for h-adaptive simulations
*
......
......@@ -19,12 +19,21 @@
#ifndef DUMUX_IMPLICIT_GRIDADAPTINDICATORDEFAULT_HH
#define DUMUX_IMPLICIT_GRIDADAPTINDICATORDEFAULT_HH
#include <dumux/common/propertysystem.hh>
/**
* @file
* @brief Class defining a default indicator for grid adaptation
*/
namespace Dumux
{
namespace Properties
{
NEW_PROP_TAG(GridView);
NEW_PROP_TAG(Problem);
}
/*!\ingroup ImplicitGridAdaptIndicator
* @brief Class defining a default indicator for grid adaptation
*
......
......@@ -29,6 +29,14 @@
*/
namespace Dumux
{
namespace Properties
{
NEW_PROP_TAG(BoundaryTypes);
NEW_PROP_TAG(PrimaryVariables);
NEW_PROP_TAG(NumEq);
}
/*!\ingroup ImplicitGridAdaptInitializationIndicator
* @brief Class defining an initialization indicator for grid adaptation
*
......
......@@ -64,7 +64,9 @@ namespace Properties
NEW_TYPE_TAG(ThreeDTwoPTestProblem, INHERITS_FROM(Test3d2pSpatialParams));
// Set the grid type
#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
SET_TYPE_PROP(ThreeDTwoPTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
#endif
// Set the problem property
SET_TYPE_PROP(ThreeDTwoPTestProblem, Problem, Dumux::Test3D2PProblem<TypeTag>);
......
......@@ -58,7 +58,9 @@ namespace Properties
NEW_TYPE_TAG(TestIMPESAdaptiveProblem, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, TestIMPESAdaptiveSpatialParams));
// Set the grid type
#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
SET_TYPE_PROP(TestIMPESAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
#endif
// set the GridCreator property
SET_TYPE_PROP(TestIMPESAdaptiveProblem, GridCreator, CubeGridCreator<TypeTag>);
......
......@@ -67,7 +67,9 @@ namespace Properties
NEW_TYPE_TAG(MPFATwoPTestProblem, INHERITS_FROM(Test2PSpatialParams));
// Set the grid type
#if HAVE_ALUGRID || HAVE_DUNE_ALUGRID
SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
#endif
#if PROBLEM == 2
//set the GridCreator property
......
......@@ -24,15 +24,13 @@
#ifndef DUMUX_COMBUSTION_SPATIALPARAMS_HH
#define DUMUX_COMBUSTION_SPATIALPARAMS_HH
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dune/common/parametertreeparser.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
#include <dumux/material/fluidmatrixinteractions/mp/2padapter.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dune/common/parametertreeparser.hh>
#include <dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/mp/2padapter.hh>
#include <dumux/material/spatialparams/implicitspatialparams.hh>
namespace Dumux
{
......@@ -43,6 +41,13 @@ class CombustionSpatialParams;
namespace Properties
{
// Some forward declarations
NEW_PROP_TAG(EnableEnergy);
NEW_PROP_TAG(FluidState);
NEW_PROP_TAG(FluidSystem);
NEW_PROP_TAG(NumEnergyEquations);
NEW_PROP_TAG(NumPhases);
// The spatial params TypeTag
NEW_TYPE_TAG(CombustionSpatialParams);
......
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