zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Random numbers - updated dependent code from change cachedRandom->Random class

Browse Source
This commit is contained in:
Andrew Heather
2017-04-28 09:15:52 +01:00
parent b07bc1f0b8
commit 7f0cc0045d
96 changed files with 235 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/test/BinSum/Test-BinSum.C
View File

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
scalarField samples(10000000);
forAll(samples, i)
{
samples[i] = rndGen.scalar01();
samples[i] = rndGen.sample01<scalar>();
}
const scalar min = 0;

20
applications/test/Distribution/Test-Distribution.C
View File

@ -71,7 +71,7 @@ int main(int argc, char *argv[])
for (label i = 0; i < randomDistributionTestSize; i++)
{
dS.add(2.5*R.GaussNormal() + 8.5);
dS.add(2.5*R.GaussNormal<scalar>() + 8.5);
}
Info<< "Mean " << dS.mean() << nl
@ -90,7 +90,7 @@ int main(int argc, char *argv[])
for (label i = 0; i < randomDistributionTestSize; i++)
{
dS2.add(1.5*R.GaussNormal() -6.0);
dS2.add(1.5*R.GaussNormal<scalar>() -6.0);
}
Info<< "Mean " << dS2.mean() << nl
@ -121,7 +121,7 @@ int main(int argc, char *argv[])
for (label i = 0; i < randomDistributionTestSize; i++)
{
dS.add(R.scalar01() + 10*Pstream::myProcNo());
dS.add(R.sample01<scalar>() + 10*Pstream::myProcNo());
}
Pout<< "Mean " << dS.mean() << nl
@ -155,7 +155,7 @@ int main(int argc, char *argv[])
for (label i = 0; i < randomDistributionTestSize; i++)
{
dV.add(R.vector01());
dV.add(R.sample01<vector>());
// Adding separate GaussNormal components with component
// weights
@ -164,9 +164,9 @@ int main(int argc, char *argv[])
(
vector
(
R.GaussNormal()*3.0 + 1.5,
R.GaussNormal()*0.25 + 4.0,
R.GaussNormal()*3.0 - 1.5
R.GaussNormal<scalar>()*3.0 + 1.5,
R.GaussNormal<scalar>()*0.25 + 4.0,
R.GaussNormal<scalar>()*3.0 - 1.5
),
vector(1.0, 2.0, 5.0)
);
@ -225,7 +225,7 @@ int main(int argc, char *argv[])
for (label i = 0; i < randomDistributionTestSize; i++)
{
dT.add(R.tensor01());
dT.add(R.sample01<tensor>());
}
Info<< "Mean " << dT.mean() << nl
@ -249,7 +249,7 @@ int main(int argc, char *argv[])
for (label i = 0; i < randomDistributionTestSize; i++)
{
dSyT.add(R.symmTensor01());
dSyT.add(R.sample01<symmTensor>());
}
Info<< "Mean " << dSyT.mean() << nl
@ -273,7 +273,7 @@ int main(int argc, char *argv[])
for (label i = 0; i < randomDistributionTestSize; i++)
{
dSpT.add(R.sphericalTensor01());
dSpT.add(R.sample01<sphericalTensor>());
}
Info<< "Mean " << dSpT.mean() << nl

2
applications/test/Polynomial/Test-Polynomial.C
View File

@ -152,7 +152,7 @@ int main(int argc, char *argv[])
Random rnd(123456);
for (int i=0; i<10; i++)
{
scalar x = rnd.scalar01()*100;
scalar x = rnd.sample01<scalar>()*100;
scalar px = polyValue(x);
scalar ipx = intPolyValue(x);

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
View File

@ -293,9 +293,9 @@ inline Foam::point Foam::conformalVoronoiMesh::perturbPoint
scalar pert = 1e-12*defaultCellSize();
perturbedPt.x() += pert*(rndGen_.scalar01() - 0.5);
perturbedPt.y() += pert*(rndGen_.scalar01() - 0.5);
perturbedPt.z() += pert*(rndGen_.scalar01() - 0.5);
perturbedPt.x() += pert*(rndGen_.sample01<scalar>() - 0.5);
perturbedPt.y() += pert*(rndGen_.sample01<scalar>() - 0.5);
perturbedPt.z() += pert*(rndGen_.sample01<scalar>() - 0.5);
return perturbedPt;
}

16
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
View File

@ -553,11 +553,11 @@ bool Foam::autoDensity::fillBox
+ vector
(
delta.x()
*(i + 0.5 + 0.1*(rndGen().scalar01() - 0.5)),
*(i + 0.5 + 0.1*(rndGen().sample01<scalar>() - 0.5)),
delta.y()
*(j + 0.5 + 0.1*(rndGen().scalar01() - 0.5)),
*(j + 0.5 + 0.1*(rndGen().sample01<scalar>() - 0.5)),
delta.z()
*(k + 0.5 + 0.1*(rndGen().scalar01() - 0.5))
*(k + 0.5 + 0.1*(rndGen().sample01<scalar>() - 0.5))
);
}
}
@ -662,7 +662,7 @@ bool Foam::autoDensity::fillBox
// TODO - is there a lot of cost in the 1/density calc? Could
// assess on
// (1/maxDensity)/(1/localDensity) = minVolume/localVolume
if (localDensity/maxDensity > rndGen().scalar01())
if (localDensity/maxDensity > rndGen().sample01<scalar>())
{
scalar localVolume = 1/localDensity;
@ -675,7 +675,7 @@ bool Foam::autoDensity::fillBox
scalar addProbability =
(totalVolume - volumeAdded)/localVolume;
scalar r = rndGen().scalar01();
scalar r = rndGen().sample01<scalar>();
if (debug)
{
@ -729,7 +729,7 @@ bool Foam::autoDensity::fillBox
{
trialPoints++;
point p = min + cmptMultiply(span, rndGen().vector01());
point p = min + cmptMultiply(span, rndGen().sample01<vector>());
scalar localSize = cellShapeControls().cellSize(p);
@ -785,7 +785,7 @@ bool Foam::autoDensity::fillBox
// Accept possible placements proportional to the relative local
// density
if (localDensity/maxDensity > rndGen().scalar01())
if (localDensity/maxDensity > rndGen().sample01<scalar>())
{
scalar localVolume = 1/localDensity;
@ -798,7 +798,7 @@ bool Foam::autoDensity::fillBox
scalar addProbability =
(totalVolume - volumeAdded)/localVolume;
scalar r = rndGen().scalar01();
scalar r = rndGen().sample01<scalar>();
if (debug)
{

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
View File

@ -129,9 +129,9 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
if (randomiseInitialGrid_)
{
pA.x() += pert*(rndGen().scalar01() - 0.5);
pA.y() += pert*(rndGen().scalar01() - 0.5);
pA.z() += pert*(rndGen().scalar01() - 0.5);
pA.x() += pert*(rndGen().sample01<scalar>() - 0.5);
pA.y() += pert*(rndGen().sample01<scalar>() - 0.5);
pA.z() += pert*(rndGen().sample01<scalar>() - 0.5);
}
if (Pstream::parRun())
@ -150,9 +150,9 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
if (randomiseInitialGrid_)
{
pB.x() += pert*(rndGen().scalar01() - 0.5);
pB.y() += pert*(rndGen().scalar01() - 0.5);
pB.z() += pert*(rndGen().scalar01() - 0.5);
pB.x() += pert*(rndGen().sample01<scalar>() - 0.5);
pB.y() += pert*(rndGen().sample01<scalar>() - 0.5);
pB.z() += pert*(rndGen().sample01<scalar>() - 0.5);
}
if (Pstream::parRun())

24
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
View File

@ -127,9 +127,9 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
if (randomiseInitialGrid_)
{
p.x() += pert*(rndGen().scalar01() - 0.5);
p.y() += pert*(rndGen().scalar01() - 0.5);
p.z() += pert*(rndGen().scalar01() - 0.5);
p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
}
if (Pstream::parRun())
@ -155,9 +155,9 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
if (randomiseInitialGrid_)
{
p.x() += pert*(rndGen().scalar01() - 0.5);
p.y() += pert*(rndGen().scalar01() - 0.5);
p.z() += pert*(rndGen().scalar01() - 0.5);
p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
}
if (Pstream::parRun())
@ -183,9 +183,9 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
if (randomiseInitialGrid_)
{
p.x() += pert*(rndGen().scalar01() - 0.5);
p.y() += pert*(rndGen().scalar01() - 0.5);
p.z() += pert*(rndGen().scalar01() - 0.5);
p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
}
if (Pstream::parRun())
@ -211,9 +211,9 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
if (randomiseInitialGrid_)
{
p.x() += pert*(rndGen().scalar01() - 0.5);
p.y() += pert*(rndGen().scalar01() - 0.5);
p.z() += pert*(rndGen().scalar01() - 0.5);
p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
}
if (Pstream::parRun())

12
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
View File

@ -198,9 +198,15 @@ List<Vb::Point> pointFile::initialPoints() const
if (randomiseInitialGrid_)
{
p.x() += randomPerturbationCoeff_*(rndGen().scalar01() - 0.5);
p.y() += randomPerturbationCoeff_*(rndGen().scalar01() - 0.5);
p.z() += randomPerturbationCoeff_*(rndGen().scalar01() - 0.5);
p.x() +=
randomPerturbationCoeff_
*(rndGen().sample01<scalar>() - 0.5);
p.y() +=
randomPerturbationCoeff_
*(rndGen().sample01<scalar>() - 0.5);
p.z() +=
randomPerturbationCoeff_
*(rndGen().sample01<scalar>() - 0.5);
}
initialPoints.append(Vb::Point(p.x(), p.y(), p.z()));

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
View File

@ -86,9 +86,9 @@ void rayShooting::splitLine
{
Foam::point newPt
(
midPoint.x() + pert*(rndGen().scalar01() - 0.5),
midPoint.y() + pert*(rndGen().scalar01() - 0.5),
midPoint.z() + pert*(rndGen().scalar01() - 0.5)
midPoint.x() + pert*(rndGen().sample01<scalar>() - 0.5),
midPoint.y() + pert*(rndGen().sample01<scalar>() - 0.5),
midPoint.z() + pert*(rndGen().sample01<scalar>() - 0.5)
);
if

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
View File

@ -128,9 +128,9 @@ List<Vb::Point> uniformGrid::initialPoints() const
if (randomiseInitialGrid_)
{
p.x() += pert*(rndGen().scalar01() - 0.5);
p.y() += pert*(rndGen().scalar01() - 0.5);
p.z() += pert*(rndGen().scalar01() - 0.5);
p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
}
if

4
applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
View File

@ -264,8 +264,8 @@ void Foam::CV2D::insertGrid()
if (meshControls().randomiseInitialGrid())
{
p.x() += pert*(rndGen.scalar01() - 0.5);
p.y() += pert*(rndGen.scalar01() - 0.5);
p.x() += pert*(rndGen.sample01<scalar>() - 0.5);
p.y() += pert*(rndGen.sample01<scalar>() - 0.5);
}
if (qSurf_.wellInside(p, 0.5*meshControls().minCellSize2()))

2
applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
View File

@ -20,7 +20,7 @@
const fileName pdfPath = runTime.path()/"pdf";
mkDir(pdfPath);
cachedRandom rndGen(label(0), -1);
Random rndGen;
autoPtr<distributionModels::distributionModel> p
(

2
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -783,7 +783,7 @@ labelPair edgeIntersectionsAndShuffleCGAL
const edge& e = edges[edgeI];
forAll(e, eI)
{
vector d = rndGen.vector01()-p05;
vector d = rndGen.sample01<vector>() - p05;
surf1Points[mp[e[eI]]] += surf1PointTol[e[eI]]*d;
}
}

6
applications/utilities/surface/surfaceInertia/surfaceInertia.C
View File

@ -125,9 +125,9 @@ int main(int argc, char *argv[])
<< "No eigenValues found, shape may have symmetry, "
<< "perturbing inertia tensor diagonal" << endl;
J.xx() *= 1.0 + SMALL*rand.scalar01();
J.yy() *= 1.0 + SMALL*rand.scalar01();
J.zz() *= 1.0 + SMALL*rand.scalar01();
J.xx() *= 1.0 + SMALL*rand.sample01<scalar>();
J.yy() *= 1.0 + SMALL*rand.sample01<scalar>();
J.zz() *= 1.0 + SMALL*rand.sample01<scalar>();
eVal = eigenValues(J);

1
src/OpenFOAM/Make/files
View File

@ -111,7 +111,6 @@ $(sha1)/SHA1.C
$(sha1)/SHA1Digest.C
primitives/random/Random/Random.C
primitives/random/cachedRandom/cachedRandom.C
ranges = primitives/ranges
$(ranges)/labelRange/labelRange.C

5
src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
View File

@ -42,7 +42,6 @@ SourceFiles
#include "point.H"
#include "primitiveFieldsFwd.H"
#include "pointHit.H"
#include "cachedRandom.H"
#include "Random.H"
#include "FixedList.H"
#include "UList.H"
@ -239,10 +238,6 @@ public:
// uniform distribution
inline Point randomPoint(Random& rndGen) const;
//- Return a random point in the tetrahedron from a
// uniform distribution
inline Point randomPoint(cachedRandom& rndGen) const;
//- Calculate the barycentric coordinates of the given
// point, in the same order as a, b, c, d. Returns the
// determinant of the solution.

36
src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
View File

@ -249,42 +249,6 @@ inline Point Foam::tetrahedron<Point, PointRef>::randomPoint
// Adapted from
// http://vcg.isti.cnr.it/activities/geometryegraphics/pointintetraedro.html
scalar s = rndGen.scalar01();
scalar t = rndGen.scalar01();
scalar u = rndGen.scalar01();
if (s + t > 1.0)
{
s = 1.0 - s;
t = 1.0 - t;
}
if (t + u > 1.0)
{
scalar tmp = u;
u = 1.0 - s - t;
t = 1.0 - tmp;
}
else if (s + t + u > 1.0)
{
scalar tmp = u;
u = s + t + u - 1.0;
s = 1.0 - t - tmp;
}
return (1 - s - t - u)*a_ + s*b_ + t*c_ + u*d_;
}
template<class Point, class PointRef>
inline Point Foam::tetrahedron<Point, PointRef>::randomPoint
(
cachedRandom& rndGen
) const
{
// Adapted from
// http://vcg.isti.cnr.it/activities/geometryegraphics/pointintetraedro.html
scalar s = rndGen.sample01<scalar>();
scalar t = rndGen.sample01<scalar>();
scalar u = rndGen.sample01<scalar>();

5
src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
View File

@ -40,7 +40,6 @@ SourceFiles
#include "tensor.H"
#include "pointHit.H"
#include "Random.H"
#include "cachedRandom.H"
#include "FixedList.H"
#include "UList.H"
#include "linePointRef.H"
@ -238,10 +237,6 @@ public:
// distribution
inline Point randomPoint(Random& rndGen) const;
//- Return a random point on the triangle from a uniform
// distribution
inline Point randomPoint(cachedRandom& rndGen) const;
//- Calculate the barycentric coordinates of the given
// point, in the same order as a, b, c. Returns the
// determinant of the solution.

19
src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
View File

@ -249,25 +249,6 @@ inline Point Foam::triangle<Point, PointRef>::randomPoint(Random& rndGen) const
// from "Graphics Gems", Academic Press, 1990
// http://tog.acm.org/GraphicsGems/gems/TriPoints.c
scalar s = rndGen.scalar01();
scalar t = sqrt(rndGen.scalar01());
return (1 - t)*a_ + (1 - s)*t*b_ + s*t*c_;
}
template<class Point, class PointRef>
inline Point Foam::triangle<Point, PointRef>::randomPoint
(
cachedRandom& rndGen
) const
{
// Generating Random Points in Triangles
// by Greg Turk
// from "Graphics Gems", Academic Press, 1990
// http://tog.acm.org/GraphicsGems/gems/TriPoints.c
scalar s = rndGen.sample01<scalar>();
scalar t = sqrt(rndGen.sample01<scalar>());

2
src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
View File

@ -335,7 +335,7 @@ public:
label distanceCmp(const point& pt, const treeBoundBox& other) const;
//- Return slightly wider bounding box
// Extends all dimensions with s*span*Random::scalar01()
// Extends all dimensions with s*span*Random::sample01<scalar>()
// and guarantees in any direction s*mag(span) minimum width
inline treeBoundBox extend(Random& rndGen, const scalar s) const;

4
src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
View File

@ -336,8 +336,8 @@ inline Foam::treeBoundBox Foam::treeBoundBox::extend
newSpan[dir] = Foam::max(newSpan[dir], minSpan);
}
bb.min() -= cmptMultiply(s * rndGen.vector01(), newSpan);
bb.max() += cmptMultiply(s * rndGen.vector01(), newSpan);
bb.min() -= cmptMultiply(s*rndGen.sample01<vector>(), newSpan);
bb.max() += cmptMultiply(s*rndGen.sample01<vector>(), newSpan);
return bb;
}

2
src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.C
View File

@ -129,7 +129,7 @@ Foam::eddy::eddy
const scalar x,
const scalar sigmaX,
const symmTensor& R,
cachedRandom& rndGen
Random& rndGen
)
:
patchFaceI_(patchFaceI),

8
src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
View File

@ -41,7 +41,7 @@ SourceFiles
#include "vector.H"
#include "point.H"
#include "tensor.H"
#include "cachedRandom.H"
#include "Random.H"
#include "coordinateSystem.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -112,7 +112,7 @@ class eddy
) const;
//- Return a number with zero mean and unit variance
inline scalar epsi(cachedRandom& rndGen) const;
inline scalar epsi(Random& rndGen) const;
public:
@ -133,7 +133,7 @@ public:
const scalar x, // distance from reference position
const scalar sigmaX, // length scale
const symmTensor& R, // Stress tensor
cachedRandom& rndGen
Random& rndGen
);
//- Construct copy
@ -175,7 +175,7 @@ public:
inline label dir1() const;
//- Return random vector of -1 and 1's
inline vector epsilon(cachedRandom& rndGen) const;
inline vector epsilon(Random& rndGen) const;
// Helper functions

4
src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyI.H
View File

@ -29,7 +29,7 @@ using namespace Foam::constant;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::scalar Foam::eddy::epsi(cachedRandom& rndGen) const
Foam::scalar Foam::eddy::epsi(Random& rndGen) const
{
// Random number with zero mean and unit variance
return rndGen.sample01<scalar>() > 0.5 ? 1 : -1;
@ -84,7 +84,7 @@ inline Foam::scalar Foam::eddy::c1() const
}
Foam::vector Foam::eddy::epsilon(cachedRandom& rndGen) const
Foam::vector Foam::eddy::epsilon(Random& rndGen) const
{
return vector(epsi(rndGen), epsi(rndGen), epsi(rndGen));
}

4
src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
View File

@ -81,7 +81,7 @@ SourceFiles
#define turbulentDFSEMInletFvPatchVectorField_H
#include "fixedValueFvPatchFields.H"
#include "cachedRandom.H"
#include "Random.H"
#include "eddy.H"
#include "pointIndexHit.H"
#include "instantList.H"
@ -184,7 +184,7 @@ class turbulentDFSEMInletFvPatchVectorField
scalar v0_;
//- Random number generator
cachedRandom rndGen_;
Random rndGen_;
//- Length scale per patch face
scalarField sigmax_;

2
src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
View File

@ -166,7 +166,7 @@ void Foam::turbulentInletFvPatchField<Type>::updateCoeffs()
forAll(patchField, facei)
{
ranGen_.randomise(randomField[facei]);
ranGen_.randomise01<Type>(randomField[facei]);
}
// Correction-factor to compensate for the loss of RMS fluctuation

4
src/functionObjects/field/particleDistribution/particleDistribution.H
View File

@ -73,7 +73,7 @@ SourceFiles
#include "fvMeshFunctionObject.H"
#include "writeFile.H"
#include "scalarField.H"
#include "cachedRandom.H"
#include "Random.H"
#include "Tuple2.H"
#include "writer.H"
@ -107,7 +107,7 @@ protected:
word tagFieldName_;
//- Random number generator - used by distribution models
cachedRandom rndGen_;
Random rndGen_;
//- Writer
autoPtr<writer<scalar>> writerPtr_;

2
src/functionObjects/field/randomise/randomiseTemplates.C
View File

@ -47,7 +47,7 @@ bool Foam::functionObjects::randomise::calcRandomised()
forAll(field, celli)
{
Type rndPert;
rand.randomise(rndPert);
rand.randomise01(rndPert);
rndPert = 2.0*rndPert - pTraits<Type>::one;
rndPert /= mag(rndPert);
rfield[celli] += magPerturbation_*rndPert;

38
src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
View File

@ -152,7 +152,7 @@ void Foam::DSMCCloud<ParcelType>::initialise
if
(
(particlesRequired - nParticlesToInsert)
> rndGen_.scalar01()
> rndGen_.sample01<scalar>()
)
{
nParticlesToInsert++;
@ -282,7 +282,7 @@ void Foam::DSMCCloud<ParcelType>::collisions()
// subCell candidate selection procedure
// Select the first collision candidate
label candidateP = rndGen_.integer(0, nC - 1);
label candidateP = rndGen_.position<label>(0, nC - 1);
// Declare the second collision candidate
label candidateQ = -1;
@ -298,7 +298,8 @@ void Foam::DSMCCloud<ParcelType>::collisions()
do
{
candidateQ = subCellPs[rndGen_.integer(0, nSC - 1)];
label i = rndGen_.position<label>(0, nSC - 1);
candidateQ = subCellPs[i];
} while (candidateP == candidateQ);
}
else
@ -309,7 +310,7 @@ void Foam::DSMCCloud<ParcelType>::collisions()
do
{
candidateQ = rndGen_.integer(0, nC - 1);
candidateQ = rndGen_.position<label>(0, nC - 1);
} while (candidateP == candidateQ);
}
@ -317,15 +318,15 @@ void Foam::DSMCCloud<ParcelType>::collisions()
// uniform candidate selection procedure
// // Select the first collision candidate
// label candidateP = rndGen_.integer(0, nC-1);
// label candidateP = rndGen_.position<label>(0, nC-1);
// // Select a possible second collision candidate
// label candidateQ = rndGen_.integer(0, nC-1);
// label candidateQ = rndGen_.position<label>(0, nC-1);
// // If the same candidate is chosen, choose again
// while (candidateP == candidateQ)
// {
// candidateQ = rndGen_.integer(0, nC-1);
// candidateQ = rndGen_.position<label>(0, nC-1);
// }
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -348,7 +349,7 @@ void Foam::DSMCCloud<ParcelType>::collisions()
sigmaTcRMax_[celli] = sigmaTcR;
}
if ((sigmaTcR/sigmaTcRMax) > rndGen_.scalar01())
if ((sigmaTcR/sigmaTcRMax) > rndGen_.sample01<scalar>())
{
binaryCollision().collide
(
@ -648,7 +649,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
mesh_
),
constProps_(),
rndGen_(label(149382906) + 7183*Pstream::myProcNo()),
rndGen_(Pstream::myProcNo()),
boundaryT_
(
volScalarField
@ -711,7 +712,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
// and 1.
forAll(collisionSelectionRemainder_, i)
{
collisionSelectionRemainder_[i] = rndGen_.scalar01();
collisionSelectionRemainder_[i] = rndGen_.sample01<scalar>();
}
if (readFields)
@ -900,7 +901,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
)
),
constProps_(),
rndGen_(label(971501) + 1526*Pstream::myProcNo()),
rndGen_(Pstream::myProcNo()),
boundaryT_
(
volScalarField
@ -1039,12 +1040,7 @@ Foam::vector Foam::DSMCCloud<ParcelType>::equipartitionLinearVelocity
{
return
sqrt(physicoChemical::k.value()*temperature/mass)
*vector
(
rndGen_.GaussNormal(),
rndGen_.GaussNormal(),
rndGen_.GaussNormal()
);
*rndGen_.GaussNormal<vector>();
}
@ -1064,7 +1060,9 @@ Foam::scalar Foam::DSMCCloud<ParcelType>::equipartitionInternalEnergy
else if (iDof < 2.0 + SMALL && iDof > 2.0 - SMALL)
{
// Special case for iDof = 2, i.e. diatomics;
Ei = -log(rndGen_.scalar01())*physicoChemical::k.value()*temperature;
Ei =
-log(rndGen_.sample01<scalar>())
*physicoChemical::k.value()*temperature;
}
else
{
@ -1074,9 +1072,9 @@ Foam::scalar Foam::DSMCCloud<ParcelType>::equipartitionInternalEnergy
do
{
energyRatio = 10*rndGen_.scalar01();
energyRatio = 10*rndGen_.sample01<scalar>();
P = pow((energyRatio/a), a)*exp(a - energyRatio);
} while (P < rndGen_.scalar01());
} while (P < rndGen_.sample01<scalar>());
Ei = energyRatio*physicoChemical::k.value()*temperature;
}

