From 2fac8c16b82dacd6392c6570270cf7cc315e5bd1 Mon Sep 17 00:00:00 2001 From: Andreas Lauser <and@poware.org> Date: Fri, 16 Dec 2011 13:22:58 +0000 Subject: [PATCH] removed superfluous hardcoding of the TwoPFluidState in the box 2p problems git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7041 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- appl/lecture/msm/1p2cvs2p/lensproblem2p.hh | 1 - test/boxmodels/2p/lensproblem.hh | 2 -- test/common/generalproblem/generallensproblem.hh | 1 - 3 files changed, 4 deletions(-) diff --git a/appl/lecture/msm/1p2cvs2p/lensproblem2p.hh b/appl/lecture/msm/1p2cvs2p/lensproblem2p.hh index a5df406e87..18b6a04ef3 100644 --- a/appl/lecture/msm/1p2cvs2p/lensproblem2p.hh +++ b/appl/lecture/msm/1p2cvs2p/lensproblem2p.hh @@ -130,7 +130,6 @@ class LensProblem2p : public TwoPProblem<TypeTag> typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices; typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem; - typedef TwoPFluidState<TypeTag> FluidState; enum { diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh index 572974a782..c9b276872d 100644 --- a/test/boxmodels/2p/lensproblem.hh +++ b/test/boxmodels/2p/lensproblem.hh @@ -154,8 +154,6 @@ class LensProblem : public TwoPProblem<TypeTag> typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase; typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonWettingPhase)) NonWettingPhase; - typedef TwoPFluidState<TypeTag> FluidState; - enum { numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)), diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh index 398495c2fe..fa9d0e608d 100644 --- a/test/common/generalproblem/generallensproblem.hh +++ b/test/common/generalproblem/generallensproblem.hh @@ -205,7 +205,6 @@ class GeneralLensProblem : public GET_PROP_TYPE(TypeTag, PTAG(ProblemBaseClass)) typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem; typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase; typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonWettingPhase)) NonWettingPhase; - typedef TwoPFluidState<TypeTag> FluidState; enum { numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)), -- GitLab