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
56fd8890
Commit
56fd8890
authored
Jun 20, 2008
by
Andrew Heather
Browse files
consistency updates
parent
8a9d0320
Changes
314
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/PDRFoam/Make/options
View file @
56fd8890
...
...
@@ -20,7 +20,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lmeshTools \
-lcompressibleRAS
m
odels \
-lcompressibleRAS
M
odels \
-lbasicThermophysicalModels \
-lcombustionThermophysicalModels \
-lspecie \
...
...
applications/solvers/combustion/PDRFoam/PDRFoam.C
View file @
56fd8890
...
...
@@ -58,7 +58,7 @@ Description
#include
"fvCFD.H"
#include
"hhuCombustionThermo.H"
#include
"RAS
m
odel.H"
#include
"RAS
M
odel.H"
#include
"laminarFlameSpeed.H"
#include
"XiModel.H"
#include
"PDRDragModel.H"
...
...
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
View file @
56fd8890
...
...
@@ -59,7 +59,7 @@ Description
#include
"fvCFD.H"
#include
"dynamicFvMesh.H"
#include
"hhuCombustionThermo.H"
#include
"RAS
m
odel.H"
#include
"RAS
M
odel.H"
#include
"laminarFlameSpeed.H"
#include
"XiModel.H"
#include
"PDRDragModel.H"
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
View file @
56fd8890
...
...
@@ -45,7 +45,7 @@ Foam::XiEqModels::basicSubGrid::basicSubGrid
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
View file @
56fd8890
...
...
@@ -94,7 +94,7 @@ public:
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
View file @
56fd8890
...
...
@@ -45,7 +45,7 @@ Foam::XiGModels::basicSubGrid::basicSubGrid
(
const
dictionary
&
XiGProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
View file @
56fd8890
...
...
@@ -85,7 +85,7 @@ public:
(
const
dictionary
&
XiGProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
View file @
56fd8890
...
...
@@ -40,7 +40,7 @@ namespace Foam
Foam
::
PDRDragModel
::
PDRDragModel
(
const
dictionary
&
PDRProperties
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
View file @
56fd8890
...
...
@@ -38,7 +38,7 @@ SourceFiles
#include
"IOdictionary.H"
#include
"hhuCombustionThermo.H"
#include
"RAS
m
odel.H"
#include
"RAS
M
odel.H"
#include
"multivariateSurfaceInterpolationScheme.H"
#include
"runTimeSelectionTables.H"
...
...
@@ -62,7 +62,7 @@ protected:
dictionary
PDRDragModelCoeffs_
;
const
compressible
::
RAS
m
odel
&
turbulence_
;
const
compressible
::
RAS
M
odel
&
turbulence_
;
const
volScalarField
&
rho_
;
const
volVectorField
&
U_
;
const
surfaceScalarField
&
phi_
;
...
...
@@ -96,7 +96,7 @@ public:
dictionary
,
(
const
dictionary
&
PDRProperties
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
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
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
@@ -130,7 +130,7 @@ public:
PDRDragModel
(
const
dictionary
&
PDRProperties
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
View file @
56fd8890
...
...
@@ -31,7 +31,7 @@ License
Foam
::
autoPtr
<
Foam
::
PDRDragModel
>
Foam
::
PDRDragModel
::
New
(
const
dictionary
&
PDRProperties
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
View file @
56fd8890
...
...
@@ -44,7 +44,7 @@ namespace PDRDragModels
Foam
::
PDRDragModels
::
basic
::
basic
(
const
dictionary
&
PDRProperties
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
View file @
56fd8890
...
...
@@ -86,7 +86,7 @@ public:
basic
(
const
dictionary
&
PDRProperties
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
rho
,
const
volVectorField
&
U
,
const
surfaceScalarField
&
phi
...
...
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View file @
56fd8890
...
...
@@ -35,13 +35,13 @@ namespace Foam
{
namespace
compressible
{
namespace
RAS
namespace
RAS
Models
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug
(
PDRkEpsilon
,
0
);
addToRunTimeSelectionTable
(
RAS
m
odel
,
PDRkEpsilon
,
dictionary
);
addToRunTimeSelectionTable
(
RAS
M
odel
,
PDRkEpsilon
,
dictionary
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
...
...
@@ -53,17 +53,62 @@ PDRkEpsilon::PDRkEpsilon
basicThermo
&
thermophysicalModel
)
:
RAS
m
odel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
RAS
M
odel
(
typeName
,
rho
,
U
,
phi
,
thermophysicalModel
),
Cmu
(
RASmodelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"Cmu"
,
0
.
09
)),
C1
(
RASmodelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C1"
,
1
.
44
)),
C2
(
RASmodelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"C2"
,
1
.
92
)),
alphak
(
RASmodelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphak"
,
1
.
0
)),
alphaEps
Cmu_
(
RASmodelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphaEps"
,
0
.
76923
)
dimensioned
<
scalar
>::
lookupOrAddToDict
(
"Cmu"
,
coeffDict_
,
0
.
09
)
),
C1_
(
dimensioned
<
scalar
>::
lookupOrAddToDict
(
"C1"
,
coeffDict_
,
1
.
44
)
),
C2_
(
dimensioned
<
scalar
>::
lookupOrAddToDict
(
"C2"
,
coeffDict_
,
1
.
92
)
),
alphak_
(
dimensioned
<
scalar
>::
lookupOrAddToDict
(
"alphak"
,
coeffDict_
,
1
.
0
)
),
alphaEps_
(
dimensioned
<
scalar
>::
lookupOrAddToDict
(
"alphaEps"
,
coeffDict_
,
0
.
76923
)
),
alphah_
(
dimensioned
<
scalar
>::
lookupOrAddToDict
(
"alphah"
,
coeffDict_
,
1
.
0
)
),
alphah
(
RASmodelCoeffs_
.
lookupOrAddDefault
<
scalar
>
(
"alphah"
,
1
.
0
)),
k_
(
...
...
@@ -101,7 +146,7 @@ PDRkEpsilon::PDRkEpsilon
IOobject
::
NO_READ
,
IOobject
::
NO_WRITE
),
Cmu
*
rho_
*
sqr
(
k_
)
/
(
epsilon_
+
epsilonSmall_
)
Cmu
_
*
rho_
*
sqr
(
k_
)
/
(
epsilon_
+
epsilonSmall_
)
)
{
# include "wallViscosityI.H"
...
...
@@ -164,14 +209,14 @@ tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff(volVectorField& U) const
bool
PDRkEpsilon
::
read
()
{
if
(
RAS
m
odel
::
read
())
if
(
RAS
M
odel
::
read
())
{
RASmodelCoeffs
_
.
readIfPresent
<
scalar
>
(
"Cmu"
,
Cmu
);
RASmodelCoeffs
_
.
readIfPresent
<
scalar
>
(
"C1"
,
C1
);
RASmodelCoeffs
_
.
readIfPresent
<
scalar
>
(
"C2"
,
C2
);
RASmodelCoeffs
_
.
readIfPresent
<
scalar
>
(
"alphak"
,
alphak
);
RASmodelCoeff
s_
.
readIfPresent
<
scalar
>
(
"alphaEps"
,
alphaEps
);
RASmodelCoeffs
_
.
readIfPresent
<
scalar
>
(
"alphah"
,
alphah
);
Cmu
_
.
readIfPresent
(
coeffDict_
);
C1
_
.
readIfPresent
(
coeffDict_
);
C2
_
.
readIfPresent
(
coeffDict_
);
alphak
_
.
readIfPresent
(
coeffDict_
);
alphaEp
s_
.
readIfPresent
(
coeffDict_
);
alphah
_
.
readIfPresent
(
coeffDict_
);
return
true
;
}
...
...
@@ -187,12 +232,12 @@ void PDRkEpsilon::correct()
if
(
!
turbulence_
)
{
// Re-calculate viscosity
mut_
=
rho_
*
Cmu
*
sqr
(
k_
)
/
(
epsilon_
+
epsilonSmall_
);
mut_
=
rho_
*
Cmu
_
*
sqr
(
k_
)
/
(
epsilon_
+
epsilonSmall_
);
# include "wallViscosityI.H"
return
;
}
RAS
m
odel
::
correct
();
RAS
M
odel
::
correct
();
volScalarField
divU
=
fvc
::
div
(
phi_
/
fvc
::
interpolate
(
rho_
));
...
...
@@ -223,9 +268,9 @@ void PDRkEpsilon::correct()
+
fvm
::
div
(
phi_
,
epsilon_
)
-
fvm
::
laplacian
(
DepsilonEff
(),
epsilon_
)
==
C1
*
(
betav
*
G
+
GR
)
*
epsilon_
/
k_
-
fvm
::
SuSp
(((
2
.
0
/
3
.
0
)
*
C1
)
*
betav
*
rho_
*
divU
,
epsilon_
)
-
fvm
::
Sp
(
C2
*
betav
*
rho_
*
epsilon_
/
k_
,
epsilon_
)
C1
_
*
(
betav
*
G
+
GR
)
*
epsilon_
/
k_
-
fvm
::
SuSp
(((
2
.
0
/
3
.
0
)
*
C1
_
)
*
betav
*
rho_
*
divU
,
epsilon_
)
-
fvm
::
Sp
(
C2
_
*
betav
*
rho_
*
epsilon_
/
k_
,
epsilon_
)
);
# include "wallDissipationI.H"
...
...
@@ -255,7 +300,7 @@ void PDRkEpsilon::correct()
// Re-calculate viscosity
mut_
=
rho_
*
Cmu
*
sqr
(
k_
)
/
epsilon_
;
mut_
=
rho_
*
Cmu
_
*
sqr
(
k_
)
/
epsilon_
;
# include "wallViscosityI.H"
...
...
@@ -264,7 +309,7 @@ void PDRkEpsilon::correct()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
}
// End namespace RAS
}
// End namespace RAS
Models
}
// End namespace compressible
}
// End namespace Foam
...
...
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View file @
56fd8890
...
...
@@ -37,7 +37,7 @@ SourceFiles
#ifndef compressiblePDRkEpsilon_H
#define compressiblePDRkEpsilon_H
#include
"RAS
m
odel.H"
#include
"RAS
M
odel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -45,7 +45,7 @@ namespace Foam
{
namespace
compressible
{
namespace
RAS
namespace
RAS
Models
{
/*---------------------------------------------------------------------------*\
...
...
@@ -54,16 +54,16 @@ namespace RAS
class
PDRkEpsilon
:
public
RAS
m
odel
public
RAS
M
odel
{
// Private data
s
calar
Cmu
;
s
calar
C1
;
s
calar
C2
;
s
calar
alphak
;
s
calar
alphaEps
;
s
calar
alphah
;
dimensionedS
calar
Cmu
_
;
dimensionedS
calar
C1
_
;
dimensionedS
calar
C2
_
;
dimensionedS
calar
alphak
_
;
dimensionedS
calar
alphaEps
_
;
dimensionedS
calar
alphah
_
;
volScalarField
k_
;
volScalarField
epsilon_
;
...
...
@@ -105,7 +105,7 @@ public:
{
return
tmp
<
volScalarField
>
(
new
volScalarField
(
"DkEff"
,
alphak
*
mut_
+
mu
())
new
volScalarField
(
"DkEff"
,
alphak
_
*
mut_
+
mu
())
);
}
...
...
@@ -114,7 +114,7 @@ public:
{
return
tmp
<
volScalarField
>
(
new
volScalarField
(
"DepsilonEff"
,
alphaEps
*
mut_
+
mu
())
new
volScalarField
(
"DepsilonEff"
,
alphaEps
_
*
mut_
+
mu
())
);
}
...
...
@@ -123,7 +123,7 @@ public:
{
return
tmp
<
volScalarField
>
(
new
volScalarField
(
"alphaEff"
,
alphah
*
mut_
+
alpha
())
new
volScalarField
(
"alphaEff"
,
alphah
_
*
mut_
+
alpha
())
);
}
...
...
@@ -158,7 +158,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
}
// End namespace RAS
}
// End namespace RAS
Models
}
// End namespace compressible
}
// End namespace Foam
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
View file @
56fd8890
...
...
@@ -45,7 +45,7 @@ Foam::XiEqModels::Gulder::Gulder
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
View file @
56fd8890
...
...
@@ -82,7 +82,7 @@ public:
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
View file @
56fd8890
...
...
@@ -45,7 +45,7 @@ Foam::XiEqModels::SCOPEBlend::SCOPEBlend
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
View file @
56fd8890
...
...
@@ -83,7 +83,7 @@ public:
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
View file @
56fd8890
...
...
@@ -45,7 +45,7 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
)
:
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
View file @
56fd8890
...
...
@@ -90,7 +90,7 @@ public:
(
const
dictionary
&
XiEqProperties
,
const
hhuCombustionThermo
&
thermo
,
const
compressible
::
RAS
m
odel
&
turbulence
,
const
compressible
::
RAS
M
odel
&
turbulence
,
const
volScalarField
&
Su
);
...
...
Prev
1
2
3
4
5
…
16
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