Skip to content
Snippets Groups Projects
Commit 259b55e3 authored by Kilian Weishaupt's avatar Kilian Weishaupt Committed by Timo Koch
Browse files

[staggeredGrid] Adapt to upstream changes

* Use FluidSystems::LiquidPhase instead of Dumux::LiquidPhase
parent c3e8e5a6
No related branches found
No related tags found
2 merge requests!617[WIP] Next,!370Feature/staggered grid
...@@ -87,7 +87,7 @@ SET_PROP(NavierStokes, Fluid) ...@@ -87,7 +87,7 @@ SET_PROP(NavierStokes, Fluid)
{ private: { private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public: public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type; typedef FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
}; };
/*! /*!
......
...@@ -55,7 +55,7 @@ SET_PROP(StaggeredTestProblem, Fluid) ...@@ -55,7 +55,7 @@ SET_PROP(StaggeredTestProblem, Fluid)
private: private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public: public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type; typedef FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
}; };
// Set the grid type // Set the grid type
......
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