23
src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
View File

@ -39,14 +39,14 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
{
CloudType& cloud(this->owner());
Random& rndGen(cloud.rndGen());
Random& rndGen = cloud.rndGen();
scalar ChiAMinusOne = ChiA - 1;
scalar ChiBMinusOne = ChiB - 1;
if (ChiAMinusOne < SMALL && ChiBMinusOne < SMALL)
{
return rndGen.scalar01();
return rndGen.sample01<scalar>();
}
scalar energyRatio;
@ -56,7 +56,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
{
P = 0;
energyRatio = rndGen.scalar01();
energyRatio = rndGen.sample01<scalar>();
if (ChiAMinusOne < SMALL)
{
@ -81,7 +81,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
ChiBMinusOne
);
}
} while (P < rndGen.scalar01());
} while (P < rndGen.sample01<scalar>());
return energyRatio;
}
@ -186,7 +186,7 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
scalar& EiP = pP.Ei();
scalar& EiQ = pQ.Ei();
Random& rndGen(cloud.rndGen());
Random& rndGen = cloud.rndGen();
scalar inverseCollisionNumber = 1/relaxationCollisionNumber_;
@ -217,13 +217,14 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
if (iDofP > 0)
{
if (inverseCollisionNumber > rndGen.scalar01())
if (inverseCollisionNumber > rndGen.sample01<scalar>())
{
availableEnergy += preCollisionEiP;
if (iDofP == 2)
{
scalar energyRatio = 1.0 - pow(rndGen.scalar01(), (1.0/ChiB));
scalar energyRatio =
1.0 - pow(rndGen.sample01<scalar>(), (1.0/ChiB));
EiP = energyRatio*availableEnergy;
}
else
@ -238,13 +239,13 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
if (iDofQ > 0)
{
if (inverseCollisionNumber > rndGen.scalar01())
if (inverseCollisionNumber > rndGen.sample01<scalar>())
{
availableEnergy += preCollisionEiQ;
if (iDofQ == 2)
{
scalar energyRatio = 1.0 - pow(rndGen.scalar01(), (1.0/ChiB));
scalar energyRatio = 1.0 - pow(rndGen.sample01<scalar>(), (1.0/ChiB));
EiQ = energyRatio*availableEnergy;
}
else
@ -261,9 +262,9 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
scalar cR = sqrt(2.0*availableEnergy/mR);
// Variable Hard Sphere collision part
scalar cosTheta = 2.0*rndGen.scalar01() - 1.0;
scalar cosTheta = 2.0*rndGen.sample01<scalar>() - 1.0;
scalar sinTheta = sqrt(1.0 - cosTheta*cosTheta);
scalar phi = twoPi*rndGen.scalar01();
scalar phi = twoPi*rndGen.sample01<scalar>();
vector postCollisionRelU =
cR

6
src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
View File

@ -121,7 +121,7 @@ void Foam::VariableHardSphere<CloudType>::collide
vector& UP = pP.U();
vector& UQ = pQ.U();
Random& rndGen(cloud.rndGen());
Random& rndGen = cloud.rndGen();
scalar mP = cloud.constProps(typeIdP).mass();
@ -131,11 +131,11 @@ void Foam::VariableHardSphere<CloudType>::collide
scalar cR = mag(UP - UQ);
scalar cosTheta = 2.0*rndGen.scalar01() - 1.0;
scalar cosTheta = 2.0*rndGen.sample01<scalar>() - 1.0;
scalar sinTheta = sqrt(1.0 - cosTheta*cosTheta);
scalar phi = twoPi*rndGen.scalar01();
scalar phi = twoPi*rndGen.sample01<scalar>();
vector postCollisionRelU =
cR

14
src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
View File

@ -147,7 +147,7 @@ void Foam::FreeStream<CloudType>::inflow()
const scalar deltaT = mesh.time().deltaTValue();
Random& rndGen(cloud.rndGen());
Random& rndGen = cloud.rndGen();
scalar sqrtPi = sqrt(pi);
@ -291,7 +291,7 @@ void Foam::FreeStream<CloudType>::inflow()
// Add another particle with a probability proportional to the
// remainder of taking the integer part of faceAccumulator
if ((faceAccumulator - nI) > rndGen.scalar01())
if ((faceAccumulator - nI) > rndGen.sample01<scalar>())
{
nI++;
}
@ -307,7 +307,7 @@ void Foam::FreeStream<CloudType>::inflow()
// Choose a triangle to insert on, based on their relative
// area
scalar triSelection = rndGen.scalar01();
scalar triSelection = rndGen.sample01<scalar>();
// Selected triangle
label selectedTriI = -1;
@ -371,7 +371,7 @@ void Foam::FreeStream<CloudType>::inflow()
do
{
uNormalThermal =
randomScaling*(2.0*rndGen.scalar01() - 1);
randomScaling*(2.0*rndGen.sample01<scalar>() - 1);
uNormal = uNormalThermal + sCosTheta;
@ -385,13 +385,13 @@ void Foam::FreeStream<CloudType>::inflow()
*exp(uNormProbCoeffB - sqr(uNormalThermal));
}
} while (P < rndGen.scalar01());
} while (P < rndGen.sample01<scalar>());
vector U =
sqrt(physicoChemical::k.value()*faceTemperature/mass)
*(
rndGen.GaussNormal()*t1
+ rndGen.GaussNormal()*t2
rndGen.GaussNormal<scalar>()*t1
+ rndGen.GaussNormal<scalar>()*t2
)
+ (t1 & faceVelocity)*t1
+ (t2 & faceVelocity)*t2

15
src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
View File

@ -78,19 +78,18 @@ void Foam::MaxwellianThermal<CloudType>::correct
CloudType& cloud(this->owner());
Random& rndGen(cloud.rndGen());
Random& rndGen = cloud.rndGen();
while (mag(Ut) < SMALL)
{
// If the incident velocity is parallel to the face normal, no
// tangential direction can be chosen. Add a perturbation to the
// incoming velocity and recalculate.
U = vector
(
U.x()*(0.8 + 0.2*rndGen.scalar01()),
U.y()*(0.8 + 0.2*rndGen.scalar01()),
U.z()*(0.8 + 0.2*rndGen.scalar01())
U.x()*(0.8 + 0.2*rndGen.sample01<scalar>()),
U.y()*(0.8 + 0.2*rndGen.sample01<scalar>()),
U.z()*(0.8 + 0.2*rndGen.sample01<scalar>())
);
U_dot_nw = U & nw;
@ -113,9 +112,9 @@ void Foam::MaxwellianThermal<CloudType>::correct
U =
sqrt(physicoChemical::k.value()*T/mass)
*(
rndGen.GaussNormal()*tw1
+ rndGen.GaussNormal()*tw2
- sqrt(-2.0*log(max(1 - rndGen.scalar01(), VSMALL)))*nw
rndGen.GaussNormal<scalar>()*tw1
+ rndGen.GaussNormal<scalar>()*tw2
- sqrt(-2.0*log(max(1 - rndGen.sample01<scalar>(), VSMALL)))*nw
);
U += cloud.boundaryU().boundaryField()[wppIndex][wppLocalFace];

17
src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
View File

@ -73,9 +73,9 @@ void Foam::MixedDiffuseSpecular<CloudType>::correct
CloudType& cloud(this->owner());
Random& rndGen(cloud.rndGen());
Random& rndGen = cloud.rndGen();
if (diffuseFraction_ > rndGen.scalar01())
if (diffuseFraction_ > rndGen.sample01<scalar>())
{
// Diffuse reflection
@ -87,12 +87,11 @@ void Foam::MixedDiffuseSpecular<CloudType>::correct
// If the incident velocity is parallel to the face normal, no
// tangential direction can be chosen. Add a perturbation to the
// incoming velocity and recalculate.
U = vector
(
U.x()*(0.8 + 0.2*rndGen.scalar01()),
U.y()*(0.8 + 0.2*rndGen.scalar01()),
U.z()*(0.8 + 0.2*rndGen.scalar01())
U.x()*(0.8 + 0.2*rndGen.sample01<scalar>()),
U.y()*(0.8 + 0.2*rndGen.sample01<scalar>()),
U.z()*(0.8 + 0.2*rndGen.sample01<scalar>())
);
U_dot_nw = U & nw;
@ -115,9 +114,9 @@ void Foam::MixedDiffuseSpecular<CloudType>::correct
U =
sqrt(physicoChemical::k.value()*T/mass)
*(
rndGen.GaussNormal()*tw1
+ rndGen.GaussNormal()*tw2
- sqrt(-2.0*log(max(1 - rndGen.scalar01(), VSMALL)))*nw
rndGen.GaussNormal<scalar>()*tw1
+ rndGen.GaussNormal<scalar>()*tw2
- sqrt(-2.0*log(max(1 - rndGen.sample01<scalar>(), VSMALL)))*nw
);
U += cloud.boundaryU().boundaryField()[wppIndex][wppLocalFace];

2
src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
View File

@ -42,7 +42,7 @@ namespace distributionModels
Foam::distributionModels::RosinRammler::RosinRammler
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),

2
src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
View File

@ -82,7 +82,7 @@ public:
// Constructors
//- Construct from components
RosinRammler(const dictionary& dict, cachedRandom& rndGen);
RosinRammler(const dictionary& dict, Random& rndGen);
//- Construct copy
RosinRammler(const RosinRammler& p);

4
src/lagrangian/distributionModels/binned/binned.C
View File

@ -78,7 +78,7 @@ void Foam::distributionModels::binned::initialise()
Foam::distributionModels::binned::binned
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),
@ -102,7 +102,7 @@ Foam::distributionModels::binned::binned
(
const UList<scalar>& sampleData,
const scalar binWidth,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dictionary::null, rndGen),

4
src/lagrangian/distributionModels/binned/binned.H
View File

@ -96,14 +96,14 @@ public:
// Constructors
//- Construct from dictionary
binned(const dictionary& dict, cachedRandom& rndGen);
binned(const dictionary& dict, Random& rndGen);
//- Construct from components
binned
(
const UList<scalar>& sampleData,
const scalar binWidth,
cachedRandom& rndGen
Random& rndGen
);
//- Construct copy

2
src/lagrangian/distributionModels/distributionModel/distributionModel.C
View File

@ -66,7 +66,7 @@ Foam::distributionModels::distributionModel::distributionModel
(
const word& name,
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModelDict_(dict),

10
src/lagrangian/distributionModels/distributionModel/distributionModel.H
View File

@ -55,7 +55,7 @@ SourceFiles
#include "IOdictionary.H"
#include "autoPtr.H"
#include "cachedRandom.H"
#include "Random.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -79,7 +79,7 @@ protected:
const dictionary distributionModelDict_;
//- Reference to the random number generator
cachedRandom& rndGen_;
Random& rndGen_;
// Protected Member Functions
@ -102,7 +102,7 @@ public:
dictionary,
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
),
(dict, rndGen)
);
@ -115,7 +115,7 @@ public:
(
const word& name,
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
);
//- Construct copy
@ -129,7 +129,7 @@ public:
static autoPtr<distributionModel> New
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
);

