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
Development
openfoam
Commits
a51bf0be
Commit
a51bf0be
authored
Dec 20, 2019
by
Andrew Heather
Browse files
BUG: Updated production term regression introduced in
b7aa89e1
parent
630f7f7f
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
View file @
a51bf0be
...
...
@@ -251,7 +251,6 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
const
rhoField
&
rho
=
this
->
rho_
;
const
surfaceScalarField
&
alphaRhoPhi
=
this
->
alphaRhoPhi_
;
const
volVectorField
&
U
=
this
->
U_
;
const
volScalarField
::
Internal
unlimitedNut
(
Cmu_
*
sqr
(
k_
())
/
epsilon_
());
const
volScalarField
&
nut
=
this
->
nut_
;
fv
::
options
&
fvOptions
(
fv
::
options
::
New
(
this
->
mesh_
));
...
...
@@ -269,7 +268,7 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
);
tgradU
.
clear
();
const
volScalarField
::
Internal
G
(
this
->
GName
(),
unlimitedNut
*
GbyNu
);
const
volScalarField
::
Internal
G
(
this
->
GName
(),
nut
()
*
GbyNu
);
const
volScalarField
::
Internal
eta
(
sqrt
(
mag
(
GbyNu
))
*
k_
/
epsilon_
);
const
volScalarField
::
Internal
eta3
(
eta
*
sqr
(
eta
));
...
...
@@ -289,7 +288,7 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
+
fvm
::
div
(
alphaRhoPhi
,
epsilon_
)
-
fvm
::
laplacian
(
alpha
*
rho
*
DepsilonEff
(),
epsilon_
)
==
(
C1_
-
R
)
*
alpha
()
*
rho
()
*
G
*
epsilon_
()
/
k_
()
(
C1_
-
R
)
*
alpha
()
*
rho
()
*
G
byNu
*
Cmu_
*
k_
()
-
fvm
::
SuSp
(((
2
.
0
/
3
.
0
)
*
C1_
-
C3_
)
*
alpha
()
*
rho
()
*
divU
,
epsilon_
)
-
fvm
::
Sp
(
C2_
*
alpha
()
*
rho
()
*
epsilon_
()
/
k_
(),
epsilon_
)
+
epsilonSource
()
...
...
@@ -312,7 +311,7 @@ void RNGkEpsilon<BasicTurbulenceModel>::correct()
+
fvm
::
div
(
alphaRhoPhi
,
k_
)
-
fvm
::
laplacian
(
alpha
*
rho
*
DkEff
(),
k_
)
==
alpha
()
*
rho
()
*
G
byNu
*
nut
()
alpha
()
*
rho
()
*
G
-
fvm
::
SuSp
((
2
.
0
/
3
.
0
)
*
alpha
()
*
rho
()
*
divU
,
k_
)
-
fvm
::
Sp
(
alpha
()
*
rho
()
*
epsilon_
()
/
k_
(),
k_
)
+
kSource
()
...
...
src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
View file @
a51bf0be
...
...
@@ -231,7 +231,6 @@ void kEpsilon<BasicTurbulenceModel>::correct()
const
rhoField
&
rho
=
this
->
rho_
;
const
surfaceScalarField
&
alphaRhoPhi
=
this
->
alphaRhoPhi_
;
const
volVectorField
&
U
=
this
->
U_
;
const
volScalarField
::
Internal
unlimitedNut
(
Cmu_
*
sqr
(
k_
())
/
epsilon_
());
const
volScalarField
&
nut
=
this
->
nut_
;
fv
::
options
&
fvOptions
(
fv
::
options
::
New
(
this
->
mesh_
));
...
...
@@ -248,7 +247,7 @@ void kEpsilon<BasicTurbulenceModel>::correct()
(
tgradU
().
v
()
&&
dev
(
twoSymm
(
tgradU
().
v
()))
);
const
volScalarField
::
Internal
G
(
this
->
GName
(),
unlimitedNut
*
GbyNu
);
const
volScalarField
::
Internal
G
(
this
->
GName
(),
nut
()
*
GbyNu
);
tgradU
.
clear
();
// Update epsilon and G at the wall
...
...
@@ -261,7 +260,7 @@ void kEpsilon<BasicTurbulenceModel>::correct()
+
fvm
::
div
(
alphaRhoPhi
,
epsilon_
)
-
fvm
::
laplacian
(
alpha
*
rho
*
DepsilonEff
(),
epsilon_
)
==
C1_
*
alpha
()
*
rho
()
*
G
*
epsilon_
()
/
k_
()
C1_
*
alpha
()
*
rho
()
*
G
byNu
*
Cmu_
*
k_
()
-
fvm
::
SuSp
(((
2
.
0
/
3
.
0
)
*
C1_
-
C3_
)
*
alpha
()
*
rho
()
*
divU
,
epsilon_
)
-
fvm
::
Sp
(
C2_
*
alpha
()
*
rho
()
*
epsilon_
()
/
k_
(),
epsilon_
)
+
epsilonSource
()
...
...
@@ -282,7 +281,7 @@ void kEpsilon<BasicTurbulenceModel>::correct()
+
fvm
::
div
(
alphaRhoPhi
,
k_
)
-
fvm
::
laplacian
(
alpha
*
rho
*
DkEff
(),
k_
)
==
alpha
()
*
rho
()
*
G
byNu
*
nut
()
alpha
()
*
rho
()
*
G
-
fvm
::
SuSp
((
2
.
0
/
3
.
0
)
*
alpha
()
*
rho
()
*
divU
,
k_
)
-
fvm
::
Sp
(
alpha
()
*
rho
()
*
epsilon_
()
/
k_
(),
k_
)
+
kSource
()
...
...
src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
View file @
a51bf0be
...
...
@@ -191,7 +191,6 @@ void kOmega<BasicTurbulenceModel>::correct()
const
rhoField
&
rho
=
this
->
rho_
;
const
surfaceScalarField
&
alphaRhoPhi
=
this
->
alphaRhoPhi_
;
const
volVectorField
&
U
=
this
->
U_
;
const
volScalarField
::
Internal
unlimitedNut
(
k_
()
/
omega_
());
const
volScalarField
&
nut
=
this
->
nut_
;
fv
::
options
&
fvOptions
(
fv
::
options
::
New
(
this
->
mesh_
));
...
...
@@ -207,7 +206,7 @@ void kOmega<BasicTurbulenceModel>::correct()
(
tgradU
().
v
()
&&
dev
(
twoSymm
(
tgradU
().
v
()))
);
const
volScalarField
::
Internal
G
(
this
->
GName
(),
unlimitedNut
*
GbyNu
);
const
volScalarField
::
Internal
G
(
this
->
GName
(),
nut
()
*
GbyNu
);
tgradU
.
clear
();
// Update omega and G at the wall
...
...
@@ -220,7 +219,7 @@ void kOmega<BasicTurbulenceModel>::correct()
+
fvm
::
div
(
alphaRhoPhi
,
omega_
)
-
fvm
::
laplacian
(
alpha
*
rho
*
DomegaEff
(),
omega_
)
==
gamma_
*
alpha
()
*
rho
()
*
G
*
omega_
()
/
k_
()
gamma_
*
alpha
()
*
rho
()
*
G
byNu
-
fvm
::
SuSp
(((
2
.
0
/
3
.
0
)
*
gamma_
)
*
alpha
()
*
rho
()
*
divU
,
omega_
)
-
fvm
::
Sp
(
beta_
*
alpha
()
*
rho
()
*
omega_
(),
omega_
)
+
fvOptions
(
alpha
,
rho
,
omega_
)
...
...
@@ -241,7 +240,7 @@ void kOmega<BasicTurbulenceModel>::correct()
+
fvm
::
div
(
alphaRhoPhi
,
k_
)
-
fvm
::
laplacian
(
alpha
*
rho
*
DkEff
(),
k_
)
==
alpha
()
*
rho
()
*
G
byNu
*
nut
()
alpha
()
*
rho
()
*
G
-
fvm
::
SuSp
((
2
.
0
/
3
.
0
)
*
alpha
()
*
rho
()
*
divU
,
k_
)
-
fvm
::
Sp
(
Cmu_
*
alpha
()
*
rho
()
*
omega_
(),
k_
)
+
fvOptions
(
alpha
,
rho
,
k_
)
...
...
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