diff --git a/applications/test/Distribution2/Make/files b/applications/test/Distribution2/Make/files new file mode 100644 index 0000000..723a0b5 --- /dev/null +++ b/applications/test/Distribution2/Make/files @@ -0,0 +1,3 @@ +Test-Distribution2.C + +EXE = $(FOAM_USER_APPBIN)/Test-Distribution2 diff --git a/applications/test/Distribution2/Make/options b/applications/test/Distribution2/Make/options new file mode 100644 index 0000000..ae86ebe --- /dev/null +++ b/applications/test/Distribution2/Make/options @@ -0,0 +1,5 @@ +EXE_INC = \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + +EXE_LIBS = \ + -ldistributionModels diff --git a/applications/test/Distribution2/Test-Distribution2.C b/applications/test/Distribution2/Test-Distribution2.C new file mode 100644 index 0000000..96816a4 --- /dev/null +++ b/applications/test/Distribution2/Test-Distribution2.C @@ -0,0 +1,105 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Application + Test-Distribution2 + +Description + Test the general distributionModel. + +\*---------------------------------------------------------------------------*/ + +#include "Distribution.H" +#include "Random.H" +#include "dimensionedTypes.H" +#include "argList.H" +#include "distributionModel.H" +#include "IFstream.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +using namespace Foam; + +int main(int argc, char *argv[]) +{ + #include "setRootCase.H" + + Random R(918273); + + dictionary dict(IFstream("testDict")()); + + Info << nl << "Testing general distribution" << endl; + Info << nl << "Continuous probability density function:" << endl; + + autoPtr dist1 + ( + distributionModel::New + ( + dict.subDict("densityFunction"), + R + ) + ); + + label randomDistributionTestSize = 50000000; + Distribution dS(scalar(1e-6)); + + Info<< nl + << "Sampling " << randomDistributionTestSize << " times." << endl; + + for (label i = 0; i < randomDistributionTestSize; i++) + { + dS.add(dist1->sample()); + } + + Info<< "Produced mean " << dS.mean() << endl; + dS.write("densityTest"); + dS.clear(); + + Info << nl << "Discrete probability density function:" << endl; + dist1.clear(); + + dist1 = + distributionModel::New + ( + dict.subDict("cumulativeFunction"), + R + ); + + Info<< nl + << "Sampling " << randomDistributionTestSize << " times." << endl; + + for (label i = 0; i < randomDistributionTestSize; i++) + { + dS.add(dist1->sample()); + } + + Info<< "Produced mean " << dS.mean() << endl; + dS.write("cumulativeTest"); + + Info<< nl << "End" << nl << endl; + + return 0; +} + + +// ************************************************************************* // diff --git a/applications/test/Distribution2/createGraphs b/applications/test/Distribution2/createGraphs new file mode 100755 index 0000000..bbcb522 --- /dev/null +++ b/applications/test/Distribution2/createGraphs @@ -0,0 +1,24 @@ +#!/bin/sh + +gnuplot< 0 && xy_[i][0] <= xy_[i-1][0]) + { + FatalErrorInFunction + << type() << "distribution: " + << "The points must be specified in ascending order." + << abort(FatalError); + } + + if (xy_[i][1] < 0) + { + FatalErrorInFunction + << type() << "distribution: " + << "The distribution can't be negative." + << abort(FatalError); + } + + if (i > 0 && cumulative_ && xy_[i][1] < xy_[i-1][1]) + { + FatalErrorInFunction + << type() << "distribution: " + << "Cumulative distribution must be non-decreasing." + << abort(FatalError); + } + } + // Fill out the integral table (x, P(x<=0)) and calculate mean + // For density function: P(x<=0) = int f(x) and mean = int x*f(x) + // For cumulative function: mean = int 1-P(x<=0) = maxValue_ - int P(x<=0) integral_[0] = 0.0; for (label i=1; i, scalar, 2> pair; + //- List of (x, y=f(x)) pairs List xy_; + //- Amount of entries in the xy_ list label nEntries_; - //- Min and max values of the distribution + //- Distribution minimum scalar minValue_; + + //- Distribution maximum scalar maxValue_; + //- Distribution mean scalar meanValue_; + //- Values of cumulative distribution function List integral_; + //- Is the distribution specified as cumulative or as density + Switch cumulative_; + public: diff --git a/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C b/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C index f79856f..bfac21f 100644 --- a/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C +++ b/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,6 +52,7 @@ Foam::distributionModels::massRosinRammler::massRosinRammler n_(readScalar(distributionModelDict_.lookup("n"))) { check(); + info(); } diff --git a/src/lagrangian/distributionModels/multiNormal/multiNormal.C b/src/lagrangian/distributionModels/multiNormal/multiNormal.C index 5f99be8..e098f84 100644 --- a/src/lagrangian/distributionModels/multiNormal/multiNormal.C +++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,6 +78,8 @@ Foam::distributionModels::multiNormal::multiNormal { strength_[i] /= sMax; } + + info(); } diff --git a/src/lagrangian/distributionModels/normal/normal.C b/src/lagrangian/distributionModels/normal/normal.C index 7c9d3d6..037a87c 100644 --- a/src/lagrangian/distributionModels/normal/normal.C +++ b/src/lagrangian/distributionModels/normal/normal.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,21 +53,8 @@ Foam::distributionModels::normal::normal variance_(readScalar(distributionModelDict_.lookup("variance"))), a_(0.147) { - if (minValue_ < 0) - { - FatalErrorInFunction - << "Minimum value must be greater than zero. " - << "Supplied minValue = " << minValue_ - << abort(FatalError); - } - - if (maxValue_ < minValue_) - { - FatalErrorInFunction - << "Maximum value is smaller than the minimum value:" - << " maxValue = " << maxValue_ << ", minValue = " << minValue_ - << abort(FatalError); - } + check(); + info(); } diff --git a/src/lagrangian/distributionModels/uniform/uniform.C b/src/lagrangian/distributionModels/uniform/uniform.C index 56cc2e6..0aa726b 100644 --- a/src/lagrangian/distributionModels/uniform/uniform.C +++ b/src/lagrangian/distributionModels/uniform/uniform.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,6 +50,7 @@ Foam::distributionModels::uniform::uniform maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))) { check(); + info(); }