Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
0c212ffe
Commit
0c212ffe
authored
Nov 12, 2018
by
Kilian Weishaupt
Browse files
[freeflow] Change energyBalanceIdx to energyEqIdx
parent
94814178
Changes
8
Hide whitespace changes
Inline
Side-by-side
dumux/discretization/staggered/freeflow/fourierslaw.hh
View file @
0c212ffe
...
...
@@ -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
::
energy
Balance
Idx
))
if
(
scvf
.
boundary
()
&&
problem
.
boundaryTypes
(
element
,
scvf
).
isOutflow
(
Indices
::
energy
Eq
Idx
))
return
flux
;
const
auto
&
insideScv
=
fvGeometry
.
scv
(
scvf
.
insideScvIdx
());
...
...
dumux/freeflow/nonisothermal/indices.hh
View file @
0c212ffe
...
...
@@ -37,7 +37,7 @@ template <class IsothermalIndices, int numEq>
class
FreeflowNonIsothermalIndices
:
public
IsothermalIndices
{
public:
static
constexpr
int
energy
Balance
Idx
=
numEq
-
1
;
static
constexpr
int
energy
Eq
Idx
=
numEq
-
1
;
static
constexpr
int
temperatureIdx
=
numEq
-
1
;
};
...
...
dumux/freeflow/rans/twoeq/kepsilon/problem.hh
View file @
0c212ffe
...
...
@@ -428,7 +428,7 @@ public:
*
elemVolVars
[
scvf
.
insideScvIdx
()].
density
()
*
elemVolVars
[
scvf
.
insideScvIdx
()].
heatCapacity
()
/
elemVolVars
[
scvf
.
insideScvIdx
()].
thermalConductivity
();
wallFunctionFlux
[
Indices
::
energy
Balance
Idx
-
cellCenterOffset
]
+=
wallFunctionFlux
[
Indices
::
energy
Eq
Idx
-
cellCenterOffset
]
+=
-
1.0
*
(
asImp_
().
dirichlet
(
element
,
scvf
)[
Indices
::
temperatureIdx
]
-
elemVolVars
[
scvf
.
insideScvIdx
()].
temperature
())
*
elemVolVars
[
scvf
.
insideScvIdx
()].
density
()
...
...
test/freeflow/navierstokes/channeltestproblem.hh
View file @
0c212ffe
...
...
@@ -157,7 +157,7 @@ public:
{
values
.
setDirichlet
(
Indices
::
pressureIdx
);
#if NONISOTHERMAL
values
.
setOutflow
(
Indices
::
energy
Balance
Idx
);
values
.
setOutflow
(
Indices
::
energy
Eq
Idx
);
#endif
}
else
...
...
@@ -165,7 +165,7 @@ public:
values
.
setDirichlet
(
Indices
::
velocityXIdx
);
values
.
setDirichlet
(
Indices
::
velocityYIdx
);
#if NONISOTHERMAL
values
.
setNeumann
(
Indices
::
energy
Balance
Idx
);
values
.
setNeumann
(
Indices
::
energy
Eq
Idx
);
#endif
}
...
...
test/freeflow/navierstokesnc/channeltestproblem.hh
View file @
0c212ffe
...
...
@@ -176,7 +176,7 @@ public:
values
.
setDirichlet
(
Indices
::
pressureIdx
);
values
.
setOutflow
(
transportEqIdx
);
#if NONISOTHERMAL
values
.
setOutflow
(
Indices
::
energy
Balance
Idx
);
values
.
setOutflow
(
Indices
::
energy
Eq
Idx
);
#endif
}
else
...
...
@@ -187,7 +187,7 @@ public:
values
.
setNeumann
(
Indices
::
conti0EqIdx
);
values
.
setNeumann
(
transportEqIdx
);
#if NONISOTHERMAL
values
.
setNeumann
(
Indices
::
energy
Balance
Idx
);
values
.
setNeumann
(
Indices
::
energy
Eq
Idx
);
#endif
}
...
...
test/freeflow/rans/pipelauferproblem.hh
View file @
0c212ffe
...
...
@@ -237,7 +237,7 @@ public:
values
.
setDirichlet
(
Indices
::
pressureIdx
);
#if NONISOTHERMAL
values
.
setOutflow
(
Indices
::
energy
Balance
Idx
);
values
.
setOutflow
(
Indices
::
energy
Eq
Idx
);
#endif
#if LOWREKEPSILON || KEPSILON || KOMEGA
...
...
test/freeflow/ransnc/flatplatetestproblem.hh
View file @
0c212ffe
...
...
@@ -255,7 +255,7 @@ public:
values
.
setOutflow
(
transportEqIdx
);
#if NONISOTHERMAL
values
.
setOutflow
(
Indices
::
energy
Balance
Idx
);
values
.
setOutflow
(
Indices
::
energy
Eq
Idx
);
#endif
#if KEPSILON || KOMEGA || LOWREKEPSILON
...
...
test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh
View file @
0c212ffe
...
...
@@ -162,7 +162,7 @@ public:
const
auto
&
globalPos
=
scvf
.
center
();
#if NONISOTHERMAL
values
.
setNeumann
(
Indices
::
energy
Balance
Idx
);
values
.
setNeumann
(
Indices
::
energy
Eq
Idx
);
#endif
if
(
onUpperBoundary_
(
globalPos
)
||
onLeftBoundary_
(
globalPos
))
...
...
@@ -179,7 +179,7 @@ public:
values
.
setOutflow
(
Indices
::
conti0EqIdx
+
1
);
#if NONISOTHERMAL
values
.
setOutflow
(
Indices
::
energy
Balance
Idx
);
values
.
setOutflow
(
Indices
::
energy
Eq
Idx
);
#endif
}
...
...
@@ -239,7 +239,7 @@ public:
values
[
Indices
::
conti0EqIdx
]
=
-
xVelocity
*
density
*
(
1.0
-
refMoleFrac
());
#if NONISOTHERMAL
values
[
Indices
::
energy
Balance
Idx
]
=
-
xVelocity
*
fluidState
.
density
(
0
)
*
fluidState
.
enthalpy
(
0
);
values
[
Indices
::
energy
Eq
Idx
]
=
-
xVelocity
*
fluidState
.
density
(
0
)
*
fluidState
.
enthalpy
(
0
);
#endif
}
...
...
@@ -252,7 +252,7 @@ public:
values
[
Indices
::
conti0EqIdx
+
1
]
=
massFlux
[
1
];
#if NONISOTHERMAL
values
[
Indices
::
energy
Balance
Idx
]
=
couplingManager
().
couplingData
().
energyCouplingCondition
(
fvGeometry
,
elemVolVars
,
elemFaceVars
,
scvf
,
diffCoeffAvgType_
);
values
[
Indices
::
energy
Eq
Idx
]
=
couplingManager
().
couplingData
().
energyCouplingCondition
(
fvGeometry
,
elemVolVars
,
elemFaceVars
,
scvf
,
diffCoeffAvgType_
);
#endif
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment