diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options
index 5f047de2588c19f4d6a40cb18d71070c1f2ad652..c4d65fa137e5afa137669220ffae425c4d126430 100644
--- a/applications/solvers/combustion/dieselEngineFoam/Make/options
+++ b/applications/solvers/combustion/dieselEngineFoam/Make/options
@@ -35,4 +35,4 @@ EXE_LIBS = \
-llaminarFlameSpeedModels \
-lchemistryModel \
-lODE \
- -lpdf
+ -ldistributionModels
diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options
index 427ccfc98b189da78b801291600fb541a4e2b133..124371575d752b3051af50923a0bde4f20fc3609 100644
--- a/applications/solvers/combustion/dieselFoam/Make/options
+++ b/applications/solvers/combustion/dieselFoam/Make/options
@@ -32,5 +32,5 @@ EXE_LIBS = \
-llaminarFlameSpeedModels \
-lchemistryModel \
-lODE \
- -lpdf \
+ -ldistributionModels \
-lfiniteVolume
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 17cd096198731dc4a6163d96be94dada06bf6ea8..a2e3c13d24096faafeff43dc7069c955e52789e5 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -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/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
index 063236d23e41e6a8616859d09471e8107ed85fea..e679c15b7e6f6458bb4f8a94c0dedb58dd9f293c 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
@@ -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/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index 9b9f551e8dd4572d22d1e515a6b5e4b521a8232e..ba7c9544a84706195ba131dbd07e89e552e4f7fc 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -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/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index 579a6e47dbab1e37b90439c1a3ab9e6a86a2532d..062f9fbd28a4abd642f445ee8d6f60ed86cf316b 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -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/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
index 063236d23e41e6a8616859d09471e8107ed85fea..e679c15b7e6f6458bb4f8a94c0dedb58dd9f293c 100644
--- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
@@ -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/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 9641909235d17a0aecb31e7dce021a2df1906bf7..826bc4c144f01bf27c3e9f1ac301e3c612c58611 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -41,7 +41,7 @@ EXE_LIBS = \
-lmolecule \
-lODE \
-lOpenFOAM \
- -lpdf \
+ -ldistributionModels \
-lpotential \
-lradiationModels \
-lrandomProcesses \
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options b/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
index a140053895021e4469c8f776270a59a1acf433c7..0cb69c876f20e53fb396829e8b91ca5bd0e9dcb4 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options
@@ -1,8 +1,8 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
- -lpdf \
+ -ldistributionModels \
-lsampling
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
index 8e9d055d74cd64fb580e4739b643df7790d454f4..a269ef7448bfdcd9a61b6b055fd7c58937e4e312 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
@@ -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();
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
index d9c9388adc704a2243643d74caa9581eec96e748..1a92c004a2b3de0faa4499a30a80250a57806cf0 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 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"
diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index 93d014f5cbef72998bcc21df6f6210d6a2d0edf4..908338e62f2a6efbcfc54eb13c3efe4e48b00466 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory
[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
set -x
-wmake $makeOption pdfs
+wmake $makeOption distributionModels
wmake $makeOption basic
wmake $makeOption solidParticle
wmake $makeOption intermediate
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index dc7db16ea77b53d6c4620b67b3d0f7cbb3cebca3..33cc415fdf5eabc427030b0dd4ae94b955fcfd10 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -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/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/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 \
- -lpdf \
+ -ldistributionModels \
-lspecie \
-lbasicThermophysicalModels \
-lliquidProperties \
diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options
index 8465ce4ed244cabfd52f6590537b9481307da8cb..4d4eba8a2d56feae98e84bda81839c7e71c82a1f 100644
--- a/src/lagrangian/dieselSpray/Make/options
+++ b/src/lagrangian/dieselSpray/Make/options
@@ -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/pdfs/lnInclude
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude
LIB_LIBS = \
-llagrangian \
@@ -26,4 +26,4 @@ LIB_LIBS = \
-lliquidMixtureProperties \
-lthermophysicalFunctions \
-lspecie \
- -lpdf
+ -ldistributionModels
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
index 4f80e0c57709f616aa5be0aa00246f362144d3da..0318dbb1fa89be89a5223c44a1487f33b1acdd9b 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,11 +52,11 @@ Foam::ChomiakInjector::ChomiakInjector
:
injectorModel(dict, sm),
ChomiakDict_(dict.subDict(typeName + "Coeffs")),
- dropletPDF_
+ dropletDistributionModel_
(
- pdfs::pdf::New
+ distributionModels::distributionModel::New
(
- ChomiakDict_.subDict("dropletPDF"),
+ ChomiakDict_.subDict("dropletDistributionModel"),
sm.rndGen()
)
),
@@ -101,7 +101,7 @@ Foam::scalar Foam::ChomiakInjector::d0
const scalar
) const
{
- return dropletPDF_->sample();
+ return dropletDistributionModel_->sample();
}
@@ -113,8 +113,8 @@ Foam::vector Foam::ChomiakInjector::direction
const scalar d
) const
{
- scalar dMin = dropletPDF_->minValue();
- scalar dMax = dropletPDF_->maxValue();
+ scalar dMin = dropletDistributionModel_->minValue();
+ scalar dMax = dropletDistributionModel_->maxValue();
scalar angle =
(d - dMax)*maxSprayAngle_[n]
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H
index 41ca27335d85d2a1aac4513ec4af52f91ac34da5..2803334068e3c238236cc8505dfcc7a2eea424a4 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 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_;
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
index 1fc417ba6f7580035283f2e666bd0042a66527b0..17e65d4d5db2b441ec536401c51478e2241666f4 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,11 +52,11 @@ Foam::definedHollowConeInjector::definedHollowConeInjector
:
injectorModel(dict, sm),
definedHollowConeDict_(dict.subDict(typeName + "Coeffs")),
- dropletPDF_
+ dropletDistributionModel_
(
- pdfs::pdf::New
+ distributionModels::distributionModel::New
(
- definedHollowConeDict_.subDict("dropletPDF"),
+ definedHollowConeDict_.subDict("dropletDistributionModel"),
sm.rndGen()
)
),
@@ -137,8 +137,8 @@ Foam::scalar Foam::definedHollowConeInjector::d0
) const
{
// swallow function arguments - not used
- // return value sampled from PDF
- return dropletPDF_->sample();
+ // return value sampled from distribution model
+ return dropletDistributionModel_->sample();
}
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H
index 469b0e0ae55a34de41539090f4ad28b35c93e8fe..ec08e64aeadfe8d81bde24b74be675efdd217b2c 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 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)
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
index 3be1a660f1a2b8305c64d16d750623abd931bffb..198c30eaa8c4292884aa348fbecaad12b4e56c7b 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,11 +52,11 @@ Foam::hollowConeInjector::hollowConeInjector
:
injectorModel(dict, sm),
hollowConeDict_(dict.subDict(typeName + "Coeffs")),
- dropletPDF_
+ dropletDistributionModel_
(
- pdfs::pdf::New
+ distributionModels::distributionModel::New
(
- hollowConeDict_.subDict("dropletPDF"),
+ hollowConeDict_.subDict("dropletDistributionModel"),
sm.rndGen()
)
),
@@ -112,7 +112,7 @@ Foam::scalar Foam::hollowConeInjector::d0
const scalar
) const
{
- return dropletPDF_->sample();
+ return dropletDistributionModel_->sample();
}
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H
index 6c956df4658a3422c56ae70b1d258bbfc62cf25c..3c80c2b2d408a1114290c87ef7d6686e516ee9a6 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 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_;
diff --git a/src/lagrangian/pdfs/Make/files b/src/lagrangian/distributionModels/Make/files
similarity index 56%
rename from src/lagrangian/pdfs/Make/files
rename to src/lagrangian/distributionModels/Make/files
index e032b86bc52be99672ae84f30a90035956b266a1..c7b621cf58f61832e575a0e71ad3e27fcd990119 100644
--- a/src/lagrangian/pdfs/Make/files
+++ b/src/lagrangian/distributionModels/Make/files
@@ -1,5 +1,5 @@
-pdf/pdf.C
-pdf/pdfNew.C
+distributionModel/distributionModel.C
+distributionModel/distributionModelNew.C
exponential/exponential.C
fixedValue/fixedValue.C
@@ -9,4 +9,4 @@ normal/normal.C
RosinRammler/RosinRammler.C
uniform/uniform.C
-LIB = $(FOAM_LIBBIN)/libpdf
+LIB = $(FOAM_LIBBIN)/libdistributionModels
diff --git a/src/lagrangian/pdfs/Make/options b/src/lagrangian/distributionModels/Make/options
similarity index 100%
rename from src/lagrangian/pdfs/Make/options
rename to src/lagrangian/distributionModels/Make/options
diff --git a/src/lagrangian/pdfs/RosinRammler/RosinRammler.C b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
similarity index 69%
rename from src/lagrangian/pdfs/RosinRammler/RosinRammler.C
rename to src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
index a39d48aa69b4c5c2dae7251a428a0b85382777ae..f3338f92efff09ab22c89769a45d7051f86da419 100644
--- a/src/lagrangian/pdfs/RosinRammler/RosinRammler.C
+++ b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,34 +30,34 @@ License
namespace Foam
{
- namespace pdfs
+ namespace distributionModels
{
defineTypeNameAndDebug(RosinRammler, 0);
- addToRunTimeSelectionTable(pdf, RosinRammler, dictionary);
+ addToRunTimeSelectionTable(distributionModel, RosinRammler, dictionary);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pdfs::RosinRammler::RosinRammler
+Foam::distributionModels::RosinRammler::RosinRammler
(
const dictionary& dict,
cachedRandom& rndGen
)
:
- pdf(typeName, dict, rndGen),
- minValue_(readScalar(pdfDict_.lookup("minValue"))),
- maxValue_(readScalar(pdfDict_.lookup("maxValue"))),
- d_(readScalar(pdfDict_.lookup("d"))),
- n_(readScalar(pdfDict_.lookup("n")))
+ distributionModel(typeName, dict, rndGen),
+ minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
+ maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
+ d_(readScalar(distributionModelDict_.lookup("d"))),
+ n_(readScalar(distributionModelDict_.lookup("n")))
{
check();
}
-Foam::pdfs::RosinRammler::RosinRammler(const RosinRammler& p)
+Foam::distributionModels::RosinRammler::RosinRammler(const RosinRammler& p)
:
- pdf(p),
+ distributionModel(p),
minValue_(p.minValue_),
maxValue_(p.maxValue_),
d_(p.d_),
@@ -67,13 +67,13 @@ Foam::pdfs::RosinRammler::RosinRammler(const RosinRammler& p)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::pdfs::RosinRammler::~RosinRammler()
+Foam::distributionModels::RosinRammler::~RosinRammler()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::pdfs::RosinRammler::sample() const
+Foam::scalar Foam::distributionModels::RosinRammler::sample() const
{
scalar K = 1.0 - exp(-pow((maxValue_ - minValue_)/d_, n_));
scalar y = rndGen_.sample01<scalar>();
@@ -82,13 +82,13 @@ Foam::scalar Foam::pdfs::RosinRammler::sample() const
}
-Foam::scalar Foam::pdfs::RosinRammler::minValue() const
+Foam::scalar Foam::distributionModels::RosinRammler::minValue() const
{
return minValue_;
}
-Foam::scalar Foam::pdfs::RosinRammler::maxValue() const
+Foam::scalar Foam::distributionModels::RosinRammler::maxValue() const
{
return maxValue_;
}
diff --git a/src/lagrangian/pdfs/RosinRammler/RosinRammler.H b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
similarity index 86%
rename from src/lagrangian/pdfs/RosinRammler/RosinRammler.H
rename to src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
index eb03127686c3aff70876fb67d2e1a75bffa8317f..8fd67cc5a4c2a2327ac5d8f1bc33d856609f799a 100644
--- a/src/lagrangian/pdfs/RosinRammler/RosinRammler.H
+++ b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,10 +25,10 @@ Class
Foam::RosinRammler
Description
- Rosin-Rammler pdf
+ Rosin-Rammler distributionModel
@f[
- cumulative pdf =
+ cumulative model =
(1.0 - exp( -(( x - d0)/d)^n )
/ (1.0 - exp( -((d1 - d0)/d)^n )
@f]
@@ -42,13 +42,13 @@ SourceFiles
#ifndef RosinRammler_H
#define RosinRammler_H
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-namespace pdfs
+namespace distributionModels
{
/*---------------------------------------------------------------------------*\
@@ -57,7 +57,7 @@ namespace pdfs
class RosinRammler
:
- public pdf
+ public distributionModel
{
// Private data
@@ -88,9 +88,9 @@ public:
RosinRammler(const RosinRammler& p);
//- Construct and return a clone
- virtual autoPtr<pdf> clone() const
+ virtual autoPtr<distributionModel> clone() const
{
- return autoPtr<pdf>(new RosinRammler(*this));
+ return autoPtr<distributionModel>(new RosinRammler(*this));
}
@@ -100,7 +100,7 @@ public:
// Member Functions
- //- Sample the pdf
+ //- Sample the distributionModel
virtual scalar sample() const;
//- Return the minimum value
@@ -113,7 +113,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace pdfs
+} // End namespace distributionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/pdfs/pdf/pdf.C b/src/lagrangian/distributionModels/distributionModel/distributionModel.C
similarity index 54%
rename from src/lagrangian/pdfs/pdf/pdf.C
rename to src/lagrangian/distributionModels/distributionModel/distributionModel.C
index 14f6d659c063cc3d36bb8ae824bc7b28f6e8b863..e2be585969b8237bd4f945c507d44e6704c017a8 100644
--- a/src/lagrangian/pdfs/pdf/pdf.C
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,36 +23,36 @@ License
\*---------------------------------------------------------------------------*/
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
- namespace pdfs
+ namespace distributionModels
{
- defineTypeNameAndDebug(pdf, 0);
- defineRunTimeSelectionTable(pdf, dictionary);
+ defineTypeNameAndDebug(distributionModel, 0);
+ defineRunTimeSelectionTable(distributionModel, dictionary);
}
}
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
-void Foam::pdfs::pdf::check() const
+void Foam::distributionModels::distributionModel::check() const
{
if (minValue() < 0)
{
- FatalErrorIn("pdfs::pdf::check() const")
- << type() << "PDF: Minimum value must be greater than zero." << nl
- << "Supplied minValue = " << minValue()
+ FatalErrorIn("distributionModels::distributionModel::check() const")
+ << type() << "distribution: Minimum value must be greater than "
+ << "zero." << nl << "Supplied minValue = " << minValue()
<< abort(FatalError);
}
if (maxValue() < minValue())
{
- FatalErrorIn("pdfs::pdf::check() const")
- << type() << "PDF: Maximum value is smaller than the minimum value:"
- << nl << " maxValue = " << maxValue()
+ FatalErrorIn("distributionModels::distributionModel::check() const")
+ << type() << "distribution: Maximum value is smaller than the "
+ << "minimum value:" << nl << " maxValue = " << maxValue()
<< ", minValue = " << minValue()
<< abort(FatalError);
}
@@ -61,50 +61,65 @@ void Foam::pdfs::pdf::check() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pdfs::pdf::pdf
+Foam::distributionModels::distributionModel::distributionModel
(
const word& name,
const dictionary& dict,
cachedRandom& rndGen
)
:
- pdfDict_(dict.subDict(name + "PDF")),
+ distributionModelDict_(dict.subDict(name + "Distribution")),
rndGen_(rndGen)
{}
-Foam::pdfs::pdf::pdf(const pdf& p)
+Foam::distributionModels::distributionModel::distributionModel
+(
+ const distributionModel& p
+)
:
- pdfDict_(p.pdfDict_),
+ distributionModelDict_(p.distributionModelDict_),
rndGen_(p.rndGen_)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::pdfs::pdf::~pdf()
+Foam::distributionModels::distributionModel::~distributionModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::pdfs::pdf::sample() const
+Foam::scalar Foam::distributionModels::distributionModel::sample() const
{
- notImplemented("Foam::scalar Foam::pdfs::pdf::sample() const");
+ notImplemented
+ (
+ "Foam::scalar "
+ "Foam::distributionModels::distributionModel::sample() const"
+ );
return 0.0;
}
-Foam::scalar Foam::pdfs::pdf::minValue() const
+Foam::scalar Foam::distributionModels::distributionModel::minValue() const
{
- notImplemented("Foam::scalar Foam::pdfs::pdf::minValue() const");
+ notImplemented
+ (
+ "Foam::scalar "
+ "Foam::distributionModels::distributionModel::minValue() const"
+ );
return 0.0;
}
-Foam::scalar Foam::pdfs::pdf::maxValue() const
+Foam::scalar Foam::distributionModels::distributionModel::maxValue() const
{
- notImplemented("Foam::scalar Foam::pdfs::pdf::maxValue() const");
+ notImplemented
+ (
+ "Foam::scalar "
+ "Foam::distributionModels::distributionModel::maxValue() const"
+ );
return 0.0;
}
diff --git a/src/lagrangian/pdfs/pdf/pdf.H b/src/lagrangian/distributionModels/distributionModel/distributionModel.H
similarity index 68%
rename from src/lagrangian/pdfs/pdf/pdf.H
rename to src/lagrangian/distributionModels/distributionModel/distributionModel.H
index d61ace2649dd9276a320047bd9d393e45f124e32..26c6eaa5a4be1bef70971b7b0ce65c328b76e5b8 100644
--- a/src/lagrangian/pdfs/pdf/pdf.H
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -22,14 +22,14 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::pdf
+ Foam::distributionModel
Description
- A library of runtime-selectable PDF's.
+ A library of runtime-selectable distribution models.
Returns a sampled value given the expectation (nu) and variance (sigma^2)
- Current PDF's include:
+ Current distribution models include:
- exponential
- fixedValue
- general
@@ -38,19 +38,19 @@ Description
- Rosin-Rammler
- uniform
- The pdf is tabulated in equidistant nPoints, in an interval.
- These values are integrated to obtain the cumulated PDF,
+ The distributionModel is tabulated in equidistant nPoints, in an interval.
+ These values are integrated to obtain the cumulated distribution model,
which is then used to change the distribution from unifrom to
- the actual pdf.
+ the actual distributionModel.
SourceFiles
- pdf.C
- pdfNew.C
+ distributionModel.C
+ distributionModelNew.C
\*---------------------------------------------------------------------------*/
-#ifndef pdf_H
-#define pdf_H
+#ifndef distributionModel_H
+#define distributionModel_H
#include "IOdictionary.H"
#include "autoPtr.H"
@@ -60,14 +60,14 @@ SourceFiles
namespace Foam
{
-namespace pdfs
+namespace distributionModels
{
/*---------------------------------------------------------------------------*\
- Class pdf Declaration
+ Class distributionModel Declaration
\*---------------------------------------------------------------------------*/
-class pdf
+class distributionModel
{
protected:
@@ -75,7 +75,7 @@ protected:
// Protected data
//- Coefficients dictionary
- const dictionary pdfDict_;
+ const dictionary distributionModelDict_;
//- Reference to the random number generator
cachedRandom& rndGen_;
@@ -83,21 +83,21 @@ protected:
// Protected Member Functions
- //- Check that the PDF is valid
+ //- Check that the distribution model is valid
virtual void check() const;
public:
//-Runtime type information
- TypeName("pdf");
+ TypeName("distributionModel");
//- Declare runtime constructor selection table
declareRunTimeSelectionTable
(
autoPtr,
- pdf,
+ distributionModel,
dictionary,
(
const dictionary& dict,
@@ -110,29 +110,38 @@ public:
// Constructors
//- Construct from dictionary
- pdf(const word& name, const dictionary& dict, cachedRandom& rndGen);
+ distributionModel
+ (
+ const word& name,
+ const dictionary& dict,
+ cachedRandom& rndGen
+ );
//- Construct copy
- pdf(const pdf& p);
+ distributionModel(const distributionModel& p);
//- Construct and return a clone
- virtual autoPtr<pdf> clone() const
+ virtual autoPtr<distributionModel> clone() const
{
- return autoPtr<pdf>(new pdf(*this));
+ return autoPtr<distributionModel>(new distributionModel(*this));
}
//- Selector
- static autoPtr<pdf> New(const dictionary& dict, cachedRandom& rndGen);
+ static autoPtr<distributionModel> New
+ (
+ const dictionary& dict,
+ cachedRandom& rndGen
+ );
//- Destructor
- virtual ~pdf();
+ virtual ~distributionModel();
// Member Functions
- //- Sample the pdf
+ //- Sample the distributionModel
virtual scalar sample() const;
//- Return the minimum value
@@ -145,7 +154,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace pdfs
+} // End namespace distributionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/pdfs/pdf/pdfNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
similarity index 68%
rename from src/lagrangian/pdfs/pdf/pdfNew.C
rename to src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
index 634972ceb7695d44ea84e140685816fafebd6084..7084be427565e96ef4be50bd62fdae8f90f6fc6c 100644
--- a/src/lagrangian/pdfs/pdf/pdfNew.C
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,33 +23,41 @@ License
\*---------------------------------------------------------------------------*/
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-Foam::autoPtr<Foam::pdfs::pdf> Foam::pdfs::pdf::New
+Foam::autoPtr<Foam::distributionModels::distributionModel>
+Foam::distributionModels::distributionModel::New
(
const dictionary& dict,
cachedRandom& rndGen
)
{
- const word modelType(dict.lookup("pdfType"));
+ const word modelType(dict.lookup("distributionModelType"));
- Info<< "Selecting pdfType " << modelType << endl;
+ Info<< "Selecting distributionModelType " << modelType << endl;
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(modelType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- FatalErrorIn("pdfs::pdf::New(const dictionary&, cachedRandom&)")
- << "Unknown pdf type " << modelType << nl << nl
- << "Valid pdf types are:" << nl
+ FatalErrorIn
+ (
+ "distributionModels::distributionModel::New"
+ "("
+ "const dictionary&, "
+ "cachedRandom&"
+ ")"
+ )
+ << "Unknown distributionModel type " << modelType << nl << nl
+ << "Valid distributionModel types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
- return autoPtr<pdf>(cstrIter()(dict, rndGen));
+ return autoPtr<distributionModel>(cstrIter()(dict, rndGen));
}
diff --git a/src/lagrangian/pdfs/exponential/exponential.C b/src/lagrangian/distributionModels/exponential/exponential.C
similarity index 70%
rename from src/lagrangian/pdfs/exponential/exponential.C
rename to src/lagrangian/distributionModels/exponential/exponential.C
index 2eba8cef5c6c781c0d247ee3e271748432e22b9c..e9bc6f4edf021ae73c12017bab95c69c00a047bb 100644
--- a/src/lagrangian/pdfs/exponential/exponential.C
+++ b/src/lagrangian/distributionModels/exponential/exponential.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,33 +30,33 @@ License
namespace Foam
{
- namespace pdfs
+ namespace distributionModels
{
defineTypeNameAndDebug(exponential, 0);
- addToRunTimeSelectionTable(pdf, exponential, dictionary);
+ addToRunTimeSelectionTable(distributionModel, exponential, dictionary);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pdfs::exponential::exponential
+Foam::distributionModels::exponential::exponential
(
const dictionary& dict,
cachedRandom& rndGen
)
:
- pdf(typeName, dict, rndGen),
- minValue_(readScalar(pdfDict_.lookup("minValue"))),
- maxValue_(readScalar(pdfDict_.lookup("maxValue"))),
- lambda_(readScalar(pdfDict_.lookup("lambda")))
+ distributionModel(typeName, dict, rndGen),
+ minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
+ maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
+ lambda_(readScalar(distributionModelDict_.lookup("lambda")))
{
check();
}
-Foam::pdfs::exponential::exponential(const exponential& p)
+Foam::distributionModels::exponential::exponential(const exponential& p)
:
- pdf(p),
+ distributionModel(p),
minValue_(p.minValue_),
maxValue_(p.maxValue_),
lambda_(p.lambda_)
@@ -65,13 +65,13 @@ Foam::pdfs::exponential::exponential(const exponential& p)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::pdfs::exponential::~exponential()
+Foam::distributionModels::exponential::~exponential()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::pdfs::exponential::sample() const
+Foam::scalar Foam::distributionModels::exponential::sample() const
{
scalar y = rndGen_.sample01<scalar>();
scalar K = exp(-lambda_*maxValue_) - exp(-lambda_*minValue_);
@@ -79,13 +79,13 @@ Foam::scalar Foam::pdfs::exponential::sample() const
}
-Foam::scalar Foam::pdfs::exponential::minValue() const
+Foam::scalar Foam::distributionModels::exponential::minValue() const
{
return minValue_;
}
-Foam::scalar Foam::pdfs::exponential::maxValue() const
+Foam::scalar Foam::distributionModels::exponential::maxValue() const
{
return maxValue_;
}
diff --git a/src/lagrangian/pdfs/exponential/exponential.H b/src/lagrangian/distributionModels/exponential/exponential.H
similarity index 86%
rename from src/lagrangian/pdfs/exponential/exponential.H
rename to src/lagrangian/distributionModels/exponential/exponential.H
index 6b012c3c641fa4c098c87e4c886ce6ff6b04299d..c0211d3550067ea8961724f4861a3ed06b0654cb 100644
--- a/src/lagrangian/pdfs/exponential/exponential.H
+++ b/src/lagrangian/distributionModels/exponential/exponential.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,7 +25,7 @@ Class
Foam::exponential
Description
- exponential pdf
+ exponential distribution model
SourceFiles
exponential.C
@@ -35,13 +35,13 @@ SourceFiles
#ifndef exponential_H
#define exponential_H
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-namespace pdfs
+namespace distributionModels
{
/*---------------------------------------------------------------------------*\
@@ -50,7 +50,7 @@ namespace pdfs
class exponential
:
- public pdf
+ public distributionModel
{
// Private data
@@ -81,9 +81,9 @@ public:
exponential(const exponential& p);
//- Construct and return a clone
- virtual autoPtr<pdf> clone() const
+ virtual autoPtr<distributionModel> clone() const
{
- return autoPtr<pdf>(new exponential(*this));
+ return autoPtr<distributionModel>(new exponential(*this));
}
@@ -93,7 +93,7 @@ public:
// Member Functions
- //- Sample the pdf
+ //- Sample the distributionModel
virtual scalar sample() const;
//- Return the minimum value
@@ -106,7 +106,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace pdfs
+} // End namespace distributionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/pdfs/fixedValue/fixedValue.C b/src/lagrangian/distributionModels/fixedValue/fixedValue.C
similarity index 69%
rename from src/lagrangian/pdfs/fixedValue/fixedValue.C
rename to src/lagrangian/distributionModels/fixedValue/fixedValue.C
index 5808c5dbb523a05c6101fa7922d52c5e1c5710d3..e990b1479b43c71d1502c891281dbc7aa524b1de 100644
--- a/src/lagrangian/pdfs/fixedValue/fixedValue.C
+++ b/src/lagrangian/distributionModels/fixedValue/fixedValue.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,50 +30,54 @@ License
namespace Foam
{
- namespace pdfs
+ namespace distributionModels
{
defineTypeNameAndDebug(fixedValue, 0);
- addToRunTimeSelectionTable(pdf, fixedValue, dictionary);
+ addToRunTimeSelectionTable(distributionModel, fixedValue, dictionary);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pdfs::fixedValue::fixedValue(const dictionary& dict, cachedRandom& rndGen)
+Foam::distributionModels::fixedValue::fixedValue
+(
+ const dictionary& dict,
+ cachedRandom& rndGen
+)
:
- pdf(typeName, dict, rndGen),
- value_(readScalar(pdfDict_.lookup("value")))
+ distributionModel(typeName, dict, rndGen),
+ value_(readScalar(distributionModelDict_.lookup("value")))
{}
-Foam::pdfs::fixedValue::fixedValue(const fixedValue& p)
+Foam::distributionModels::fixedValue::fixedValue(const fixedValue& p)
:
- pdf(p),
+ distributionModel(p),
value_(p.value_)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::pdfs::fixedValue::~fixedValue()
+Foam::distributionModels::fixedValue::~fixedValue()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::pdfs::fixedValue::fixedValue::sample() const
+Foam::scalar Foam::distributionModels::fixedValue::fixedValue::sample() const
{
return value_;
}
-Foam::scalar Foam::pdfs::fixedValue::fixedValue::minValue() const
+Foam::scalar Foam::distributionModels::fixedValue::fixedValue::minValue() const
{
return value_;
}
-Foam::scalar Foam::pdfs::fixedValue::fixedValue::maxValue() const
+Foam::scalar Foam::distributionModels::fixedValue::fixedValue::maxValue() const
{
return value_;
}
diff --git a/src/lagrangian/pdfs/fixedValue/fixedValue.H b/src/lagrangian/distributionModels/fixedValue/fixedValue.H
similarity index 84%
rename from src/lagrangian/pdfs/fixedValue/fixedValue.H
rename to src/lagrangian/distributionModels/fixedValue/fixedValue.H
index c2905114286ed4f61287701b1c3d8451c368eaf6..4385f96c5e8ca807ec8746932af35330c6d2abbc 100644
--- a/src/lagrangian/pdfs/fixedValue/fixedValue.H
+++ b/src/lagrangian/distributionModels/fixedValue/fixedValue.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,16 +32,16 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef pdfFixedValue_H
-#define pdfFixedValue_H
+#ifndef distributionModelFixedValue_H
+#define distributionModelFixedValue_H
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-namespace pdfs
+namespace distributionModels
{
/*---------------------------------------------------------------------------*\
Class fixedValue Declaration
@@ -49,7 +49,7 @@ namespace pdfs
class fixedValue
:
- public pdf
+ public distributionModel
{
// Private data
@@ -72,9 +72,9 @@ public:
fixedValue(const fixedValue& p);
//- Construct and return a clone
- virtual autoPtr<pdf> clone() const
+ virtual autoPtr<distributionModel> clone() const
{
- return autoPtr<pdf>(new fixedValue(*this));
+ return autoPtr<distributionModel>(new fixedValue(*this));
}
@@ -84,7 +84,7 @@ public:
// Member Functions
- //- Sample the pdf
+ //- Sample the distributionModel
virtual scalar sample() const;
//- Return the minimum value
@@ -97,7 +97,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace pdfs
+} // End namespace distributionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/pdfs/general/general.C b/src/lagrangian/distributionModels/general/general.C
similarity index 81%
rename from src/lagrangian/pdfs/general/general.C
rename to src/lagrangian/distributionModels/general/general.C
index 8f8224ed6b1969bb199d0934ad5158165a91f154..6e5aad7a7b0e3df1d109d8d345b009a675f29973 100644
--- a/src/lagrangian/pdfs/general/general.C
+++ b/src/lagrangian/distributionModels/general/general.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,19 +30,23 @@ License
namespace Foam
{
- namespace pdfs
+ namespace distributionModels
{
defineTypeNameAndDebug(general, 0);
- addToRunTimeSelectionTable(pdf, general, dictionary);
+ addToRunTimeSelectionTable(distributionModel, general, dictionary);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pdfs::general::general(const dictionary& dict, cachedRandom& rndGen)
+Foam::distributionModels::general::general
+(
+ const dictionary& dict,
+ cachedRandom& rndGen
+)
:
- pdf(typeName, dict, rndGen),
- xy_(pdfDict_.lookup("distribution")),
+ distributionModel(typeName, dict, rndGen),
+ xy_(distributionModelDict_.lookup("distribution")),
nEntries_(xy_.size()),
minValue_(xy_[0][0]),
maxValue_(xy_[nEntries_-1][0]),
@@ -50,7 +54,7 @@ Foam::pdfs::general::general(const dictionary& dict, cachedRandom& rndGen)
{
check();
- // normalize the cumulative pdf
+ // normalize the cumulative distributionModel
integral_[0] = 0.0;
for (label i=1; i<nEntries_; i++)
@@ -74,9 +78,9 @@ Foam::pdfs::general::general(const dictionary& dict, cachedRandom& rndGen)
}
-Foam::pdfs::general::general(const general& p)
+Foam::distributionModels::general::general(const general& p)
:
- pdf(p),
+ distributionModel(p),
xy_(p.xy_),
nEntries_(p.nEntries_),
minValue_(p.minValue_),
@@ -87,13 +91,13 @@ Foam::pdfs::general::general(const general& p)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::pdfs::general::~general()
+Foam::distributionModels::general::~general()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::pdfs::general::sample() const
+Foam::scalar Foam::distributionModels::general::sample() const
{
scalar y = rndGen_.sample01<scalar>();
@@ -137,13 +141,13 @@ Foam::scalar Foam::pdfs::general::sample() const
}
-Foam::scalar Foam::pdfs::general::minValue() const
+Foam::scalar Foam::distributionModels::general::minValue() const
{
return minValue_;
}
-Foam::scalar Foam::pdfs::general::maxValue() const
+Foam::scalar Foam::distributionModels::general::maxValue() const
{
return maxValue_;
}
diff --git a/src/lagrangian/pdfs/general/general.H b/src/lagrangian/distributionModels/general/general.H
similarity index 87%
rename from src/lagrangian/pdfs/general/general.H
rename to src/lagrangian/distributionModels/general/general.H
index c212f92aea9506c4e97c18789f1f39ea2d056235..9201ec143ea18d0c68dcab9bcdb1accb69f50280 100644
--- a/src/lagrangian/pdfs/general/general.H
+++ b/src/lagrangian/distributionModels/general/general.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,7 +25,7 @@ Class
Foam::general
Description
- general pdf
+ general distribution model
SourceFiles
general.C
@@ -35,7 +35,7 @@ SourceFiles
#ifndef general_H
#define general_H
-#include "pdf.H"
+#include "distributionModel.H"
#include "Vector.H"
#include "VectorSpace.H"
@@ -43,7 +43,7 @@ SourceFiles
namespace Foam
{
-namespace pdfs
+namespace distributionModels
{
/*---------------------------------------------------------------------------*\
@@ -52,7 +52,7 @@ namespace pdfs
class general
:
- public pdf
+ public distributionModel
{
// Private data
@@ -84,9 +84,9 @@ public:
general(const general& p);
//- Construct and return a clone
- virtual autoPtr<pdf> clone() const
+ virtual autoPtr<distributionModel> clone() const
{
- return autoPtr<pdf>(new general(*this));
+ return autoPtr<distributionModel>(new general(*this));
}
@@ -96,7 +96,7 @@ public:
// Member Functions
- //- Sample the pdf
+ //- Sample the distributionModel
virtual scalar sample() const;
//- Return the minimum value
@@ -109,7 +109,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace pdfs
+} // End namespace distributionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/pdfs/multiNormal/multiNormal.C b/src/lagrangian/distributionModels/multiNormal/multiNormal.C
similarity index 76%
rename from src/lagrangian/pdfs/multiNormal/multiNormal.C
rename to src/lagrangian/distributionModels/multiNormal/multiNormal.C
index 554063bdbf2a6e889af5fa82a07a83a90b3c4184..2f06f898e32131cbc5e2b6f7489181ab3463b415 100644
--- a/src/lagrangian/pdfs/multiNormal/multiNormal.C
+++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,28 +30,28 @@ License
namespace Foam
{
- namespace pdfs
+ namespace distributionModels
{
defineTypeNameAndDebug(multiNormal, 0);
- addToRunTimeSelectionTable(pdf, multiNormal, dictionary);
+ addToRunTimeSelectionTable(distributionModel, multiNormal, dictionary);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pdfs::multiNormal::multiNormal
+Foam::distributionModels::multiNormal::multiNormal
(
const dictionary& dict,
cachedRandom& rndGen
)
:
- pdf(typeName, dict, rndGen),
- minValue_(readScalar(pdfDict_.lookup("minValue"))),
- maxValue_(readScalar(pdfDict_.lookup("maxValue"))),
+ distributionModel(typeName, dict, rndGen),
+ minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
+ maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
range_(maxValue_ - minValue_),
- expectation_(pdfDict_.lookup("expectation")),
- variance_(pdfDict_.lookup("variance")),
- strength_(pdfDict_.lookup("strength"))
+ expectation_(distributionModelDict_.lookup("expectation")),
+ variance_(distributionModelDict_.lookup("variance")),
+ strength_(distributionModelDict_.lookup("strength"))
{
check();
@@ -81,9 +81,9 @@ Foam::pdfs::multiNormal::multiNormal
}
-Foam::pdfs::multiNormal::multiNormal(const multiNormal& p)
+Foam::distributionModels::multiNormal::multiNormal(const multiNormal& p)
:
- pdf(p),
+ distributionModel(p),
minValue_(p.minValue_),
maxValue_(p.maxValue_),
range_(p.range_),
@@ -95,13 +95,13 @@ Foam::pdfs::multiNormal::multiNormal(const multiNormal& p)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::pdfs::multiNormal::~multiNormal()
+Foam::distributionModels::multiNormal::~multiNormal()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::pdfs::multiNormal::sample() const
+Foam::scalar Foam::distributionModels::multiNormal::sample() const
{
scalar y = 0;
scalar x = 0;
@@ -133,13 +133,13 @@ Foam::scalar Foam::pdfs::multiNormal::sample() const
}
-Foam::scalar Foam::pdfs::multiNormal::minValue() const
+Foam::scalar Foam::distributionModels::multiNormal::minValue() const
{
return minValue_;
}
-Foam::scalar Foam::pdfs::multiNormal::maxValue() const
+Foam::scalar Foam::distributionModels::multiNormal::maxValue() const
{
return maxValue_;
}
diff --git a/src/lagrangian/pdfs/multiNormal/multiNormal.H b/src/lagrangian/distributionModels/multiNormal/multiNormal.H
similarity index 85%
rename from src/lagrangian/pdfs/multiNormal/multiNormal.H
rename to src/lagrangian/distributionModels/multiNormal/multiNormal.H
index 4b8a9dc731b0a89873bec515197993bae6f16377..6af776a7286b82a69b4fdabfd42fc80bcb3b833b 100644
--- a/src/lagrangian/pdfs/multiNormal/multiNormal.H
+++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,10 +25,10 @@ Class
Foam::multiNormal
Description
- A multiNormal pdf
+ A multiNormal distribution model
@verbatim
- pdf = sum_i strength_i * exp(-0.5*((x - expectation_i)/variance_i)^2 )
+ model = sum_i strength_i * exp(-0.5*((x - expectation_i)/variance_i)^2 )
@endverbatim
@@ -40,13 +40,13 @@ SourceFiles
#ifndef multiNormal_H
#define multiNormal_H
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-namespace pdfs
+namespace distributionModels
{
/*---------------------------------------------------------------------------*\
@@ -55,7 +55,7 @@ namespace pdfs
class multiNormal
:
- public pdf
+ public distributionModel
{
// Private data
@@ -91,9 +91,9 @@ public:
multiNormal(const multiNormal& p);
//- Construct and return a clone
- virtual autoPtr<pdf> clone() const
+ virtual autoPtr<distributionModel> clone() const
{
- return autoPtr<pdf>(new multiNormal(*this));
+ return autoPtr<distributionModel>(new multiNormal(*this));
}
@@ -103,7 +103,7 @@ public:
// Member Functions
- //- Sample the pdf
+ //- Sample the distributionModel
virtual scalar sample() const;
//- Return the minimum value
@@ -116,7 +116,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace pdfs
+} // End namespace distributionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/pdfs/normal/normal.C b/src/lagrangian/distributionModels/normal/normal.C
similarity index 75%
rename from src/lagrangian/pdfs/normal/normal.C
rename to src/lagrangian/distributionModels/normal/normal.C
index f8e9f7716e43d893d1eb7b0d690f5df2fb6bea64..1a629100ac30a76363d6633f2d4659aaebde8b80 100644
--- a/src/lagrangian/pdfs/normal/normal.C
+++ b/src/lagrangian/distributionModels/normal/normal.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,22 +31,26 @@ License
namespace Foam
{
- namespace pdfs
+ namespace distributionModels
{
defineTypeNameAndDebug(normal, 0);
- addToRunTimeSelectionTable(pdf, normal, dictionary);
+ addToRunTimeSelectionTable(distributionModel, normal, dictionary);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pdfs::normal::normal(const dictionary& dict, cachedRandom& rndGen)
+Foam::distributionModels::normal::normal
+(
+ const dictionary& dict,
+ cachedRandom& rndGen
+)
:
- pdf(typeName, dict, rndGen),
- minValue_(readScalar(pdfDict_.lookup("minValue"))),
- maxValue_(readScalar(pdfDict_.lookup("maxValue"))),
- expectation_(readScalar(pdfDict_.lookup("expectation"))),
- variance_(readScalar(pdfDict_.lookup("variance"))),
+ distributionModel(typeName, dict, rndGen),
+ minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
+ maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
+ expectation_(readScalar(distributionModelDict_.lookup("expectation"))),
+ variance_(readScalar(distributionModelDict_.lookup("variance"))),
a_(0.147)
{
if (minValue_ < 0)
@@ -67,9 +71,9 @@ Foam::pdfs::normal::normal(const dictionary& dict, cachedRandom& rndGen)
}
-Foam::pdfs::normal::normal(const normal& p)
+Foam::distributionModels::normal::normal(const normal& p)
:
- pdf(p),
+ distributionModel(p),
minValue_(p.minValue_),
maxValue_(p.maxValue_),
expectation_(p.expectation_),
@@ -80,13 +84,13 @@ Foam::pdfs::normal::normal(const normal& p)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::pdfs::normal::~normal()
+Foam::distributionModels::normal::~normal()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::pdfs::normal::sample() const
+Foam::scalar Foam::distributionModels::normal::sample() const
{
scalar a = erf((minValue_ - expectation_)/variance_);
@@ -104,19 +108,19 @@ Foam::scalar Foam::pdfs::normal::sample() const
}
-Foam::scalar Foam::pdfs::normal::minValue() const
+Foam::scalar Foam::distributionModels::normal::minValue() const
{
return minValue_;
}
-Foam::scalar Foam::pdfs::normal::maxValue() const
+Foam::scalar Foam::distributionModels::normal::maxValue() const
{
return maxValue_;
}
-Foam::scalar Foam::pdfs::normal::erfInv(const scalar y) const
+Foam::scalar Foam::distributionModels::normal::erfInv(const scalar y) const
{
scalar k = 2.0/(constant::mathematical::pi*a_) + 0.5*log(1.0 - y*y);
scalar h = log(1.0 - y*y)/a_;
diff --git a/src/lagrangian/pdfs/normal/normal.H b/src/lagrangian/distributionModels/normal/normal.H
similarity index 83%
rename from src/lagrangian/pdfs/normal/normal.H
rename to src/lagrangian/distributionModels/normal/normal.H
index 9767398cbe2dd104e5d25a66d5249698cab75a7e..60c39f105962d5faec3294cad33974bc866e6d33 100644
--- a/src/lagrangian/pdfs/normal/normal.H
+++ b/src/lagrangian/distributionModels/normal/normal.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,13 +25,13 @@ Class
Foam::normal
Description
- A normal pdf
+ A normal distribution model
@verbatim
- pdf = strength * exp(-0.5*((x - expectation)/variance)^2 )
+ model = strength * exp(-0.5*((x - expectation)/variance)^2 )
@endverbatim
- strength only has meaning if there's more than one pdf
+ strength only has meaning if there's more than one distribution model
SourceFiles
normal.C
@@ -41,13 +41,13 @@ SourceFiles
#ifndef normal_H
#define normal_H
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-namespace pdfs
+namespace distributionModels
{
/*---------------------------------------------------------------------------*\
@@ -56,7 +56,7 @@ namespace pdfs
class normal
:
- public pdf
+ public distributionModel
{
// Private data
@@ -91,9 +91,9 @@ public:
normal(const normal& p);
//- Construct and return a clone
- virtual autoPtr<pdf> clone() const
+ virtual autoPtr<distributionModel> clone() const
{
- return autoPtr<pdf>(new normal(*this));
+ return autoPtr<distributionModel>(new normal(*this));
}
@@ -103,7 +103,7 @@ public:
// Member Functions
- //- Sample the pdf
+ //- Sample the distributionModel
virtual scalar sample() const;
//- Return the minimum value
@@ -118,7 +118,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace pdfs
+} // End namespace distributionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/pdfs/uniform/uniform.C b/src/lagrangian/distributionModels/uniform/uniform.C
similarity index 70%
rename from src/lagrangian/pdfs/uniform/uniform.C
rename to src/lagrangian/distributionModels/uniform/uniform.C
index 1493fe1e6bb2892be45b268c3e8e3664ca296d01..7f00a05a9323ccc5ef1b52565263a998f5370cbd 100644
--- a/src/lagrangian/pdfs/uniform/uniform.C
+++ b/src/lagrangian/distributionModels/uniform/uniform.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,29 +30,33 @@ License
namespace Foam
{
- namespace pdfs
+ namespace distributionModels
{
defineTypeNameAndDebug(uniform, 0);
- addToRunTimeSelectionTable(pdf, uniform, dictionary);
+ addToRunTimeSelectionTable(distributionModel, uniform, dictionary);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::pdfs::uniform::uniform(const dictionary& dict, cachedRandom& rndGen)
+Foam::distributionModels::uniform::uniform
+(
+ const dictionary& dict,
+ cachedRandom& rndGen
+)
:
- pdf(typeName, dict, rndGen),
- minValue_(readScalar(pdfDict_.lookup("minValue"))),
- maxValue_(readScalar(pdfDict_.lookup("maxValue"))),
+ distributionModel(typeName, dict, rndGen),
+ minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
+ maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
range_(maxValue_ - minValue_)
{
check();
}
-Foam::pdfs::uniform::uniform(const uniform& p)
+Foam::distributionModels::uniform::uniform(const uniform& p)
:
- pdf(p),
+ distributionModel(p),
minValue_(p.minValue_),
maxValue_(p.maxValue_)
{}
@@ -60,25 +64,25 @@ Foam::pdfs::uniform::uniform(const uniform& p)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::pdfs::uniform::~uniform()
+Foam::distributionModels::uniform::~uniform()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::scalar Foam::pdfs::uniform::sample() const
+Foam::scalar Foam::distributionModels::uniform::sample() const
{
return rndGen_.position<scalar>(minValue_, maxValue_);
}
-Foam::scalar Foam::pdfs::uniform::minValue() const
+Foam::scalar Foam::distributionModels::uniform::minValue() const
{
return minValue_;
}
-Foam::scalar Foam::pdfs::uniform::maxValue() const
+Foam::scalar Foam::distributionModels::uniform::maxValue() const
{
return maxValue_;
}
diff --git a/src/lagrangian/pdfs/uniform/uniform.H b/src/lagrangian/distributionModels/uniform/uniform.H
similarity index 86%
rename from src/lagrangian/pdfs/uniform/uniform.H
rename to src/lagrangian/distributionModels/uniform/uniform.H
index db0e44ddbf64012e96ed2f53e4f9eb68266422f3..2872e88f3c4ad1dd7051e2745cf48bb2745f5210 100644
--- a/src/lagrangian/pdfs/uniform/uniform.H
+++ b/src/lagrangian/distributionModels/uniform/uniform.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,7 +25,7 @@ Class
Foam::uniform
Description
- uniform pdf
+ Uniform/equally-weighted distribution model
SourceFiles
uniform.C
@@ -35,13 +35,13 @@ SourceFiles
#ifndef uniform_H
#define uniform_H
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-namespace pdfs
+namespace distributionModels
{
/*---------------------------------------------------------------------------*\
@@ -50,7 +50,7 @@ namespace pdfs
class uniform
:
- public pdf
+ public distributionModel
{
// Private data
@@ -79,9 +79,9 @@ public:
uniform(const uniform& p);
//- Construct and return a clone
- virtual autoPtr<pdf> clone() const
+ virtual autoPtr<distributionModel> clone() const
{
- return autoPtr<pdf>(new uniform(*this));
+ return autoPtr<distributionModel>(new uniform(*this));
}
@@ -91,7 +91,7 @@ public:
// Member Functions
- //- Sample the pdf
+ //- Sample the distributionModel
virtual scalar sample() const;
//- Return the minimum value
@@ -104,7 +104,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace pdfs
+} // End namespace distributionModels
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index e2c807106fdedc9022878f8c2a2129b1bf5c74b9..0d45fdda60d8d9412cd913a6f19a1653c1c48d6e 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
@@ -24,7 +24,7 @@ LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
-llagrangian \
- -lpdf \
+ -ldistributionModels \
-lliquidProperties \
-lliquidMixtureProperties \
-lsolidProperties \
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 53e0056739326b4df3b3f740ab1e39d81fdbb3f7..d8675f0fd0ec3d3a0fa9eb3607a826d99eb8b3cb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -95,9 +95,9 @@ Foam::ConeInjection<CloudType>::ConeInjection
Umag_(DataEntry<scalar>::New("Umag", this->coeffDict())),
thetaInner_(DataEntry<scalar>::New("thetaInner", this->coeffDict())),
thetaOuter_(DataEntry<scalar>::New("thetaOuter", this->coeffDict())),
- parcelPDF_
+ parcelDistributionModel_
(
- pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), owner.rndGen())
+ distributionModels::distributionModel::New(this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen())
),
tanVec1_(vector::zero),
tanVec2_(vector::zero)
@@ -153,7 +153,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
Umag_(im.Umag_().clone().ptr()),
thetaInner_(im.thetaInner_().clone().ptr()),
thetaOuter_(im.thetaOuter_().clone().ptr()),
- parcelPDF_(im.parcelPDF_().clone().ptr()),
+ parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()),
tanVec1_(im.tanVec1_),
tanVec2_(im.tanVec2_)
{}
@@ -222,7 +222,7 @@ void Foam::ConeInjection<CloudType>::setProperties
parcel.U() = Umag_().value(t)*dirVec;
// set particle diameter
- parcel.d() = parcelPDF_().sample();
+ parcel.d() = parcelDistributionModel_().sample();
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 31768d223ff5b2a3a4fae226a60b775b2d74dca4..60b751bb684a473960524d559eaab57d37c06b13 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,7 +34,7 @@ Description
- parcel flow rate
- parcel velocity
- inner and outer cone angles
- - Parcel diameters obtained by PDF model
+ - Parcel diameters obtained by distribution model model
SourceFiles
ConeInjection.C
@@ -45,7 +45,7 @@ SourceFiles
#define ConeInjection_H
#include "InjectionModel.H"
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -101,8 +101,8 @@ class ConeInjection
//- Outer cone angle relative to SOI [deg]
const autoPtr<DataEntry<scalar> > thetaOuter_;
- //- Parcel size PDF model
- const autoPtr<pdfs::pdf> parcelPDF_;
+ //- Parcel size distribution model model
+ const autoPtr<distributionModels::distributionModel> parcelDistributionModel_;
// Tangential vectors to the direction vector
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
index 122ebea145336187873128016bb6fc435632c4b3..faff5d7a39bc5457c3c6ec6d254ef052e4729d24 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -126,9 +126,9 @@ Foam::ConeInjectionMP<CloudType>::ConeInjectionMP
Umag_(DataEntry<scalar>::New("Umag", this->coeffDict())),
thetaInner_(DataEntry<scalar>::New("thetaInner", this->coeffDict())),
thetaOuter_(DataEntry<scalar>::New("thetaOuter", this->coeffDict())),
- parcelPDF_
+ parcelDistributionModel_
(
- pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), owner.rndGen())
+ distributionModels::distributionModel::New(this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen())
),
nInjected_(this->parcelsAddedTotal()),
tanVec1_(positions_.size()),
@@ -193,7 +193,7 @@ Foam::ConeInjectionMP<CloudType>::ConeInjectionMP
Umag_(im.Umag_().clone().ptr()),
thetaInner_(im.thetaInner_().clone().ptr()),
thetaOuter_(im.thetaOuter_().clone().ptr()),
- parcelPDF_(im.parcelPDF_().clone().ptr()),
+ parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()),
nInjected_(im.nInjected_),
tanVec1_(im.tanVec1_),
tanVec2_(im.tanVec2_)
@@ -268,7 +268,7 @@ void Foam::ConeInjectionMP<CloudType>::setProperties
parcel.U() = Umag_().value(t)*dirVec;
// set particle diameter
- parcel.d() = parcelPDF_().sample();
+ parcel.d() = parcelDistributionModel_().sample();
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
index 47b19de6d3dc99f97993e7265db260f4d3b5a6ab..d986e86a49b7a9ff321afa5a91cd7c7b22d142f3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,7 +34,7 @@ Description
- parcel flow rate
- parcel velocities
- inner and outer cone angles
- - Parcel diameters obtained by PDF model
+ - Parcel diameters obtained by distribution model model
SourceFiles
ConeInjectionMP.C
@@ -45,7 +45,7 @@ SourceFiles
#define ConeInjectionMP_H
#include "InjectionModel.H"
-#include "pdf.H"
+#include "distributionModel.H"
#include "vectorList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -108,8 +108,8 @@ class ConeInjectionMP
//- Outer cone angle relative to SOI [deg]
const autoPtr<DataEntry<scalar> > thetaOuter_;
- //- Parcel size PDF model
- const autoPtr<pdfs::pdf> parcelPDF_;
+ //- Parcel size distribution model model
+ const autoPtr<distributionModels::distributionModel> parcelDistributionModel_;
//- Number of parcels per injector already injected
mutable label nInjected_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index 75f34af8eba6b0e9c5866a1d52e8b7a0d923167e..95209cea066295ad6926ba9aa292652206dd2bc6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -114,11 +114,11 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
nParcelsInjected_(positions_.size(), 0),
U0_(this->coeffDict().lookup("U0")),
diameters_(positions_.size()),
- parcelPDF_
+ parcelDistributionModel_
(
- pdfs::pdf::New
+ distributionModels::distributionModel::New
(
- this->coeffDict().subDict("parcelPDF"),
+ this->coeffDict().subDict("parcelDistributionModel"),
owner.rndGen()
)
)
@@ -126,7 +126,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
// Construct parcel diameters - one per injector cell
forAll(diameters_, i)
{
- diameters_[i] = parcelPDF_->sample();
+ diameters_[i] = parcelDistributionModel_->sample();
}
// Determine total volume of particles to inject
@@ -166,7 +166,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
nParcelsInjected_(im.nParcelsInjected_),
U0_(im.U0_),
diameters_(im.diameters_),
- parcelPDF_(im.parcelPDF_().clone().ptr())
+ parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr())
{}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index b7d76873e0a08a1f82b7f34709540bbb898596de..91a570e4406547be386b4d44a45458de4fabd293 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -47,7 +47,7 @@ SourceFiles
#define FieldActivatedInjection_H
#include "InjectionModel.H"
-#include "pdf.H"
+#include "distributionModel.H"
#include "volFieldsFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -110,8 +110,8 @@ class FieldActivatedInjection
//- List of parcel diameters
scalarList diameters_;
- //- Parcel size PDF model
- const autoPtr<pdfs::pdf> parcelPDF_;
+ //- Parcel size distribution model model
+ const autoPtr<distributionModels::distributionModel> parcelDistributionModel_;
protected:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index 3cf811416480295a24b9340dd02e68b1994a624d..b6107751f3ce951bf9cc82e87edca305345114af 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -90,7 +90,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
(
1,
(10*volumeAccumulator_)
- /CloudType::parcelType::volume(parcelPDF_().minValue())
+ /CloudType::parcelType::volume(parcelDistributionModel_().minValue())
);
label iterationNo = 0;
@@ -128,7 +128,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
{
if (selfSeed_ && !cellCentresUsed.found(cI))
{
- scalar dNew = parcelPDF_().sample();
+ scalar dNew = parcelDistributionModel_().sample();
newParticles_.append
(
@@ -191,7 +191,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
scalar R = sqrt(3.0)*a/(2.0*sqrt(2.0));
scalar d = a/(2.0*sqrt(3.0));
- scalar dNew = parcelPDF_().sample();
+ scalar dNew = parcelDistributionModel_().sample();
scalar volNew = CloudType::parcelType::volume(dNew);
newParticles_.append
@@ -204,7 +204,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
);
volumeAccumulator_ -= volNew;
- dNew = parcelPDF_().sample();
+ dNew = parcelDistributionModel_().sample();
newParticles_.append
(
vectorPairScalarPair
@@ -215,7 +215,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
);
volumeAccumulator_ -= volNew;
- dNew = parcelPDF_().sample();
+ dNew = parcelDistributionModel_().sample();
newParticles_.append
(
vectorPairScalarPair
@@ -226,7 +226,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
);
volumeAccumulator_ -= volNew;
- dNew = parcelPDF_().sample();
+ dNew = parcelDistributionModel_().sample();
newParticles_.append
(
vectorPairScalarPair
@@ -341,11 +341,11 @@ Foam::InflationInjection<CloudType>::InflationInjection
fraction_(1.0),
selfSeed_(this->coeffDict().lookupOrDefault("selfSeed", false)),
dSeed_(SMALL),
- parcelPDF_
+ parcelDistributionModel_
(
- pdfs::pdf::New
+ distributionModels::distributionModel::New
(
- this->coeffDict().subDict("parcelPDF"),
+ this->coeffDict().subDict("parcelDistributionModel"),
owner.rndGen()
)
)
@@ -409,7 +409,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
fraction_(im.fraction_),
selfSeed_(im.selfSeed_),
dSeed_(im.dSeed_),
- parcelPDF_(im.parcelPDF_().clone().ptr())
+ parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr())
{}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
index b10c8e17d9dd6fca85488a841e380ca689489543..730c4acec1803b34c85567b536ef7588e8f5c725 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,7 +39,7 @@ SourceFiles
#define InflationInjection_H
#include "InjectionModel.H"
-#include "pdf.H"
+#include "distributionModel.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -107,8 +107,8 @@ class InflationInjection
//- Diameter with which to create new seed particles
scalar dSeed_;
- //- Parcel size PDF model
- const autoPtr<pdfs::pdf> parcelPDF_;
+ //- Parcel size distribution model model
+ const autoPtr<distributionModels::distributionModel> parcelDistributionModel_;
protected:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index fa816d2e1779d6ca048bb4cc79808ae07ebab01b..5f23df32cc431eec5bc0e5e31a24b115408e0a20 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -96,11 +96,11 @@ Foam::ManualInjection<CloudType>::ManualInjection
injectorTetFaces_(positions_.size(), -1),
injectorTetPts_(positions_.size(), -1),
U0_(this->coeffDict().lookup("U0")),
- parcelPDF_
+ parcelDistributionModel_
(
- pdfs::pdf::New
+ distributionModels::distributionModel::New
(
- this->coeffDict().subDict("parcelPDF"),
+ this->coeffDict().subDict("parcelDistributionModel"),
owner.rndGen()
)
)
@@ -149,7 +149,7 @@ Foam::ManualInjection<CloudType>::ManualInjection
// Construct parcel diameters
forAll(diameters_, i)
{
- diameters_[i] = parcelPDF_->sample();
+ diameters_[i] = parcelDistributionModel_->sample();
}
// Determine volume of particles to inject
@@ -171,7 +171,7 @@ Foam::ManualInjection<CloudType>::ManualInjection
injectorTetFaces_(im.injectorTetFaces_),
injectorTetPts_(im.injectorTetPts_),
U0_(im.U0_),
- parcelPDF_(im.parcelPDF_().clone().ptr())
+ parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr())
{}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index bf7616b71a3642903709f62e4eff14b0ef7fa481..215a8da2f15a6e97392c4e2ee7bc617401008992 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ Description
- Total mass to inject
- Parcel positions in file @c positionsFile
- Initial parcel velocity
- - Parcel diameters obtained by PDF model
+ - Parcel diameters obtained by distribution model model
- All parcels introduced at SOI
SourceFiles
@@ -43,7 +43,7 @@ SourceFiles
#define ManualInjection_H
#include "InjectionModel.H"
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -82,8 +82,8 @@ class ManualInjection
//- Initial parcel velocity
const vector U0_;
- //- Parcel size PDF model
- const autoPtr<pdfs::pdf> parcelPDF_;
+ //- Parcel size distribution model model
+ const autoPtr<distributionModels::distributionModel> parcelDistributionModel_;
protected:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index c124977e5a88b4c1a89a7fc9e9dc00afd4d45db3..a762bf3316c83639f75db5fd59cf668e2b2797c4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,7 +25,7 @@ License
#include "PatchInjection.H"
#include "DataEntry.H"
-#include "pdf.H"
+#include "distributionModel.H"
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
@@ -104,9 +104,13 @@ Foam::PatchInjection<CloudType>::PatchInjection
(
DataEntry<scalar>::New("flowRateProfile", this->coeffDict())
),
- parcelPDF_
+ parcelDistributionModel_
(
- pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), owner.rndGen())
+ distributionModels::distributionModel::New
+ (
+ this->coeffDict().subDict("parcelDistributionModel"),
+ owner.rndGen()
+ )
),
cellOwners_(),
fraction_(1.0)
@@ -153,7 +157,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
parcelsPerSecond_(im.parcelsPerSecond_),
U0_(im.U0_),
flowRateProfile_(im.flowRateProfile_().clone().ptr()),
- parcelPDF_(im.parcelPDF_().clone().ptr()),
+ parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()),
cellOwners_(im.cellOwners_),
fraction_(im.fraction_)
{}
@@ -236,7 +240,7 @@ void Foam::PatchInjection<CloudType>::setProperties
parcel.U() = U0_;
// set particle diameter
- parcel.d() = parcelPDF_->sample();
+ parcel.d() = parcelDistributionModel_->sample();
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index 05b1236a8a41f2e0f6d18c9f1a30552af005b078..2245ad8b9cc770ab22aafd9dce2f69702625d0d9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,7 +33,7 @@ Description
- Injection duration
- Initial parcel velocity
- Injection volume flow rate
- - Parcel diameters obtained by PDF model
+ - Parcel diameters obtained by distribution model model
- Parcels injected at cell centres adjacent to patch
SourceFiles
@@ -54,7 +54,7 @@ namespace Foam
template<class Type>
class DataEntry;
-class pdf;
+class distributionModel;
/*---------------------------------------------------------------------------*\
Class PatchInjection Declaration
@@ -85,8 +85,8 @@ class PatchInjection
//- Flow rate profile relative to SOI []
const autoPtr<DataEntry<scalar> > flowRateProfile_;
- //- Parcel size PDF model
- const autoPtr<pdfs::pdf> parcelPDF_;
+ //- Parcel size distribution model model
+ const autoPtr<distributionModels::distributionModel> parcelDistributionModel_;
//- List of cell labels corresponding to injector positions
labelList cellOwners_;
diff --git a/src/surfaceFilmModels/Make/options b/src/surfaceFilmModels/Make/options
index d3439c4c3afeea9b5de7242545f51894bb0cb57c..9863502e9c5dbfb150c6bef0d83e9ea9d8f45470 100644
--- a/src/surfaceFilmModels/Make/options
+++ b/src/surfaceFilmModels/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
+ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude
@@ -18,6 +18,6 @@ EXE_LIBS = \
-lSLGThermo \
-lfiniteVolume \
-lmeshTools \
- -lpdf \
+ -ldistributionModels \
-lcompressibleRASModels \
-lcompressibleLESModels
diff --git a/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C b/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C
index 9102720a4023734b3ebf8286a945125189513c3a..213405957a6d1126d18053ae91e808833dc70f3d 100644
--- a/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C
+++ b/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,12 +53,19 @@ Foam::surfaceFilmModels::cloudInjection::cloudInjection
injectionModel(type(), owner, dict),
particlesPerParcel_(readScalar(coeffs_.lookup("particlesPerParcel"))),
rndGen_(label(0), -1),
- parcelPDF_(pdfs::pdf::New(coeffs_.subDict("parcelPDF"), rndGen_)),
+ parcelDistribution_
+ (
+ distributionModels::distributionModel::New
+ (
+ coeffs_.subDict("parcelDistribution"),
+ rndGen_
+ )
+ ),
diameter_(owner.film().nCells(), 0.0)
{
forAll(diameter_, faceI)
{
- diameter_[faceI] = parcelPDF_->sample();
+ diameter_[faceI] = parcelDistribution_->sample();
}
}
@@ -95,7 +102,7 @@ void Foam::surfaceFilmModels::cloudInjection::inject
diameterToInject[cellI] = diameter_[cellI];
// Retrieve new particle diameter sample
- diameter_[cellI] = parcelPDF_->sample();
+ diameter_[cellI] = parcelDistribution_->sample();
}
else
{
diff --git a/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H b/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H
index 4f9aa08fc6770f6ad513b04f300ce5e58dda7596..d2484f742230982cd46292d306caf163fbc507be 100644
--- a/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H
+++ b/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ SourceFiles
#define cloudInjection_H
#include "injectionModel.H"
-#include "pdf.H"
+#include "distributionModel.H"
#include "cachedRandom.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -76,7 +76,8 @@ protected:
cachedRandom rndGen_;
//- Parcel size PDF model
- const autoPtr<pdfs::pdf> parcelPDF_;
+ const autoPtr<distributionModels::distributionModel>
+ parcelDistribution_;
//- Diameters of particles to inject into the cloud
scalarList diameter_;
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
index c8cfa62f0baba43e7f4be54d912d246d17fac9db..ea38b2c4a465a1c32c7a17655adf0671201fae00 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
@@ -120,10 +120,10 @@ RanzMarshallCoeffs
hollowConeInjectorCoeffs
{
- dropletPDF
+ dropletDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 1e-06;
maxValue 0.00015;
@@ -131,7 +131,7 @@ hollowConeInjectorCoeffs
n 3;
}
- exponentialPDF
+ exponentialDistribution
{
minValue 0.0001;
maxValue 0.001;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index b831323c0cd2e310af68b13df3eac3f28b3a1e02..746e73e254c8976167becf42649c5a84e214803a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -131,10 +131,10 @@ subModels
SOI 0;
positionsFile "coalCloud1Positions";
U0 ( 0 -10 0 );
- parcelPDF
+ parcelDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 5e-06;
maxValue 0.0005;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index 84ddb4faa39ba4d449f2f8a4796a9eb25117001e..2f97343b5cd372df5025c390cb15dc859996d829 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -107,10 +107,10 @@ subModels
SOI 0;
positionsFile "limestonePositions";
U0 ( 0 0 0 );
- parcelPDF
+ parcelDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 5e-06;
maxValue 0.000565;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index 37dc1c89171d573120cca38b531909cd0ddd7c35..433b3082fe5c132bd3a63504f0f81769020418e0 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -130,10 +130,10 @@ subModels
SOI 0;
positionsFile "reactingCloud1Positions";
U0 (0 0 0);
- parcelPDF
+ parcelDistribution
{
pdfType uniform;
- uniformPDF
+ uniformDistribution
{
minValue 100e-06;
maxValue 100e-06;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index e2532ac3654238fd080474c137c6ce4035cea893..2eaf9f11d70fbc7aa92ea3be58f3780f84741bd8 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -133,10 +133,10 @@ subModels
parcelsPerSecond 1e5;
U0 (40 0 0);
flowRateProfile constant 1;
- parcelPDF
+ parcelDistribution
{
pdfType general;
- generalPDF
+ generalDistribution
{
distribution
(
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
index cf178e2faae520d143f52f698e3db9b128a69ea8..49f09ba2db0721b7b21223e163c233070cdea1c5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
@@ -131,10 +131,10 @@ subModels
thetaInner constant 0;
thetaOuter constant 45;
- parcelPDF
+ parcelDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 5e-04;
maxValue 0.0012;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
index 4099a1fff34d3d2f40552003db06acc81ec13c7d..20743a48b8774f1dfbf751d59019a76fda95ead3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
@@ -59,10 +59,10 @@ thermoSingleLayerCoeffs
particlesPerParcel 100.0;
- parcelPDF
+ parcelDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 5e-04;
maxValue 0.0012;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties
index afd89ec9ea9923cba37c7f977d04f3a7557ce650..4f1f754edbc25ebf1d86e4683685b0f8db873e01 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties
@@ -131,10 +131,10 @@ subModels
thetaInner constant 0;
thetaOuter constant 45;
- parcelPDF
+ parcelDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 5e-04;
maxValue 0.0012;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties
index 5b45e086917402cde96f753b9da57f966035eaf0..bf07405f41ec682b1074df35c09e5ecb430f1687 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties
@@ -61,10 +61,10 @@ thermoSingleLayerCoeffs
particlesPerParcel 100.0;
- parcelPDF
+ parcelDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 5e-04;
maxValue 0.0012;
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index ea65dea920b870ac5bf4372d86c09ce175fc9188..93b2bfa516d4a171ed33bd5cf25e99b44a96feb9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -123,10 +123,10 @@ subModels
SOI 0;
positionsFile "reactingCloud1Positions";
U0 ( 0 0 0 );
- parcelPDF
+ parcelDistribution
{
pdfType uniform;
- uniformPDF
+ uniformDistribution
{
minValue 1e-04;
maxValue 1e-04;
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
index 22c787b2ab8c6d8525504f154cee0cc085b530cd..ad33dc46d3066a92039594d2546e77d34158eecc 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
@@ -87,10 +87,10 @@ subModels
SOI 0;
positionsFile "kinematicCloud1Positions";
U0 ( 0 0 0 );
- parcelPDF
+ parcelDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 5e-05;
maxValue 0.0001;
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
index 99f68b618bdc1e423b24269ee05c81f89858d4db..72d096b370af7cc59b016edb3abbf5e7632390bd 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
@@ -106,10 +106,10 @@ subModels
SOI 0;
positionsFile "thermoCloud1Positions";
U0 ( 0 0 0 );
- parcelPDF
+ parcelDistribution
{
pdfType RosinRammler;
- RosinRammlerPDF
+ RosinRammlerDistribution
{
minValue 5e-06;
maxValue 0.0005;
diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 65952342c966310b1a16c95caa8f90be24e3ba50..003816f8a7cfd5885f203fb45c9dd8bb1ffd6ee0 100644
--- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -144,10 +144,10 @@ subModels
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);
flowRateProfile constant 1;
- parcelPDF
+ parcelDistribution
{
pdfType general;
- generalPDF
+ generalDistribution
{
distribution
(