2
src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
View File

@ -31,7 +31,7 @@ Foam::autoPtr<Foam::distributionModels::distributionModel>
Foam::distributionModels::distributionModel::New
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
{
const word modelType(dict.lookup("type"));

2
src/lagrangian/distributionModels/exponential/exponential.C
View File

@ -42,7 +42,7 @@ namespace distributionModels
Foam::distributionModels::exponential::exponential
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),

2
src/lagrangian/distributionModels/exponential/exponential.H
View File

@ -75,7 +75,7 @@ public:
// Constructors
//- Construct from components
exponential(const dictionary& dict, cachedRandom& rndGen);
exponential(const dictionary& dict, Random& rndGen);
//- Construct copy
exponential(const exponential& p);

2
src/lagrangian/distributionModels/fixedValue/fixedValue.C
View File

@ -42,7 +42,7 @@ namespace distributionModels
Foam::distributionModels::fixedValue::fixedValue
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),

2
src/lagrangian/distributionModels/fixedValue/fixedValue.H
View File

@ -66,7 +66,7 @@ public:
// Constructors
//- Construct from components
fixedValue(const dictionary& dict, cachedRandom& rndGen);
fixedValue(const dictionary& dict, Random& rndGen);
//- Construct copy
fixedValue(const fixedValue& p);

