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
6c1e5860
Commit
6c1e5860
authored
Feb 02, 2011
by
andy
Browse files
ENH: moved thermo/pdfs->lagrangian/distributionModels
parent
7b567007
Changes
68
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/dieselEngineFoam/Make/options
View file @
6c1e5860
...
...
@@ -35,4 +35,4 @@ EXE_LIBS = \
-llaminarFlameSpeedModels \
-lchemistryModel \
-lODE \
-l
pdf
-l
distributionModels
applications/solvers/combustion/dieselFoam/Make/options
View file @
6c1e5860
...
...
@@ -32,5 +32,5 @@ EXE_LIBS = \
-llaminarFlameSpeedModels \
-lchemistryModel \
-lODE \
-l
pdf
\
-l
distributionModels
\
-lfiniteVolume
applications/solvers/lagrangian/coalChemistryFoam/Make/options
View file @
6c1e5860
...
...
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
-I$(LIB_SRC)/
thermophysicalModels/pdf
s/lnInclude \
-I$(LIB_SRC)/
lagrangian/distributionModel
s/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
...
...
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
View file @
6c1e5860
...
...
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
-I$(LIB_SRC)/
thermophysicalModels/pdf
s/lnInclude \
-I$(LIB_SRC)/
lagrangian/distributionModel
s/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
...
...
applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
View file @
6c1e5860
...
...
@@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/
thermophysicalModels/pdf
s/lnInclude \
-I$(LIB_SRC)/
lagrangian/distributionModel
s/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
...
...
applications/solvers/lagrangian/reactingParcelFoam/Make/options
View file @
6c1e5860
...
...
@@ -4,7 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/
thermophysicalModels/pdf
s/lnInclude \
-I$(LIB_SRC)/
lagrangian/distributionModel
s/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
...
...
applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
View file @
6c1e5860
...
...
@@ -5,7 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
-I$(LIB_SRC)/
thermophysicalModels/pdf
s/lnInclude \
-I$(LIB_SRC)/
lagrangian/distributionModel
s/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
...
...
applications/utilities/miscellaneous/foamDebugSwitches/Make/options
View file @
6c1e5860
...
...
@@ -41,7 +41,7 @@ EXE_LIBS = \
-lmolecule \
-lODE \
-lOpenFOAM \
-l
pdf
\
-l
distributionModels
\
-lpotential \
-lradiationModels \
-lrandomProcesses \
...
...
applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
View file @
6c1e5860
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/
thermophysicalModels/pdf
s/lnInclude \
-I$(LIB_SRC)/
lagrangian/distributionModel
s/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-l
pdf
\
-l
distributionModels
\
-lsampling
applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
View file @
6c1e5860
...
...
@@ -22,7 +22,14 @@
cachedRandom
rndGen
(
label
(
0
),
-
1
);
autoPtr
<
pdfs
::
pdf
>
p
(
pdfs
::
pdf
::
New
(
pdfDictionary
,
rndGen
));
autoPtr
<
distributionModels
::
distributionModel
>
p
(
distributionModels
::
distributionModel
::
New
(
pdfDictionary
,
rndGen
)
);
const
scalar
xMin
=
p
->
minValue
();
const
scalar
xMax
=
p
->
maxValue
();
...
...
applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
View file @
6c1e5860
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -27,7 +27,7 @@ Description
\*---------------------------------------------------------------------------*/
#include
"fvCFD.H"
#include
"
pdf
.H"
#include
"
distributionModel
.H"
#include
"makeGraph.H"
#include
"OFstream.H"
...
...
src/lagrangian/Allwmake
View file @
6c1e5860
...
...
@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory
[
$#
-ge
1
]
&&
makeOption
=
$1
||
makeOption
=
libso
set
-x
wmake
$makeOption
pdf
s
wmake
$makeOption
distributionModel
s
wmake
$makeOption
basic
wmake
$makeOption
solidParticle
wmake
$makeOption
intermediate
...
...
src/lagrangian/coalCombustion/Make/options
View file @
6c1e5860
...
...
@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/
thermophysicalModels/pdf
s/lnInclude \
-I$(LIB_SRC)/
lagrangian/distributionModel
s/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
...
...
@@ -25,7 +25,7 @@ LIB_LIBS = \
-lmeshTools \
-llagrangian \
-llagrangianIntermediate \
-l
pdf
\
-l
distributionModels
\
-lspecie \
-lbasicThermophysicalModels \
-lliquidProperties \
...
...
src/lagrangian/dieselSpray/Make/options
View file @
6c1e5860
...
...
@@ -13,7 +13,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/
thermophysicalModels/pdf
s/lnInclude
-I$(LIB_SRC)/
lagrangian/distributionModel
s/lnInclude
LIB_LIBS = \
-llagrangian \
...
...
@@ -26,4 +26,4 @@ LIB_LIBS = \
-lliquidMixtureProperties \
-lthermophysicalFunctions \
-lspecie \
-l
pdf
-l
distributionModels
src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
View file @
6c1e5860
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -52,11 +52,11 @@ Foam::ChomiakInjector::ChomiakInjector
:
injectorModel
(
dict
,
sm
),
ChomiakDict_
(
dict
.
subDict
(
typeName
+
"Coeffs"
)),
droplet
PDF
_
droplet
DistributionModel
_
(
pdfs
::
pdf
::
New
distributionModels
::
distributionModel
::
New
(
ChomiakDict_
.
subDict
(
"droplet
PDF
"
),
ChomiakDict_
.
subDict
(
"droplet
DistributionModel
"
),
sm
.
rndGen
()
)
),
...
...
@@ -101,7 +101,7 @@ Foam::scalar Foam::ChomiakInjector::d0
const
scalar
)
const
{
return
droplet
PDF
_
->
sample
();
return
droplet
DistributionModel
_
->
sample
();
}
...
...
@@ -113,8 +113,8 @@ Foam::vector Foam::ChomiakInjector::direction
const
scalar
d
)
const
{
scalar
dMin
=
droplet
PDF
_
->
minValue
();
scalar
dMax
=
droplet
PDF
_
->
maxValue
();
scalar
dMin
=
droplet
DistributionModel
_
->
minValue
();
scalar
dMax
=
droplet
DistributionModel
_
->
maxValue
();
scalar
angle
=
(
d
-
dMax
)
*
maxSprayAngle_
[
n
]
...
...
src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H
View file @
6c1e5860
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -27,7 +27,7 @@ Class
Description
Injector model based on an idea of Jerzy Chomiak.
Given the initial droplet size
pdf
in an interval d = (d0, d1),
Given the initial droplet size
distributionModel
in an interval d = (d0, d1),
the spray angle phi = phi(d), such that
the largest droplets have zero spray angle
and the smallest droplets have maximum spray angle.
...
...
@@ -41,7 +41,7 @@ Description
#include
"injectorModel.H"
#include
"scalarList.H"
#include
"
pdf
.H"
#include
"
distributionModel
.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -63,7 +63,7 @@ private:
dictionary
ChomiakDict_
;
autoPtr
<
pdfs
::
pdf
>
dropletPDF
_
;
autoPtr
<
distributionModels
::
distributionModel
>
dropletDistributionModel
_
;
scalarList
maxSprayAngle_
;
...
...
src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
View file @
6c1e5860
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -52,11 +52,11 @@ Foam::definedHollowConeInjector::definedHollowConeInjector
:
injectorModel
(
dict
,
sm
),
definedHollowConeDict_
(
dict
.
subDict
(
typeName
+
"Coeffs"
)),
droplet
PDF
_
droplet
DistributionModel
_
(
pdfs
::
pdf
::
New
distributionModels
::
distributionModel
::
New
(
definedHollowConeDict_
.
subDict
(
"droplet
PDF
"
),
definedHollowConeDict_
.
subDict
(
"droplet
DistributionModel
"
),
sm
.
rndGen
()
)
),
...
...
@@ -137,8 +137,8 @@ Foam::scalar Foam::definedHollowConeInjector::d0
)
const
{
// swallow function arguments - not used
// return value sampled from
PDF
return
droplet
PDF
_
->
sample
();
// return value sampled from
distribution model
return
droplet
DistributionModel
_
->
sample
();
}
...
...
src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H
View file @
6c1e5860
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -29,7 +29,7 @@ Description
- user defined:
- inner/outer cone angle vs. time
- droplet
PDF
- droplet
distribution model
\*---------------------------------------------------------------------------*/
...
...
@@ -38,7 +38,7 @@ Description
#include
"injectorModel.H"
#include
"vector.H"
#include
"
pdf
.H"
#include
"
distributionModel
.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -60,7 +60,7 @@ private:
typedef
VectorSpace
<
Vector
<
scalar
>
,
scalar
,
2
>
pair
;
dictionary
definedHollowConeDict_
;
autoPtr
<
pdfs
::
pdf
>
dropletPDF
_
;
autoPtr
<
distributionModels
::
distributionModel
>
dropletDistributionModel
_
;
// inner and outer cone angle time histories
// 2 column vectors = (time, coneAngle)
...
...
src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
View file @
6c1e5860
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -52,11 +52,11 @@ Foam::hollowConeInjector::hollowConeInjector
:
injectorModel
(
dict
,
sm
),
hollowConeDict_
(
dict
.
subDict
(
typeName
+
"Coeffs"
)),
droplet
PDF
_
droplet
DistributionModel
_
(
pdfs
::
pdf
::
New
distributionModels
::
distributionModel
::
New
(
hollowConeDict_
.
subDict
(
"droplet
PDF
"
),
hollowConeDict_
.
subDict
(
"droplet
DistributionModel
"
),
sm
.
rndGen
()
)
),
...
...
@@ -112,7 +112,7 @@ Foam::scalar Foam::hollowConeInjector::d0
const
scalar
)
const
{
return
droplet
PDF
_
->
sample
();
return
droplet
DistributionModel
_
->
sample
();
}
...
...
src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H
View file @
6c1e5860
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -37,7 +37,7 @@ Description
#include
"injectorModel.H"
#include
"scalarList.H"
#include
"
pdf
.H"
#include
"
distributionModel
.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -58,7 +58,7 @@ private:
dictionary
hollowConeDict_
;
autoPtr
<
pdfs
::
pdf
>
dropletPDF
_
;
autoPtr
<
distributionModels
::
distributionModel
>
dropletDistributionModel
_
;
scalarList
innerAngle_
;
scalarList
outerAngle_
;
...
...
Prev
1
2
3
4
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