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
f290006a
Commit
f290006a
authored
Jun 17, 2008
by
Andrew Heather
Browse files
consistency update - turbulenceModel -> RASmodel
parent
e46a010a
Changes
64
Hide whitespace changes
Inline
Side-by-side
src/turbulenceModels/RAS/compressible/LRR/LRR.C
View file @
f290006a
...
...
@@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug
(
LRR
,
0
);
addToRunTimeSelectionTable
(
turbulenceM
odel
,
LRR
,
dictionary
);
addToRunTimeSelectionTable
(
RASm
odel
,
LRR
,
dictionary
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
...
...
@@ -53,25 +53,25 @@ LRR::LRR
basicThermo
&
thermophysicalModel
)
:
turbulenceM
odel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
Cmu
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cmu"
,
0
.
09
)),
Clrr1
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Clrr1"
,
1
.
8
)),
Clrr2
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Clrr2"
,
0
.
6
)),
C1
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1"
,
1
.
44
)),
C2
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2"
,
1
.
92
)),
Cs
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cs"
,
0
.
25
)),
Ceps
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Ceps"
,
0
.
15
)),
RASm
odel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
Cmu
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cmu"
,
0
.
09
)),
Clrr1
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Clrr1"
,
1
.
8
)),
Clrr2
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Clrr2"
,
0
.
6
)),
C1
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1"
,
1
.
44
)),
C2
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2"
,
1
.
92
)),
Cs
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cs"
,
0
.
25
)),
Ceps
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Ceps"
,
0
.
15
)),
couplingFactor_
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"couplingFactor"
,
0
.
0
)
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"couplingFactor"
,
0
.
0
)
),
alphaR
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaR"
,
1
.
22
)),
alphaR
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaR"
,
1
.
22
)),
alphaEps
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaEps"
,
0
.
76923
)
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaEps"
,
0
.
76923
)
),
alphah
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphah"
,
1
.
0
)),
alphah
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphah"
,
1
.
0
)),
R_
(
...
...
@@ -192,19 +192,19 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
bool
LRR
::
read
()
{
if
(
turbulenceM
odel
::
read
())
if
(
RASm
odel
::
read
())
{
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cmu"
,
Cmu
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Clrr1"
,
Clrr1
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Clrr2"
,
Clrr2
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C1"
,
C1
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C2"
,
C2
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cs"
,
Cs
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Ceps"
,
Ceps
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaR"
,
alphaR
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaEps"
,
alphaEps
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphah"
,
alphah
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cmu"
,
Cmu
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Clrr1"
,
Clrr1
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Clrr2"
,
Clrr2
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C1"
,
C1
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C2"
,
C2
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cs"
,
Cs
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Ceps"
,
Ceps
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaR"
,
alphaR
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaEps"
,
alphaEps
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphah"
,
alphah
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"couplingFactor"
,
couplingFactor_
...
...
@@ -236,7 +236,7 @@ void LRR::correct()
return
;
}
turbulenceM
odel
::
correct
();
RASm
odel
::
correct
();
volSymmTensorField
P
=
-
twoSymm
(
R_
&
fvc
::
grad
(
U_
));
volScalarField
G
=
0
.
5
*
tr
(
P
);
...
...
src/turbulenceModels/RAS/compressible/LRR/LRR.H
View file @
f290006a
...
...
@@ -38,7 +38,7 @@ SourceFiles
#ifndef compressibleLRR_H
#define compressibleLRR_H
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -55,7 +55,7 @@ namespace RAS
class
LRR
:
public
turbulenceM
odel
public
RASm
odel
{
// Private data
...
...
src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View file @
f290006a
...
...
@@ -42,7 +42,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug
(
LaunderGibsonRSTM
,
0
);
addToRunTimeSelectionTable
(
turbulenceM
odel
,
LaunderGibsonRSTM
,
dictionary
);
addToRunTimeSelectionTable
(
RASm
odel
,
LaunderGibsonRSTM
,
dictionary
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
...
...
@@ -55,27 +55,27 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
basicThermo
&
thermophysicalModel
)
:
turbulenceM
odel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
Cmu
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cmu"
,
0
.
09
)),
Clg1
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Clg1"
,
1
.
8
)),
Clg2
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Clg2"
,
0
.
6
)),
C1
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1"
,
1
.
44
)),
C2
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2"
,
1
.
92
)),
Cs
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cs"
,
0
.
25
)),
Ceps
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Ceps"
,
0
.
15
)),
C1Ref
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1Ref"
,
0
.
5
)),
C2Ref
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2Ref"
,
0
.
3
)),
RASm
odel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
Cmu
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cmu"
,
0
.
09
)),
Clg1
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Clg1"
,
1
.
8
)),
Clg2
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Clg2"
,
0
.
6
)),
C1
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1"
,
1
.
44
)),
C2
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2"
,
1
.
92
)),
Cs
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cs"
,
0
.
25
)),
Ceps
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Ceps"
,
0
.
15
)),
C1Ref
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1Ref"
,
0
.
5
)),
C2Ref
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2Ref"
,
0
.
3
)),
couplingFactor_
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"couplingFactor"
,
0
.
0
)
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"couplingFactor"
,
0
.
0
)
),
alphaR
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaR"
,
1
.
22
)),
alphaR
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaR"
,
1
.
22
)),
alphaEps
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaEps"
,
0
.
76923
)
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaEps"
,
0
.
76923
)
),
alphah
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphah"
,
1
.
0
)),
alphah
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphah"
,
1
.
0
)),
y_
(
mesh_
),
...
...
@@ -198,22 +198,22 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
bool
LaunderGibsonRSTM
::
read
()
{
if
(
turbulenceM
odel
::
read
())
if
(
RASm
odel
::
read
())
{
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cmu"
,
Cmu
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Clg1"
,
Clg1
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Clg2"
,
Clg2
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C1"
,
C1
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C2"
,
C2
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cs"
,
Cs
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Ceps"
,
Ceps
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C1Ref"
,
C1Ref
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C2Ref"
,
C2Ref
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaR"
,
alphaR
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaEps"
,
alphaEps
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphah"
,
alphah
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cmu"
,
Cmu
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Clg1"
,
Clg1
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Clg2"
,
Clg2
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C1"
,
C1
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C2"
,
C2
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cs"
,
Cs
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Ceps"
,
Ceps
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C1Ref"
,
C1Ref
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C2Ref"
,
C2Ref
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaR"
,
alphaR
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaEps"
,
alphaEps
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphah"
,
alphah
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"couplingFactor"
,
couplingFactor_
...
...
@@ -245,7 +245,7 @@ void LaunderGibsonRSTM::correct()
return
;
}
turbulenceM
odel
::
correct
();
RASm
odel
::
correct
();
if
(
mesh_
.
changing
())
{
...
...
src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
View file @
f290006a
...
...
@@ -37,7 +37,7 @@ SourceFiles
#ifndef compressibleLaunderGibsonRSTM_H
#define compressibleLaunderGibsonRSTM_H
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
#include
"wallDistReflection.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -55,7 +55,7 @@ namespace RAS
class
LaunderGibsonRSTM
:
public
turbulenceM
odel
public
RASm
odel
{
// Private data
...
...
src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
View file @
f290006a
...
...
@@ -40,7 +40,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug
(
LaunderSharmaKE
,
0
);
addToRunTimeSelectionTable
(
turbulenceM
odel
,
LaunderSharmaKE
,
dictionary
);
addToRunTimeSelectionTable
(
RASm
odel
,
LaunderSharmaKE
,
dictionary
);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
...
...
@@ -69,18 +69,18 @@ LaunderSharmaKE::LaunderSharmaKE
basicThermo
&
thermophysicalModel
)
:
turbulenceM
odel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
RASm
odel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
Cmu
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cmu"
,
0
.
09
)),
C1
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1"
,
1
.
44
)),
C2
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2"
,
1
.
92
)),
C3
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C3"
,
-
0
.
33
)),
alphak
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphak"
,
1
.
0
)),
Cmu
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cmu"
,
0
.
09
)),
C1
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1"
,
1
.
44
)),
C2
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2"
,
1
.
92
)),
C3
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C3"
,
-
0
.
33
)),
alphak
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphak"
,
1
.
0
)),
alphaEps
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaEps"
,
0
.
76923
)
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaEps"
,
0
.
76923
)
),
alphah
(
turbulenceM
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphah"
,
1
.
0
)),
alphah
(
RASm
odelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphah"
,
1
.
0
)),
k_
(
...
...
@@ -179,14 +179,14 @@ tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
bool
LaunderSharmaKE
::
read
()
{
if
(
turbulenceM
odel
::
read
())
if
(
RASm
odel
::
read
())
{
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cmu"
,
Cmu
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C1"
,
C1
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C2"
,
C2
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C3"
,
C3
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaEps"
,
alphaEps
);
turbulenceM
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphah"
,
alphah
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"Cmu"
,
Cmu
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C1"
,
C1
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C2"
,
C2
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"C3"
,
C3
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaEps"
,
alphaEps
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphah"
,
alphah
);
return
true
;
}
...
...
@@ -206,7 +206,7 @@ void LaunderSharmaKE::correct()
return
;
}
turbulenceM
odel
::
correct
();
RASm
odel
::
correct
();
// Calculate parameters and coefficients for Launder-Sharma low-Reynolds
// number model
...
...
src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
View file @
f290006a
...
...
@@ -38,7 +38,7 @@ SourceFiles
#ifndef compressibleLaunderSharmaKE_H
#define compressibleLaunderSharmaKE_H
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -55,7 +55,7 @@ namespace RAS
class
LaunderSharmaKE
:
public
turbulenceM
odel
public
RASm
odel
{
// Private data
...
...
src/turbulenceModels/RAS/compressible/Make/files
View file @
f290006a
turbulenceModel/turbulenceM
odel.C
turbulenceModel/newTurbulenceM
odel.C
RASmodel/RASm
odel.C
RASmodel/newRASm
odel.C
laminar/laminar.C
kEpsilon/kEpsilon.C
RNGkEpsilon/RNGkEpsilon.C
...
...
src/turbulenceModels/RAS/compressible/
turbulenceModel/turbulenceM
odel.C
→
src/turbulenceModels/RAS/compressible/
RASmodel/RASm
odel.C
View file @
f290006a
...
...
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
#include
"wallDist.H"
#include
"wallFvPatch.H"
#include
"fixedValueFvPatchFields.H"
...
...
@@ -38,24 +38,24 @@ namespace compressible
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug
(
turbulenceM
odel
,
0
);
defineRunTimeSelectionTable
(
turbulenceM
odel
,
dictionary
);
defineTypeNameAndDebug
(
RASm
odel
,
0
);
defineRunTimeSelectionTable
(
RASm
odel
,
dictionary
);
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
void
turbulenceM
odel
::
printCoeffs
()
void
RASm
odel
::
printCoeffs
()
{
if
(
printCoeffs_
)
{
Info
<<
type
()
<<
"Coeffs"
<<
nl
<<
turbulenceM
odelCoeffs_
;
<<
RASm
odelCoeffs_
;
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
turbulenceModel
::
turbulenceM
odel
RASmodel
::
RASm
odel
(
const
word
&
type
,
const
volScalarField
&
rho
,
...
...
@@ -86,7 +86,7 @@ turbulenceModel::turbulenceModel
turbulence_
(
lookup
(
"turbulence"
)),
printCoeffs_
(
lookupOrDefault
<
Switch
>
(
"printCoeffs"
,
false
)),
turbulenceM
odelCoeffs_
(
subDict
(
type
+
"Coeffs"
)),
RASm
odelCoeffs_
(
subDict
(
type
+
"Coeffs"
)),
kappa_
(
...
...
@@ -109,7 +109,7 @@ turbulenceModel::turbulenceModel
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar
turbulenceM
odel
::
yPlusLam
(
const
scalar
kappa
,
const
scalar
E
)
scalar
RASm
odel
::
yPlusLam
(
const
scalar
kappa
,
const
scalar
E
)
{
scalar
ypl
=
11
.
0
;
...
...
@@ -122,7 +122,7 @@ scalar turbulenceModel::yPlusLam(const scalar kappa, const scalar E)
}
tmp
<
scalarField
>
turbulenceM
odel
::
yPlus
(
const
label
patchNo
)
const
tmp
<
scalarField
>
RASm
odel
::
yPlus
(
const
label
patchNo
)
const
{
const
fvPatch
&
curPatch
=
mesh_
.
boundary
()[
patchNo
];
...
...
@@ -131,7 +131,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
if
(
typeid
(
curPatch
)
==
typeid
(
wallFvPatch
))
{
scalar
Cmu
(
readScalar
(
turbulenceM
odelCoeffs_
.
lookup
(
"Cmu"
)));
scalar
Cmu
(
readScalar
(
RASm
odelCoeffs_
.
lookup
(
"Cmu"
)));
Yp
=
pow
(
Cmu
,
0
.
25
)
*
y_
[
patchNo
]
...
...
@@ -145,7 +145,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
{
WarningIn
(
"tmp<scalarField>
turbulenceM
odel::yPlus(const label patchNo) const"
"tmp<scalarField>
RASm
odel::yPlus(const label patchNo) const"
)
<<
"Patch "
<<
patchNo
<<
" is not a wall. Returning blank field"
<<
endl
;
...
...
@@ -156,7 +156,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
}
void
turbulenceM
odel
::
correct
()
void
RASm
odel
::
correct
()
{
if
(
mesh_
.
changing
())
{
...
...
@@ -165,12 +165,12 @@ void turbulenceModel::correct()
}
bool
turbulenceM
odel
::
read
()
bool
RASm
odel
::
read
()
{
if
(
regIOobject
::
read
())
{
lookup
(
"turbulence"
)
>>
turbulence_
;
turbulenceM
odelCoeffs_
=
subDict
(
type
()
+
"Coeffs"
);
RASm
odelCoeffs_
=
subDict
(
type
()
+
"Coeffs"
);
subDict
(
"wallFunctionCoeffs"
).
lookup
(
"kappa"
)
>>
kappa_
;
subDict
(
"wallFunctionCoeffs"
).
lookup
(
"E"
)
>>
E_
;
...
...
src/turbulenceModels/RAS/compressible/
turbulenceModel/turbulenceM
odel.H
→
src/turbulenceModels/RAS/compressible/
RASmodel/RASm
odel.H
View file @
f290006a
...
...
@@ -30,20 +30,20 @@ Description
Class
Foam::compressible::
turbulenceM
odel
Foam::compressible::
RASm
odel
Description
Abstract base class for turbulence models for compressible and combusting
flows.
SourceFiles
turbulenceM
odel.C
RASm
odel.C
newTurbulenceModel.C
\*---------------------------------------------------------------------------*/
#ifndef compressible
Turbulence
Model_H
#define compressible
Turbulence
Model_H
#ifndef compressible
RAS
Model_H
#define compressible
RAS
Model_H
#include
"volFields.H"
#include
"surfaceFields.H"
...
...
@@ -66,10 +66,10 @@ namespace compressible
{
/*---------------------------------------------------------------------------*\
Class
turbulenceM
odel Declaration
Class
RASm
odel Declaration
\*---------------------------------------------------------------------------*/
class
turbulenceM
odel
class
RASm
odel
:
public
IOdictionary
{
...
...
@@ -89,7 +89,7 @@ protected:
Switch
turbulence_
;
Switch
printCoeffs_
;
dictionary
turbulenceM
odelCoeffs_
;
dictionary
RASm
odelCoeffs_
;
scalar
kappa_
;
scalar
E_
;
...
...
@@ -121,16 +121,16 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
turbulenceModel
(
const
turbulenceM
odel
&
);
RASmodel
(
const
RASm
odel
&
);
//- Disallow default bitwise assignment
void
operator
=
(
const
turbulenceM
odel
&
);
void
operator
=
(
const
RASm
odel
&
);
public:
//- Runtime type information
TypeName
(
"
turbulenceM
odel"
);
TypeName
(
"
RASm
odel"
);
// Declare run-time constructor selection table
...
...
@@ -138,7 +138,7 @@ public:
declareRunTimeSelectionTable
(
autoPtr
,
turbulenceM
odel
,
RASm
odel
,
dictionary
,
(
const
volScalarField
&
rho
,
...
...
@@ -153,7 +153,7 @@ public:
// Constructors
//- Construct from components
turbulenceM
odel
RASm
odel
(
const
word
&
type
,
const
volScalarField
&
rho
,
...
...
@@ -166,7 +166,7 @@ public:
// Selectors
//- Return a reference to the selected turbulence model
static
autoPtr
<
turbulenceM
odel
>
New
static
autoPtr
<
RASm
odel
>
New
(
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
...
...
@@ -177,7 +177,7 @@ public:
// Destructor
virtual
~
turbulenceM
odel
()
virtual
~
RASm
odel
()
{}
...
...
src/turbulenceModels/RAS/compressible/
turbulenceModel/newTurbulenceM
odel.C
→
src/turbulenceModels/RAS/compressible/
RASmodel/newRASm
odel.C
View file @
f290006a
...
...
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -35,7 +35,7 @@ namespace compressible
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
autoPtr
<
turbulenceModel
>
turbulenceM
odel
::
New
autoPtr
<
RASmodel
>
RASm
odel
::
New
(
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
...
...
@@ -43,10 +43,10 @@ autoPtr<turbulenceModel> turbulenceModel::New
basicThermo
&
thermophysicalModel
)
{
word
turbulenceM
odelTypeName
;
word
RASm
odelTypeName
;
// Enclose the creation of the turbulencePropertiesDict to ensure it is
// deleted before the
turbulenceM
odel is created otherwise the dictionary
// deleted before the
RASm
odel is created otherwise the dictionary
// is entered in the database twice
{
IOdictionary
turbulencePropertiesDict
...
...
@@ -61,30 +61,30 @@ autoPtr<turbulenceModel> turbulenceModel::New
)
);
turbulencePropertiesDict
.
lookup
(
"
turbulenceM
odel"
)
>>
turbulenceM
odelTypeName
;
turbulencePropertiesDict
.
lookup
(
"
RASm
odel"
)
>>
RASm
odelTypeName
;
}
Info
<<
"Selecting turbulence model "
<<
turbulenceM
odelTypeName
<<
endl
;
Info
<<
"Selecting turbulence model "
<<
RASm
odelTypeName
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
turbulenceM
odelTypeName
);
dictionaryConstructorTablePtr_
->
find
(
RASm
odelTypeName
);
if
(
cstrIter
==
dictionaryConstructorTablePtr_
->
end
())
{
FatalErrorIn
(
"
turbulenceM
odel::New(const volScalarField& rho, "
"
RASm
odel::New(const volScalarField& rho, "
"const volVectorField& U, const surfaceScalarField& phi, "
"basicThermo&)"
)
<<
"Unknown
turbulenceM
odel type "
<<
turbulenceM
odelTypeName
)
<<
"Unknown
RASm
odel type "
<<
RASm
odelTypeName
<<
endl
<<
endl
<<
"Valid
turbulenceM
odel types are :"
<<
endl
<<
"Valid
RASm
odel types are :"
<<
endl
<<
dictionaryConstructorTablePtr_
->
toc
()
<<
exit
(
FatalError
);
}
return
autoPtr
<
turbulenceM
odel
>