4
src/lagrangian/distributionModels/general/general.C
View File

@ -78,7 +78,7 @@ void Foam::distributionModels::general::initialise()
Foam::distributionModels::general::general
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),
@ -96,7 +96,7 @@ Foam::distributionModels::general::general
(
const UList<scalar>& sampleData,
const scalar binWidth,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dictionary::null, rndGen),

4
src/lagrangian/distributionModels/general/general.H
View File

@ -96,14 +96,14 @@ public:
// Constructors
//- Construct from components
general(const dictionary& dict, cachedRandom& rndGen);
general(const dictionary& dict, Random& rndGen);
//- Construct from components
general
(
const UList<scalar>& sampleData,
const scalar binWidth,
cachedRandom& rndGen
Random& rndGen
);
//- Construct copy

2
src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C
View File

@ -42,7 +42,7 @@ namespace distributionModels
Foam::distributionModels::massRosinRammler::massRosinRammler
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),

2
src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.H
View File

@ -93,7 +93,7 @@ public:
// Constructors
//- Construct from components
massRosinRammler(const dictionary& dict, cachedRandom& rndGen);
massRosinRammler(const dictionary& dict, Random& rndGen);
//- Construct copy
massRosinRammler(const massRosinRammler& p);

2
src/lagrangian/distributionModels/multiNormal/multiNormal.C
View File

@ -42,7 +42,7 @@ namespace distributionModels
Foam::distributionModels::multiNormal::multiNormal
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),

2
src/lagrangian/distributionModels/multiNormal/multiNormal.H
View File

@ -85,7 +85,7 @@ public:
// Constructors
//- Construct from components
multiNormal(const dictionary& dict, cachedRandom& rndGen);
multiNormal(const dictionary& dict, Random& rndGen);
//- Construct copy
multiNormal(const multiNormal& p);

2
src/lagrangian/distributionModels/normal/normal.C
View File

@ -43,7 +43,7 @@ namespace distributionModels
Foam::distributionModels::normal::normal
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),

2
src/lagrangian/distributionModels/normal/normal.H
View File

@ -85,7 +85,7 @@ public:
// Constructors
//- Construct from components
normal(const dictionary& dict, cachedRandom& rndGen);
normal(const dictionary& dict, Random& rndGen);
//- Construct copy
normal(const normal& p);

2
src/lagrangian/distributionModels/uniform/uniform.C
View File

@ -42,7 +42,7 @@ namespace distributionModels
Foam::distributionModels::uniform::uniform
(
const dictionary& dict,
cachedRandom& rndGen
Random& rndGen
)
:
distributionModel(typeName, dict, rndGen),

2
src/lagrangian/distributionModels/uniform/uniform.H
View File

