Commit 6c1e5860 authored by andy's avatar andy
Browse files

ENH: moved thermo/pdfs->lagrangian/distributionModels

parent 7b567007
......@@ -35,4 +35,4 @@ EXE_LIBS = \
-llaminarFlameSpeedModels \
-lchemistryModel \
-lODE \
-lpdf
-ldistributionModels
......@@ -32,5 +32,5 @@ EXE_LIBS = \
-llaminarFlameSpeedModels \
-lchemistryModel \
-lODE \
-lpdf \
-ldistributionModels \
-lfiniteVolume
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -41,7 +41,7 @@ EXE_LIBS = \
-lmolecule \
-lODE \
-lOpenFOAM \
-lpdf \
-ldistributionModels \
-lpotential \
-lradiationModels \
-lrandomProcesses \
......
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
......@@ -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();
......
......@@ -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"
......
......@@ -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
......
......@@ -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 \
......
......@@ -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
......@@ -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]
......
......@@ -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_;
......
......@@ -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();
}
......
......@@ -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)
......
......@@ -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();
}
......
......@@ -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_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment