Commit ab841abb authored by Sina Ackermann's avatar Sina Ackermann
Browse files

[fluidsystem] Replace OneP fluidsystem in 1p and tracer tests

* use LiquidPhase directly
parent 5ad4da7e
......@@ -34,7 +34,6 @@
#include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
#include <dumux/material/fluidsystems/1p.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
......@@ -62,9 +61,8 @@ SET_TYPE_PROP(OnePNIConductionProblem, Problem,
// Set the fluid system
SET_TYPE_PROP(OnePNIConductionProblem, FluidSystem,
FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar),
FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> > >);
FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Set the spatial parameters
SET_TYPE_PROP(OnePNIConductionProblem,
SpatialParams,
......
......@@ -34,7 +34,6 @@
#include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
#include <dumux/material/fluidsystems/1p.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
#include "1pnispatialparams.hh"
......@@ -61,9 +60,8 @@ SET_TYPE_PROP(OnePNIConvectionProblem, Problem, OnePNIConvectionProblem<TypeTag>
// Set the fluid system
SET_TYPE_PROP(OnePNIConvectionProblem, FluidSystem,
FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar),
FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> > >);
FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Set the spatial parameters
SET_TYPE_PROP(OnePNIConvectionProblem, SpatialParams, OnePNISpatialParams<TypeTag>);
......
......@@ -32,7 +32,6 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/fluidsystems/1p.hh>
#include "1ptestspatialparams.hh"
......@@ -52,7 +51,7 @@ NEW_TYPE_TAG(OnePTestCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePTestProblem))
SET_PROP(OnePTestProblem, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::OneP<Scalar, FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > >;
using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
};
// Set the grid type
......
......@@ -27,7 +27,6 @@
#define DUMUX_ONEP_FRACTURE_TEST_PROBLEM_HH
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1p.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/porousmediumflow/problem.hh>
......@@ -65,7 +64,7 @@ SET_TYPE_PROP(FractureProblem, Problem, Dumux::FractureProblem<TypeTag>);
SET_PROP(FractureProblem, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::OneP<Scalar, FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > >;
using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
};
} // end namespace Properties
......
......@@ -34,7 +34,6 @@
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/fluidsystems/1p.hh>
#include "spatialparams.hh"
......@@ -67,7 +66,7 @@ SET_TYPE_PROP(OnePIncompressible, LocalResidual, OnePIncompressibleLocalResidual
SET_PROP(OnePIncompressible, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::OneP<Scalar, FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > >;
using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
};
// Enable caching
......
......@@ -34,7 +34,6 @@
#include <dumux/porousmediumflow/1p/model.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1p.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include "tubesspatialparams.hh"
......@@ -63,7 +62,7 @@ SET_TYPE_PROP(TubesTestProblem, SpatialParams, TubesTestSpatialParams<TypeTag>);
SET_PROP(TubesTestProblem, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::OneP<Scalar, FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> > >;
using type = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
};
} // end namespace Properties
......
......@@ -26,7 +26,6 @@
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1p.hh>
#include <dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh>
#include <dumux/porousmediumflow/1p/sequential/diffusion/problem.hh>
......@@ -54,7 +53,7 @@ SET_TYPE_PROP(TestProblemOneP, Grid, Dune::YaspGrid<2>);
SET_PROP(TestProblemOneP, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::OneP<Scalar, FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> > >;
using type = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
};
// Set the spatial parameters
......
......@@ -29,7 +29,6 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/fluidsystems/1p.hh>
#include <dumux/porousmediumflow/1p/incompressiblelocalresidual.hh>
#include "1ptestspatialparams.hh"
......@@ -60,7 +59,7 @@ SET_TYPE_PROP(IncompressibleTestProblem, LocalResidual, OnePIncompressibleLocalR
SET_PROP(IncompressibleTestProblem, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::OneP<Scalar, FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > >;
using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
};
// Enable caching
......
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