Commit 0c212ffe authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

[freeflow] Change energyBalanceIdx to energyEqIdx

parent 94814178
......@@ -41,7 +41,7 @@ class FouriersLawImplementation;
* \brief Specialization of Fourier's Law for the staggered free flow method.
*/
template <class TypeTag>
class FouriersLawImplementation<TypeTag, DiscretizationMethod::staggered >
class FouriersLawImplementation<TypeTag, DiscretizationMethod::staggered>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
......@@ -51,8 +51,6 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::staggered >
using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity;
using Indices = typename GET_PROP_TYPE(TypeTag, ModelTraits)::Indices;
enum { energyBalanceIdx = Indices::energyBalanceIdx };
public:
// state the discretization method this implementation belongs to
static const DiscretizationMethod discMethod = DiscretizationMethod::staggered;
......@@ -72,7 +70,7 @@ public:
Scalar flux(0.0);
// conductive energy flux is zero for outflow boundary conditions
if (scvf.boundary() && problem.boundaryTypes(element, scvf).isOutflow(Indices::energyBalanceIdx))
if (scvf.boundary() && problem.boundaryTypes(element, scvf).isOutflow(Indices::energyEqIdx))
return flux;
const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
......
......@@ -37,7 +37,7 @@ template <class IsothermalIndices, int numEq>
class FreeflowNonIsothermalIndices : public IsothermalIndices
{
public:
static constexpr int energyBalanceIdx = numEq - 1;
static constexpr int energyEqIdx = numEq - 1;
static constexpr int temperatureIdx = numEq - 1;
};
......
......@@ -428,7 +428,7 @@ public:
* elemVolVars[scvf.insideScvIdx()].density()
* elemVolVars[scvf.insideScvIdx()].heatCapacity()
/ elemVolVars[scvf.insideScvIdx()].thermalConductivity();
wallFunctionFlux[Indices::energyBalanceIdx - cellCenterOffset] +=
wallFunctionFlux[Indices::energyEqIdx - cellCenterOffset] +=
-1.0 * (asImp_().dirichlet(element, scvf)[Indices::temperatureIdx]
- elemVolVars[scvf.insideScvIdx()].temperature())
* elemVolVars[scvf.insideScvIdx()].density()
......
......@@ -157,7 +157,7 @@ public:
{
values.setDirichlet(Indices::pressureIdx);
#if NONISOTHERMAL
values.setOutflow(Indices::energyBalanceIdx);
values.setOutflow(Indices::energyEqIdx);
#endif
}
else
......@@ -165,7 +165,7 @@ public:
values.setDirichlet(Indices::velocityXIdx);
values.setDirichlet(Indices::velocityYIdx);
#if NONISOTHERMAL
values.setNeumann(Indices::energyBalanceIdx);
values.setNeumann(Indices::energyEqIdx);
#endif
}
......
......@@ -176,7 +176,7 @@ public:
values.setDirichlet(Indices::pressureIdx);
values.setOutflow(transportEqIdx);
#if NONISOTHERMAL
values.setOutflow(Indices::energyBalanceIdx);
values.setOutflow(Indices::energyEqIdx);
#endif
}
else
......@@ -187,7 +187,7 @@ public:
values.setNeumann(Indices::conti0EqIdx);
values.setNeumann(transportEqIdx);
#if NONISOTHERMAL
values.setNeumann(Indices::energyBalanceIdx);
values.setNeumann(Indices::energyEqIdx);
#endif
}
......
......@@ -237,7 +237,7 @@ public:
values.setDirichlet(Indices::pressureIdx);
#if NONISOTHERMAL
values.setOutflow(Indices::energyBalanceIdx);
values.setOutflow(Indices::energyEqIdx);
#endif
#if LOWREKEPSILON || KEPSILON || KOMEGA
......
......@@ -255,7 +255,7 @@ public:
values.setOutflow(transportEqIdx);
#if NONISOTHERMAL
values.setOutflow(Indices::energyBalanceIdx);
values.setOutflow(Indices::energyEqIdx);
#endif
#if KEPSILON || KOMEGA || LOWREKEPSILON
......
......@@ -162,7 +162,7 @@ public:
const auto& globalPos = scvf.center();
#if NONISOTHERMAL
values.setNeumann(Indices::energyBalanceIdx);
values.setNeumann(Indices::energyEqIdx);
#endif
if (onUpperBoundary_(globalPos) || onLeftBoundary_(globalPos))
......@@ -179,7 +179,7 @@ public:
values.setOutflow(Indices::conti0EqIdx + 1);
#if NONISOTHERMAL
values.setOutflow(Indices::energyBalanceIdx);
values.setOutflow(Indices::energyEqIdx);
#endif
}
......@@ -239,7 +239,7 @@ public:
values[Indices::conti0EqIdx] = -xVelocity * density * (1.0 - refMoleFrac());
#if NONISOTHERMAL
values[Indices::energyBalanceIdx] = -xVelocity * fluidState.density(0) * fluidState.enthalpy(0);
values[Indices::energyEqIdx] = -xVelocity * fluidState.density(0) * fluidState.enthalpy(0);
#endif
}
......@@ -252,7 +252,7 @@ public:
values[Indices::conti0EqIdx + 1] = massFlux[1];
#if NONISOTHERMAL
values[Indices::energyBalanceIdx] = couplingManager().couplingData().energyCouplingCondition(fvGeometry, elemVolVars, elemFaceVars, scvf, diffCoeffAvgType_);
values[Indices::energyEqIdx] = couplingManager().couplingData().energyCouplingCondition(fvGeometry, elemVolVars, elemFaceVars, scvf, diffCoeffAvgType_);
#endif
}
......
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