From 3094cd454da829e3e4f782578e0a9998ff0e6c17 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Fri, 22 Dec 2017 11:56:13 +0100
Subject: [PATCH] [1p][sequential] Replace Fluid by FluidSystem
* type Fluid does not exists anymore
---
.../1p/sequential/diffusion/cellcentered/pressure.hh | 6 +++---
.../1p/sequential/diffusion/cellcentered/velocity.hh | 6 +++---
test/porousmediumflow/1p/sequential/test_1pproblem.hh | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh
index 2426d68bb0..a2213e2d32 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh
@@ -62,7 +62,7 @@ template<class TypeTag> class FVPressure1P: public FVPressure<TypeTag>
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- using Fluid = typename GET_PROP_TYPE(TypeTag, FluidSystem)::Fluid;
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using SolutionTypes = typename GET_PROP(TypeTag, SolutionTypes);
@@ -200,8 +200,8 @@ public:
Scalar temperature = problem_.temperature(element);
Scalar referencePress = problem_.referencePressure(element);
- density_ = Fluid::density(temperature, referencePress);
- viscosity_ = Fluid::viscosity(temperature, referencePress);
+ density_ = FluidSystem::density(temperature, referencePress);
+ viscosity_ = FluidSystem::viscosity(temperature, referencePress);
}
private:
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
index 6a805b55e1..7db21b8c1d 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
@@ -53,7 +53,7 @@ class FVVelocity1P
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- using Fluid = typename GET_PROP_TYPE(TypeTag, FluidSystem)::Fluid;
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using SolutionTypes = typename GET_PROP(TypeTag, SolutionTypes);
@@ -88,8 +88,8 @@ public:
Scalar temperature = problem_.temperature(element);
Scalar referencePress = problem_.referencePressure(element);
- density_ = Fluid::density(temperature, referencePress);
- viscosity_ = Fluid::viscosity(temperature, referencePress);
+ density_ = FluidSystem::density(temperature, referencePress);
+ viscosity_ = FluidSystem::viscosity(temperature, referencePress);
}
// Calculates the velocity at a cell-cell interface.
diff --git a/test/porousmediumflow/1p/sequential/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
index 30d3f2ce81..983c228581 100644
--- a/test/porousmediumflow/1p/sequential/test_1pproblem.hh
+++ b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
@@ -76,7 +76,7 @@ class TestProblemOneP: public DiffusionProblem1P<TypeTag >
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Fluid = typename GET_PROP_TYPE(TypeTag, FluidSystem)::Fluid;
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
@@ -252,7 +252,7 @@ private:
Scalar fx = dkxxdx * dpdx + kxx * dppdxx + dkxydx * dpdy + kxy * dppdyx;
Scalar fy = dkxydy * dpdx + kxy * dppdxy + dkyydy * dpdy + kyy * dppdyy;
- return -(fx + fy) / Fluid::viscosity(temp, referencePress) * Fluid::density(temp, referencePress);
+ return -(fx + fy) / FluidSystem::viscosity(temp, referencePress) * FluidSystem::density(temp, referencePress);
}
double delta_;
--
GitLab