@ -70,7 +70,7 @@ public:
// Constructors
//- Construct from components
uniform(const dictionary& dict, cachedRandom& rndGen);
uniform(const dictionary& dict, Random& rndGen);
//- Construct copy
uniform(const uniform& p);

2
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
View File

@ -316,7 +316,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
(
particleProperties_.subOrEmptyDict("subModels", solution_.active())
),
rndGen_(),
rndGen_(Pstream::myProcNo()),
cellOccupancyPtr_(),
cellLengthScale_(cbrt(mesh_.V())),
rho_(rho),

6
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
View File

@ -59,7 +59,7 @@ SourceFiles
#include "kinematicCloud.H"
#include "IOdictionary.H"
#include "autoPtr.H"
#include "cachedRandom.H"
#include "Random.H"
#include "fvMesh.H"
#include "volFields.H"
#include "fvMatrices.H"
@ -163,7 +163,7 @@ protected:
const dictionary subModelProperties_;
//- Random number generator - used by some injection routines
mutable cachedRandom rndGen_;
mutable Random rndGen_;
//- Cell occupancy information for each parcel, (demand driven)
autoPtr<List<DynamicList<parcelType*>>> cellOccupancyPtr_;
@ -366,7 +366,7 @@ public:
// Cloud data
//- Return reference to the random object
inline cachedRandom& rndGen() const;
inline Random& rndGen() const;
//- Return the cell occupancy information for each
// parcel, non-const access, the caller is

2
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
View File

@ -356,7 +356,7 @@ inline Foam::scalar Foam::KinematicCloud<CloudType>::Dmax() const
template<class CloudType>
inline Foam::cachedRandom& Foam::KinematicCloud<CloudType>::rndGen() const
inline Foam::Random& Foam::KinematicCloud<CloudType>::rndGen() const
{
return rndGen_;
}

6
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
View File

