Skip to content
Snippets Groups Projects
Commit 6fcebf8c authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

[sequential] Fix includes and properties

* include dumux/common/properties.hh
  instead of dumux/common/basicproperties.hh
* do not inherit from LinearSolverTypeTag and
  NumericModel anymore because those type tags don't exist anymore
parent 5fa4615f
No related branches found
No related tags found
Loading
......@@ -29,7 +29,7 @@
#include <dune/common/timer.hh>
#include <dune/common/parallel/mpihelper.hh>
#include "propertysystem.hh"
#include "properties.hh"
#include "parameters.hh"
namespace Dumux
......
......@@ -34,7 +34,7 @@
#include <dune/grid/utility/grapedataioformattypes.hh>
#endif
#include <dumux/common/basicproperties.hh>
#include <dumux/common/properties.hh>
namespace Dumux
{
......
......@@ -20,6 +20,7 @@
#define DUMUX_GRIDADAPTINITIALIZATIONINDICATORDEFAULT_HH
#include "properties.hh"
#include <dumux/common/properties.hh>
#include <dune/common/dynvector.hh>
......
......@@ -27,7 +27,8 @@
#ifndef DUMUX_GRIDADAPT_PROPERTIES_HH
#define DUMUX_GRIDADAPT_PROPERTIES_HH
#include <dumux/common/basicproperties.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
namespace Dumux
{
......
......@@ -51,7 +51,7 @@ namespace Properties
//////////////////////////////////////////////////////////////////
//! The type tag for models based on the diffusion-scheme
NEW_TYPE_TAG(Pressure, INHERITS_FROM(LinearSolverTypeTag, SequentialModel));
NEW_TYPE_TAG(Pressure, INHERITS_FROM(SequentialModel));
//////////////////////////////////////////////////////////////////
// Property tags
......
......@@ -19,8 +19,9 @@
#ifndef DUMUX_SEQUENTIAL_PROPERTIES_HH
#define DUMUX_SEQUENTIAL_PROPERTIES_HH
#include <dumux/common/propertysystem.hh>
#include <dumux/common/basicproperties.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/properties/model.hh>
#include <dumux/common/properties/grid.hh>
#include <dumux/porousmediumflow/sequential/gridadaptproperties.hh>
#include <dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh>
......@@ -44,7 +45,7 @@ namespace Properties
//////////////////////////////////////////////////////////////////
//! Create a type tag for all sequential models
NEW_TYPE_TAG(SequentialModel, INHERITS_FROM(NumericModel, GridAdaptTypeTag));
NEW_TYPE_TAG(SequentialModel, INHERITS_FROM(ModelProperties, GridAdaptTypeTag, GridProperties));
//////////////////////////////////////////////////////////////////
// Property tags
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment