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
f4b2b04f
Commit
f4b2b04f
authored
Jun 17, 2008
by
Andrew Heather
Browse files
consistency update
parent
c7a59bb2
Changes
103
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/PDRFoam/PDRFoam.C
View file @
f4b2b04f
...
...
@@ -58,7 +58,7 @@ Description
#include
"fvCFD.H"
#include
"hhuCombustionThermo.H"
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
#include
"laminarFlameSpeed.H"
#include
"XiModel.H"
#include
"PDRDragModel.H"
...
...
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
View file @
f4b2b04f
...
...
@@ -59,7 +59,7 @@ Description
#include
"fvCFD.H"
#include
"dynamicFvMesh.H"
#include
"hhuCombustionThermo.H"
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
#include
"laminarFlameSpeed.H"
#include
"XiModel.H"
#include
"PDRDragModel.H"
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
View file @
f4b2b04f
...
...
@@ -45,7 +45,7 @@ Foam::XiEqModels::basicSubGrid::basicSubGrid
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
View file @
f4b2b04f
...
...
@@ -94,7 +94,7 @@ public:
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
View file @
f4b2b04f
...
...
@@ -45,7 +45,7 @@ Foam::XiGModels::basicSubGrid::basicSubGrid
(
const
dictionary
&
XiGProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
View file @
f4b2b04f
...
...
@@ -85,7 +85,7 @@ public:
(
const
dictionary
&
XiGProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
View file @
f4b2b04f
...
...
@@ -40,7 +40,7 @@ namespace Foam
Foam
::
PDRDragModel
::
PDRDragModel
(
const
dictionary
&
PDRProperties
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
View file @
f4b2b04f
...
...
@@ -38,7 +38,7 @@ SourceFiles
#include
"IOdictionary.H"
#include
"hhuCombustionThermo.H"
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
#include
"multivariateSurfaceInterpolationScheme.H"
#include
"runTimeSelectionTables.H"
...
...
@@ -62,7 +62,7 @@ protected:
dictionary
PDRDragModelCoeffs_
;
const
compressible
::
turbulenceM
odel
&
turbulence_
;
const
compressible
::
RASm
odel
&
turbulence_
;
const
volScalarField
&
rho_
;
const
volVectorField
&
U_
;
const
surfaceScalarField
&
phi_
;
...
...
@@ -96,7 +96,7 @@ public:
dictionary
,
(
const
dictionary
&
PDRProperties
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
@@ -117,7 +117,7 @@ public:
static
autoPtr
<
PDRDragModel
>
New
(
const
dictionary
&
PDRProperties
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
@@ -130,7 +130,7 @@ public:
PDRDragModel
(
const
dictionary
&
PDRProperties
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
View file @
f4b2b04f
...
...
@@ -31,7 +31,7 @@ License
Foam
::
autoPtr
<
Foam
::
PDRDragModel
>
Foam
::
PDRDragModel
::
New
(
const
dictionary
&
PDRProperties
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
View file @
f4b2b04f
...
...
@@ -44,7 +44,7 @@ namespace PDRDragModels
Foam
::
PDRDragModels
::
basic
::
basic
(
const
dictionary
&
PDRProperties
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
View file @
f4b2b04f
...
...
@@ -86,7 +86,7 @@ public:
basic
(
const
dictionary
&
PDRProperties
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View file @
f4b2b04f
...
...
@@ -41,7 +41,7 @@ namespace RAS
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug
(
PDRkEpsilon
,
0
);
addToRunTimeSelectionTable
(
turbulenceM
odel
,
PDRkEpsilon
,
dictionary
);
addToRunTimeSelectionTable
(
RASm
odel
,
PDRkEpsilon
,
dictionary
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
...
...
@@ -53,17 +53,17 @@ PDRkEpsilon::PDRkEpsilon
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
)),
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
)),
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_
(
...
...
@@ -164,14 +164,14 @@ tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff(volVectorField& U) const
bool
PDRkEpsilon
::
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
>
(
"alphak"
,
alphak
);
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
>
(
"alphak"
,
alphak
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphaEps"
,
alphaEps
);
RASm
odelCoeffs_
.
readIfPresent
<
scalar
>
(
"alphah"
,
alphah
);
return
true
;
}
...
...
@@ -192,7 +192,7 @@ void PDRkEpsilon::correct()
return
;
}
turbulenceM
odel
::
correct
();
RASm
odel
::
correct
();
volScalarField
divU
=
fvc
::
div
(
phi_
/
fvc
::
interpolate
(
rho_
));
...
...
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View file @
f4b2b04f
...
...
@@ -37,7 +37,7 @@ SourceFiles
#ifndef compressiblePDRkEpsilon_H
#define compressiblePDRkEpsilon_H
#include
"
turbulenceM
odel.H"
#include
"
RASm
odel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -54,7 +54,7 @@ namespace RAS
class
PDRkEpsilon
:
public
turbulenceM
odel
public
RASm
odel
{
// Private data
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
View file @
f4b2b04f
...
...
@@ -45,7 +45,7 @@ Foam::XiEqModels::Gulder::Gulder
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
View file @
f4b2b04f
...
...
@@ -82,7 +82,7 @@ public:
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
View file @
f4b2b04f
...
...
@@ -45,7 +45,7 @@ Foam::XiEqModels::SCOPEBlend::SCOPEBlend
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
View file @
f4b2b04f
...
...
@@ -83,7 +83,7 @@ public:
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
View file @
f4b2b04f
...
...
@@ -45,7 +45,7 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
View file @
f4b2b04f
...
...
@@ -90,7 +90,7 @@ public:
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
View file @
f4b2b04f
...
...
@@ -41,7 +41,7 @@ Foam::XiEqModel::XiEqModel
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
turbulenceM
odel
&
turbulence
,
const
compressible
::
RASm
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
Prev
1
2
3
4
5
6
Next
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