@ -171,16 +171,16 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
}
else
{
// set 4 quadrants for single sector cases
// Set 4 quadrants for single sector cases
nS = 4;
vector tangent = Zero;
scalar magTangent = 0.0;
Random rnd(1234);
Random& rnd = this->owner().rndGen();
while (magTangent < SMALL)
{
vector v = rnd.vector01();
vector v = rnd.sample01<vector>();
tangent = v - (v & normal_[0])*normal_[0];
magTangent = mag(tangent);

2
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
View File

@ -40,7 +40,7 @@ void Foam::CellZoneInjection<CloudType>::setPositions
const fvMesh& mesh = this->owner().mesh();
const scalarField& V = mesh.V();
const label nCells = cellZoneCells.size();
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
DynamicList<vector> positions(nCells); // initial size only
DynamicList<label> injectorCells(nCells); // initial size only

4
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
View File

@ -110,7 +110,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
vector tangent = Zero;
scalar magTangent = 0.0;
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
while (magTangent < SMALL)
{
vector v = rnd.sample01<vector>();
@ -260,7 +260,7 @@ void Foam::ConeInjection<CloudType>::setProperties
typename CloudType::parcelType& parcel
)
{
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
// Set particle velocity
const label i = parcelI % positionAxis_.size();

6
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
View File

@ -175,7 +175,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
setFlowType();
cachedRandom& rndGen = this->owner().rndGen();
Random& rndGen = this->owner().rndGen();
// Normalise direction vector
direction_ /= mag(direction_);
@ -321,7 +321,7 @@ void Foam::ConeNozzleInjection<CloudType>::setPositionAndCell
label& tetPti
)
{
cachedRandom& rndGen = this->owner().rndGen();
Random& rndGen = this->owner().rndGen();
scalar beta = mathematical::twoPi*rndGen.sample01<scalar>();
normal_ = tanVec1_*cos(beta) + tanVec2_*sin(beta);
@ -373,7 +373,7 @@ void Foam::ConeNozzleInjection<CloudType>::setProperties
typename CloudType::parcelType& parcel
)
{
cachedRandom& rndGen = this->owner().rndGen();
Random& rndGen = this->owner().rndGen();
// Set particle velocity
const scalar deg2Rad = mathematical::pi/180.0;

2
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
View File

@ -205,7 +205,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
newParticles_.clear();
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
// Diameter factor, when splitting particles into 4, this is the
// factor that modifies the diameter.

4
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
View File

@ -148,7 +148,7 @@ void Foam::InjectedParticleDistributionInjection<CloudType>::initialise()
scalar minTime = GREAT;
// Populate injector properties, filtering out invalid entries
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
label injectori = 0;
forAll(injDiameter, i)
{
@ -448,7 +448,7 @@ void Foam::InjectedParticleDistributionInjection<CloudType>::setPositionAndCell
label& tetPtI
)
{
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
currentInjectori_ = rnd.globalPosition<label>(0, position_.size() - 1);
currentSamplei_ = rnd.globalPosition<label>(0, resampleSize_ - 1);

2
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
View File

@ -182,7 +182,7 @@ void Foam::KinematicLookupTableInjection<CloudType>::setPositionAndCell
label injectorI = 0;
if (randomise_)
{
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
injectorI = rnd.position<label>(0, injectorCells_.size() - 1);
}
else

2
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
View File

@ -162,7 +162,7 @@ Foam::label Foam::PatchFlowRateInjection<CloudType>::parcelsToInject
scalar nParcels = parcelConcentration_*c*flowRate()*dt;
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
label nParcelsToInject = floor(nParcels);

2
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
View File

@ -121,7 +121,7 @@ Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
if ((time0 >= 0.0) && (time0 < duration_))
{
scalar nParcels = (time1 - time0)*parcelsPerSecond_;
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
scalar rndPos = rnd.globalPosition(scalar(0), scalar(1));
label nParcelsToInject = floor(nParcels);

4
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
View File

@ -26,7 +26,7 @@ License
#include "patchInjectionBase.H"
#include "polyMesh.H"
#include "SubField.H"
#include "cachedRandom.H"
#include "Random.H"
#include "triPointRef.H"
#include "volFields.H"
#include "polyMeshTetDecomposition.H"
@ -151,7 +151,7 @@ void Foam::patchInjectionBase::updateMesh(const polyMesh& mesh)
void Foam::patchInjectionBase::setPositionAndCell
(
const fvMesh& mesh,
cachedRandom& rnd,
Random& rnd,
vector& position,
label& cellOwner,
label& tetFacei,

4
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
View File

@ -54,7 +54,7 @@ namespace Foam
// Forward class declarations
class polyMesh;
class fvMesh;
class cachedRandom;
class Random;
/*---------------------------------------------------------------------------*\
Class patchInjectionBase Declaration
@ -118,7 +118,7 @@ public:
virtual void setPositionAndCell
(
const fvMesh& mesh,
cachedRandom& rnd,
Random& rnd,
vector& position,
label& cellOwner,
label& tetFacei,

4
src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
View File

@ -71,7 +71,7 @@ Foam::scalar Foam::IsotropyModels::Stochastic<CloudType>::sampleGauss()
}
else
{
cachedRandom& rndGen = this->owner().rndGen();
Random& rndGen = this->owner().rndGen();
scalar f, m, x, y;
@ -98,7 +98,7 @@ void Foam::IsotropyModels::Stochastic<CloudType>::calculate()
{
const fvMesh& mesh = this->owner().mesh();
const scalar deltaT(this->owner().db().time().deltaTValue());
cachedRandom& rndGen = this->owner().rndGen();
Random& rndGen = this->owner().rndGen();
const scalar oneBySqrtThree = sqrt(1.0/3.0);

2
src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
View File

@ -181,7 +181,7 @@ void Foam::ReactingLookupTableInjection<CloudType>::setPositionAndCell
label injectorI = 0;
if (randomise_)
{
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
injectorI = rnd.position<label>(0, injectorCells_.size() - 1);
}
else

2
src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
View File

@ -187,7 +187,7 @@ void Foam::ReactingMultiphaseLookupTableInjection<CloudType>::setPositionAndCell
label injectorI = 0;
if (randomise_)
{
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
injectorI = rnd.position<label>(0, injectorCells_.size() - 1);
}
else

2
src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
View File

@ -182,7 +182,7 @@ void Foam::ThermoLookupTableInjection<CloudType>::setPositionAndCell
label injectorI = 0;
if (randomise_)
{
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
injectorI = rnd.position<label>(0, injectorCells_.size() - 1);
}
else

2
src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
View File

@ -101,7 +101,7 @@ protected:
typedef typename CloudType::parcelType parcelType;
//- Reference to the cloud random number generator
cachedRandom& rndGen_;
Random& rndGen_;
//- Reference to the cloud thermo package
const SLGThermo& thermo_;

6
src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
View File

@ -1041,11 +1041,11 @@ void Foam::moleculeCloud::createMolecule
{
pi = equipartitionAngularMomentum(temperature, cP);
scalar phi(rndGen_.scalar01()*twoPi);
scalar phi(rndGen_.sample01<scalar>()*twoPi);
scalar theta(rndGen_.scalar01()*twoPi);
scalar theta(rndGen_.sample01<scalar>()*twoPi);
scalar psi(rndGen_.scalar01()*twoPi);
scalar psi(rndGen_.sample01<scalar>()*twoPi);
Q = tensor
(

19
src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
View File

@ -301,12 +301,9 @@ inline Foam::vector Foam::moleculeCloud::equipartitionLinearVelocity
scalar mass
)
{
return sqrt(physicoChemical::k.value()*temperature/mass)*vector
(
rndGen_.GaussNormal(),
rndGen_.GaussNormal(),
rndGen_.GaussNormal()
);
return
sqrt(physicoChemical::k.value()*temperature/mass)
*rndGen_.GaussNormal<vector>();
}
@ -323,17 +320,17 @@ inline Foam::vector Foam::moleculeCloud::equipartitionAngularMomentum
return sqrtKbT*vector
(
0.0,
sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal(),
sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal()
sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal<scalar>(),
sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal<scalar>()
);
}
else
{
return sqrtKbT*vector
(
sqrt(cP.momentOfInertia().xx())*rndGen_.GaussNormal(),
sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal(),
sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal()
sqrt(cP.momentOfInertia().xx())*rndGen_.GaussNormal<scalar>(),
sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal<scalar>(),
sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal<scalar>()
);
}
}

2
src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
View File

@ -136,7 +136,7 @@ public:
const vector& injectionPos,
const scalar pAmbient,
const scalar chi,
cachedRandom& rndGen
Random& rndGen
) const = 0;
};

2
src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
View File

@ -92,7 +92,7 @@ void Foam::BlobsSheetAtomization<CloudType>::update
const vector& injectionPos,
const scalar pAmbient,
const scalar chi,
cachedRandom& rndGen
Random& rndGen
) const
{
scalar lBU =

2
src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
View File

@ -122,7 +122,7 @@ public:
const vector& injectionPos,
const scalar pAmbient,
const scalar chi,
cachedRandom& rndGen
Random& rndGen
) const;
};

2
src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
View File

@ -118,7 +118,7 @@ void Foam::LISAAtomization<CloudType>::update
const vector& injectionPos,
const scalar pAmbient,
const scalar chi,
cachedRandom& rndGen
Random& rndGen
) const
{
if (volFlowRate < SMALL)

2
src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
View File

@ -142,7 +142,7 @@ public:
const vector& injectionPos,
const scalar pAmbient,
const scalar chi,
cachedRandom& rndGen
Random& rndGen
) const;
};

2
src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C
View File

@ -95,7 +95,7 @@ void Foam::NoAtomization<CloudType>::update
const vector& injectionPos,
const scalar pAmbient,
const scalar chi,
cachedRandom& rndGen
Random& rndGen
) const
{}

2
src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
View File

@ -105,7 +105,7 @@ public:
const vector& injectionPos,
const scalar pAmbient,
const scalar chi,
cachedRandom& rndGen
Random& rndGen
) const;
};

2
src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
View File

@ -138,7 +138,7 @@ bool Foam::SHF<CloudType>::update
scalar& massChild
)
{
cachedRandom& rndGen = this->owner().rndGen();
Random& rndGen = this->owner().rndGen();
bool addChild = false;

2
src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
View File

@ -110,7 +110,7 @@ bool Foam::TAB<CloudType>::update
scalar& massChild
)
{
cachedRandom& rndGen = this->owner().rndGen();
Random& rndGen = this->owner().rndGen();
scalar r = 0.5*d;
scalar r2 = r*r;

2
src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
View File

@ -100,7 +100,7 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
scalar& tTurb
)
{
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
const scalar cps = 0.16432;

2
src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
View File

@ -71,7 +71,7 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
scalar& tTurb
)
{
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
const scalar cps = 0.16432;

2
src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
View File

@ -206,7 +206,7 @@ Foam::forceSuSp Foam::BrownianMotionForce<CloudType>::calcCoupled
// To generate a spherical distribution:
cachedRandom& rnd = this->owner().rndGen();
Random& rnd = this->owner().rndGen();
const scalar theta = rnd.sample01<scalar>()*twoPi;
const scalar u = 2*rnd.sample01<scalar>() - 1;

4
src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
View File

@ -46,7 +46,7 @@ SourceFiles
#define BrownianMotionForce_H
#include "ParticleForce.H"
#include "cachedRandom.H"
#include "Random.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -65,7 +65,7 @@ class BrownianMotionForce
// Private data
//- Reference to the cloud random number generator
cachedRandom& rndGen_;
Random& rndGen_;
//- Molecular free path length [m]
const scalar lambda_;

9
src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
View File

@ -260,7 +260,7 @@ bool Foam::edgeIntersections::inlinePerturb
if (perturbStart)
{
// Perturb with something (hopefully) larger than tolerance.
scalar t = 4.0*(rndGen.scalar01() - 0.5);
scalar t = 4.0*(rndGen.sample01<scalar>() - 0.5);
points1[v0] += t*surf1PointTol[e[0]]*n;
const labelList& pEdges = surf1.pointEdges()[e[0]];
@ -273,7 +273,7 @@ bool Foam::edgeIntersections::inlinePerturb
if (perturbEnd)
{
// Perturb with something larger than tolerance.
scalar t = 4.0*(rndGen.scalar01() - 0.5);
scalar t = 4.0*(rndGen.sample01<scalar>() - 0.5);
points1[v1] += t*surf1PointTol[e[1]]*n;
const labelList& pEdges = surf1.pointEdges()[e[1]];
@ -320,7 +320,7 @@ bool Foam::edgeIntersections::rotatePerturb
//label pointi = e[0];
// Generate random vector slightly larger than tolerance.
vector rndVec = rndGen.vector01() - vector(0.5, 0.5, 0.5);
vector rndVec = rndGen.sample01<vector>() - vector(0.5, 0.5, 0.5);
// Make sure rndVec only perp to edge
vector n(points1[meshPoints[e[1]]] - points1[meshPoints[e[0]]]);
@ -405,7 +405,8 @@ bool Foam::edgeIntersections::offsetPerturb
if (nearType == triPointRef::POINT || nearType == triPointRef::EDGE)
{
// Shift edge towards tri centre
vector offset = 0.01*rndGen.scalar01()*(ctr - pHit.hitPoint());
vector offset =
0.01*rndGen.sample01<scalar>()*(ctr - pHit.hitPoint());
// shift e[0]
points1[meshPoints[e[0]]] += offset;

8
src/randomProcesses/processes/UOprocess/UOprocess.C
View File

@ -40,9 +40,9 @@ complexVector UOprocess::WeinerProcess()
{
return RootDeltaT*complexVector
(
complex(GaussGen.GaussNormal(), GaussGen.GaussNormal()),
complex(GaussGen.GaussNormal(), GaussGen.GaussNormal()),
complex(GaussGen.GaussNormal(), GaussGen.GaussNormal())
complex(GaussGen.GaussNormal<scalar>(), GaussGen.GaussNormal<scalar>()),
complex(GaussGen.GaussNormal<scalar>(), GaussGen.GaussNormal<scalar>()),
complex(GaussGen.GaussNormal<scalar>(), GaussGen.GaussNormal<scalar>())
);
}
@ -57,7 +57,7 @@ UOprocess::UOprocess
const dictionary& UOdict
)
:
GaussGen(label(0)),
GaussGen(),
Mesh(kmesh),
DeltaT(deltaT),
RootDeltaT(sqrt(DeltaT)),

4
src/randomProcesses/turbulence/turbGen.C
View File

@ -51,8 +51,8 @@ Foam::vectorField Foam::turbGen::U()
forAll(K, i)
{
s[i] = RanGen.vector01();
rndPhases[i] = RanGen.scalar01();
s[i] = RanGen.sample01<vector>();
rndPhases[i] = RanGen.sample01<scalar>();
}
s = K ^ s;

4
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H
View File

@ -40,7 +40,7 @@ SourceFiles
#include "force.H"
#include "distributionModel.H"
#include "cachedRandom.H"
#include "Random.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -67,7 +67,7 @@ private:
scalar Ccf_;
//- Random number generator
cachedRandom rndGen_;
Random rndGen_;
//- Parcel size PDF model
const autoPtr<distributionModels::distributionModel> distribution_;

4
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
View File

@ -42,7 +42,7 @@ SourceFiles
#include "injectionModel.H"
#include "distributionModel.H"
#include "cachedRandom.H"
#include "Random.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -84,7 +84,7 @@ protected:
scalar particlesPerParcel_;
//- Random number generator
cachedRandom rndGen_;
Random rndGen_;
//- Parcel size PDF model
const autoPtr<distributionModels::distributionModel>

2
src/renumber/renumberMethods/randomRenumber/randomRenumber.C
View File

@ -65,7 +65,7 @@ Foam::labelList Foam::randomRenumber::renumber
{
forAll(newToOld, i)
{
label j = rndGen.integer(0, newToOld.size()-1);
label j = rndGen.position<label>(0, newToOld.size()-1);
Swap(newToOld[i], newToOld[j]);
}
}

2
src/sampling/sampledSet/patchSeed/patchSeedSet.C
View File

@ -227,7 +227,7 @@ void Foam::patchSeedSet::calcSamples
{
forAll(subset, i)
{
label j = rndGen.integer(0, subset.size()-1);
label j = rndGen.position<label>(0, subset.size()-1);
Swap(subset[i], subset[j]);
}
}