From 9b483fe39a21d486992e8b1d9937de687c88ec03 Mon Sep 17 00:00:00 2001
From: Katharina Heck <katharina.heck@iws.uni-stuttgart.de>
Date: Mon, 5 Nov 2018 15:20:39 +0100
Subject: [PATCH] [fourierslaw][nonequilibrium] make it possible to use
nonequilibrium fourierslaw for liquidmixture and for one phase
---
dumux/discretization/box/fourierslawnonequilibrium.hh | 7 ++++---
.../cellcentered/tpfa/fourierslawnonequilibrium.hh | 10 ++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dumux/discretization/box/fourierslawnonequilibrium.hh b/dumux/discretization/box/fourierslawnonequilibrium.hh
index ee9fca8d30..5cb128deee 100644
--- a/dumux/discretization/box/fourierslawnonequilibrium.hh
+++ b/dumux/discretization/box/fourierslawnonequilibrium.hh
@@ -63,7 +63,7 @@ class FouriersLawNonEquilibriumImplementation<TypeTag, DiscretizationMethod::box
enum { dim = GridView::dimension} ;
enum { dimWorld = GridView::dimensionworld} ;
- enum { numPhases = GetPropType<TypeTag, Properties::ModelTraits>::numPhases()} ;
+
enum { numEnergyEqFluid = getPropValue<TypeTag, Properties::NumEnergyEqFluid>() };
enum {sPhaseIdx = FluidSystem::numPhases};
@@ -88,8 +88,9 @@ public:
// effective diffusion tensors
if (phaseIdx != sPhaseIdx)
{
- if (numEnergyEqFluid == 1)
- { //when only one energy equation for fluids is used, we need an effective law for that
+ //when number of energyEq for the fluid are smaller than numPhases that means that we need an effecitve law
+ if (numEnergyEqFluid < FluidSystem::numPhases)
+ {
insideLambda += ThermalConductivityModel::effectiveThermalConductivity(insideVolVars, problem.spatialParams(), element, fvGeometry, insideScv);
outsideLambda += ThermalConductivityModel::effectiveThermalConductivity(outsideVolVars, problem.spatialParams(), element, fvGeometry, outsideScv);
}
diff --git a/dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh b/dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh
index 97e47eec01..f2c6e4acdb 100644
--- a/dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh
+++ b/dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh
@@ -121,8 +121,9 @@ public:
// effective diffusion tensors
if (phaseIdx != sPhaseIdx)
{
- if (numEnergyEqFluid == 1)
- { //when only one energy equation for fluids is used, we need an effective law for that
+ //when number of energyEq for the fluid are smaller than numPhases that means that we need an effecitve law
+ if (numEnergyEqFluid < FluidSystem::numPhases)
+ {
insideLambda += ThermalConductivityModel::effectiveThermalConductivity(insideVolVars, problem.spatialParams(), element, fvGeometry, insideScv);
}
else //numEnergyEqFluid >1
@@ -153,8 +154,9 @@ public:
// effective diffusion tensors
if (phaseIdx != sPhaseIdx)
{
- if (numEnergyEqFluid == 1)
- { //when only one energy equation for fluids is used, we need an effective law for that
+ //when number of energyEq for the fluid are smaller than numPhases that means that we need an effecitve law
+ if (numEnergyEqFluid < FluidSystem::numPhases)
+ {
outsideLambda += ThermalConductivityModel::effectiveThermalConductivity(outsideVolVars, problem.spatialParams(), element, fvGeometry, outsideScv);
}
else
--
GitLab