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

[headercheck] Fix make headercheck

parent 7f42e655
......@@ -23,6 +23,8 @@
#ifndef BOUNDARY_TYPES_HH
#define BOUNDARY_TYPES_HH
#include <dune/common/deprecated.hh>
#include <dumux/common/valgrind.hh>
namespace Dumux
......
......@@ -26,24 +26,24 @@
#define DUMUX_POINTSOURCE_HH
#include <dumux/common/boundingboxtree.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/propertysystem.hh>
namespace Dumux
{
namespace Properties
{
// Property forward declarations
NEW_PROP_TAG(Scalar);
NEW_PROP_TAG(ElementVolumeVariables);
NEW_PROP_TAG(FVElementGeometry);
NEW_PROP_TAG(GridView);
NEW_PROP_TAG(ImplicitIsBox);
NEW_PROP_TAG(PointSource);
NEW_PROP_TAG(PrimaryVariables);
NEW_PROP_TAG(Problem);
NEW_PROP_TAG(FVElementGeometry);
NEW_PROP_TAG(ElementVolumeVariables);
NEW_PROP_TAG(PointSource);
NEW_PROP_TAG(ImplicitIsBox);
NEW_PROP_TAG(Scalar);
NEW_PROP_TAG(TimeManager);
} // end namespace Properties
// forward declarations
......
......@@ -24,6 +24,7 @@
#ifndef DUMUX_CPGRID_CREATOR_HH
#define DUMUX_CPGRID_CREATOR_HH
#if (HAVE_DUNE_CORNERPOINT && HAVE_OPM_PARSER)
#include <dune/grid/CpGrid.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
......@@ -101,5 +102,6 @@ public:
}
};
}
#endif // (HAVE_DUNE_CORNERPOINT && HAVE_OPM_PARSER)
#endif
......@@ -27,6 +27,8 @@
#ifndef DUMUX_EFF_TO_ABS_LAW_HH
#define DUMUX_EFF_TO_ABS_LAW_HH
#include <dune/common/exceptions.hh>
#include "efftoabslawparams.hh"
namespace Dumux
......
......@@ -27,6 +27,7 @@
#include <dune/common/deprecated.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh>
#include <dumux/porousmediumflow/2p2c/implicit/indices.hh>
#include <dumux/porousmediumflow/2p2c/implicit/properties.hh>
namespace Dumux
......
......@@ -26,6 +26,7 @@
#include <dune/common/deprecated.hh>
#include <dumux/porousmediumflow/2p2c/implicit/indices.hh>
#include <dumux/porousmediumflow/2p2c/implicit/localresidual.hh>
#include <dumux/porousmediumflow/2p2c/implicit/properties.hh>
......
......@@ -25,6 +25,7 @@
#ifndef DUMUX_NEWTON_CONTROLLER_HH
#define DUMUX_NEWTON_CONTROLLER_HH
#include <dumux/common/basicproperties.hh>
#include <dumux/common/propertysystem.hh>
#include <dumux/common/exceptions.hh>
#include <dumux/common/math.hh>
......@@ -32,6 +33,7 @@
#include <dumux/linear/seqsolverbackend.hh>
#include "newtonconvergencewriter.hh"
#include "newtonmethod.hh"
namespace Dumux
{
......@@ -69,6 +71,11 @@ NEW_PROP_TAG(NewtonWriteConvergence);
//! if the current solution deviates too much from the evaluation point
NEW_PROP_TAG(ImplicitEnablePartialReassemble);
//! Specify whether the jacobian matrix of the last iteration of a
//! time step should be re-used as the jacobian of the first iteration
//! of the next time step.
NEW_PROP_TAG(ImplicitEnableJacobianRecycling);
/*!
* \brief Specifies whether the update should be done using the line search
* method instead of the plain Newton method.
......
......@@ -25,10 +25,18 @@
#ifndef DUMUX_NEWTON_CONVERGENCE_WRITER_HH
#define DUMUX_NEWTON_CONVERGENCE_WRITER_HH
#include <dumux/common/basicproperties.hh>
#include "newtoncontroller.hh"
namespace Dumux
{
namespace Properties
{
NEW_PROP_TAG(NewtonController);
NEW_PROP_TAG(SolutionVector);
}
/*!
* \ingroup Newton
* \brief Writes the intermediate solutions during
......
......@@ -60,8 +60,8 @@ NEW_TYPE_TAG(FVPressureVelocityOneP, INHERITS_FROM(PressureOneP));
}
}
#include "fvvelocity1p.hh"
#include "fvpressurevelocity1p.hh"
#include "velocity.hh"
#include "pressurevelocity.hh"
namespace Dumux
{
......
......@@ -60,8 +60,8 @@ NEW_TYPE_TAG(FVPressureVelocityTwoP, INHERITS_FROM(PressureTwoP));
}
}
#include "fvvelocity2p.hh"
#include "fvpressurevelocity2p.hh"
#include "velocity.hh"
#include "pressurevelocity.hh"
namespace Dumux
{
......
......@@ -48,11 +48,6 @@ SET_TYPE_PROP(Stokes2cniSubProblem, Problem, Dumux::Stokes2cniSubProblem<TypeTag
// Use the Stokes2cniCouplingLocalResidual for the computation of the local residual in the Stokes domain
SET_TYPE_PROP(Stokes2cniSubProblem, LocalResidual, StokesncniCouplingLocalResidual<TypeTag>);
// Set the property for the material parameters by extracting it from the material law.
SET_TYPE_PROP(Stokes2cniSubProblem,
MaterialLawParams,
typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
// Used the fluid system from the coupled problem
SET_TYPE_PROP(Stokes2cniSubProblem,
FluidSystem,
......
......@@ -45,11 +45,6 @@ SET_TYPE_PROP(ZeroEq2cniSubProblem, Problem, Dumux::ZeroEq2cniSubProblem<TypeTag
// Use the StokesncniCouplingLocalResidual for the computation of the local residual in the ZeroEq domain
SET_TYPE_PROP(ZeroEq2cniSubProblem, LocalResidual, StokesncniCouplingLocalResidual<TypeTag>);
// Set the property for the material parameters by extracting it from the material law.
SET_TYPE_PROP(ZeroEq2cniSubProblem,
MaterialLawParams,
typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
// Use the fluid system from the coupled problem
SET_TYPE_PROP(ZeroEq2cniSubProblem,
FluidSystem,
......
......@@ -42,11 +42,6 @@ NEW_TYPE_TAG(Stokes2cSubProblem,
// Set the problem property
SET_TYPE_PROP(Stokes2cSubProblem, Problem, Dumux::Stokes2cSubProblem<TypeTag>);
// Set the property for the material parameters by extracting it from the material law.
SET_TYPE_PROP(Stokes2cSubProblem,
MaterialLawParams,
typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
// Use the local residual extended for the coupling the local residual extended for the coupling
SET_TYPE_PROP(Stokes2cSubProblem, LocalResidual, StokesncCouplingLocalResidual<TypeTag>);
......
......@@ -42,11 +42,6 @@ NEW_TYPE_TAG(ZeroEq2cSubProblem,
// Set the problem property
SET_TYPE_PROP(ZeroEq2cSubProblem, Problem, Dumux::ZeroEq2cSubProblem<TypeTag>);
// Set the property for the material parameters by extracting it from the material law.
SET_TYPE_PROP(ZeroEq2cSubProblem,
MaterialLawParams,
typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
// Use the StokencCouplingLocalResidual for the computation of the local residual in the ZeroEq domain
SET_TYPE_PROP(ZeroEq2cSubProblem, LocalResidual,
StokesncCouplingLocalResidual<TypeTag>);
......
......@@ -19,6 +19,7 @@
#ifndef DUMUX_CC2P_CORNERPOINT_PROBLEM_HH
#define DUMUX_CC2P_CORNERPOINT_PROBLEM_HH
#if HAVE_DUNE_CORNERPOINT
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/dnapl.hh>
#include <dumux/porousmediumflow/2p/implicit/model.hh>
......@@ -340,4 +341,6 @@ private:
};
} //end namespace
#endif // HAVE_DUNE_CORNERPOINT
#endif
......@@ -23,9 +23,13 @@
* a cornerpoint grid.
*/
#include <config.h>
#if (HAVE_DUNE_CORNERPOINT && HAVE_OPM_CORE && HAVE_OPM_PARSER)
#include "cc2pcornerpointproblem.hh"
#include <dumux/common/start.hh>
#include <opm/core/io/eclipse/EclipseGridInspector.hpp>
/*!
* \brief Provides an interface for customizing error messages associated with
* reading in parameters.
......@@ -60,4 +64,11 @@ int main(int argc, char** argv)
{
typedef TTAG(CC2PCornerPointProblem) TypeTag;
return Dumux::start<TypeTag>(argc, argv, usage);
#else
int main(int argc, char** argv)
{
#warning You need to have dune-cornerpoint, opm-core and opm-parser installed to run this test
std::cerr << "You need to have dune-cornerpoint, opm-core and opm-parser installed to run this test\n";
return 77;
}
#endif
......@@ -22,7 +22,7 @@
* \brief spatial parameters for the sequential tutorial
*/
#ifndef DUMUX_TUTORIAL_EX5_SPATIAL_PARAMS_DECOUPLED_HH
#define DUMUX_TUTORIAL_EX%_SPATIAL_PARAMS_DECOUPLED_HH
#define DUMUX_TUTORIAL_EX5_SPATIAL_PARAMS_DECOUPLED_HH
#include <dumux/material/spatialparams/fv.hh>
......
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