Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C

@@ -58,7 +58,7 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::Sh
     const scalar Sc
 ) const
 {
-    return 2.0 + 0.6*Foam::sqrt(Re)*pow(Sc, 0.333);
+    return 2.0 + 0.6*Foam::sqrt(Re)*cbrt(Sc);
 }
 
 

src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H

@@ -39,6 +39,7 @@ Description
 
 namespace Foam
 {
+
 /*---------------------------------------------------------------------------*\
                        Class NoHeatTransfer Declaration
 \*---------------------------------------------------------------------------*/

src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H

@@ -39,6 +39,7 @@ Description
 
 namespace Foam
 {
+
 /*---------------------------------------------------------------------------*\
                          Class RanzMarshall Declaration
 \*---------------------------------------------------------------------------*/
@@ -76,9 +77,6 @@ public:
             //- Flag to indicate whether model activates heat transfer model
             virtual bool active() const;
 
-            //- Return the Bird correction flag
-            const Switch& BirdCorrection() const;
-
 
         // Evaluation
 

src/postProcessing/functionObjects/Allwmake

@@ -7,6 +7,5 @@ wmake libso forces
 wmake libso IO
 wmake libso utilities
 wmake libso systemCall
-wmake libso zones
 
 # ----------------------------------------------------------------- end-of-file

src/postProcessing/functionObjects/zones/Make/files

@@ -1,4 +0,0 @@
-faceZoneIntegration/faceZonesIntegration.C
-faceZoneIntegration/faceZonesIntegrationFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libzoneFunctionObjects

src/postProcessing/functionObjects/zones/Make/options

@@ -1,9 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lsampling

src/postProcessing/functionObjects/zones/faceZoneIntegration/IOfaceZonesIntegration.H

@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Typedef
-    Foam::IOfaceZonesIntegration
-
-Description
-    Instance of the generic IOOutputFilter for faceZonesIntegration.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef IOfaceZonesIntegration_H
-#define IOfaceZonesIntegration_H
-
-#include "faceZonesIntegration.H"
-#include "IOOutputFilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef IOOutputFilter<faceZonesIntegration> IOfaceZonesIntegration;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C

@@ -1,330 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "faceZonesIntegration.H"
-#include "volFields.H"
-#include "dictionary.H"
-#include "Time.H"
-#include "IOmanip.H"
-#include "ListListOps.H"
-#include "processorPolyPatch.H"
-#include "cyclicPolyPatch.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(faceZonesIntegration, 0);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::faceZonesIntegration::faceZonesIntegration
-(
-    const word& name,
-    const objectRegistry& obr,
-    const dictionary& dict,
-    const bool loadFromFiles
-)
-:
-    name_(name),
-    obr_(obr),
-    active_(true),
-    log_(false),
-    zoneNames_(),
-    fieldNames_(),
-    filePtr_(NULL)
-{
-    // Check if the available mesh is an fvMesh otherise deactivate
-    if (!isA<fvMesh>(obr_))
-    {
-        active_ = false;
-        WarningIn
-        (
-            "Foam::faceZonesIntegration::faceZonesIntegration"
-            "("
-                "const word&, "
-                "const objectRegistry&, "
-                "const dictionary&, "
-                "const bool"
-            ")"
-        )   << "No fvMesh available, deactivating."
-            << endl;
-    }
-
-    read(dict);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::faceZonesIntegration::~faceZonesIntegration()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::faceZonesIntegration::read(const dictionary& dict)
-{
-    if (active_)
-    {
-        log_ = dict.lookupOrDefault<Switch>("log", false);
-
-        dict.lookup("fields") >> fieldNames_;
-
-        dict.lookup("faceZones") >> zoneNames_;
-    }
-}
-
-
-void Foam::faceZonesIntegration::makeFile()
-{
-    // Create the face Zone file if not already created
-    if (filePtr_.empty())
-    {
-        if (debug)
-        {
-            Info<< "Creating faceZonesIntegration file." << endl;
-        }
-
-        // File update
-        if (Pstream::master())
-        {
-            fileName faceZonesIntegrationDir;
-            if (Pstream::parRun())
-            {
-                // Put in undecomposed case (Note: gives problems for
-                // distributed data running)
-                faceZonesIntegrationDir =
-                    obr_.time().path()/".."/name_/obr_.time().timeName();
-            }
-            else
-            {
-                faceZonesIntegrationDir =
-                    obr_.time().path()/name_/obr_.time().timeName();
-            }
-
-            // Create directory if does not exist.
-            mkDir(faceZonesIntegrationDir);
-
-            // Open new file at start up
-            filePtr_.resize(fieldNames_.size());
-
-            forAll(fieldNames_, fieldI)
-            {
-                const word& fieldName = fieldNames_[fieldI];
-
-                OFstream* sPtr = new OFstream
-                    (
-                        faceZonesIntegrationDir/fieldName
-                    );
-
-                filePtr_.insert(fieldName, sPtr);
-            }
-
-            // Add headers to output data
-            writeFileHeader();
-        }
-    }
-}
-
-
-void Foam::faceZonesIntegration::writeFileHeader()
-{
-    forAllIter(HashPtrTable<OFstream>, filePtr_, iter)
-    {
-        unsigned int w = IOstream::defaultPrecision() + 7;
-
-        OFstream& os = *filePtr_[iter.key()];
-
-        os  << "#Time " << setw(w);
-
-        forAll (zoneNames_, zoneI)
-        {
-            os  << zoneNames_[zoneI] << setw(w);
-        }
-
-        os  << nl << endl;
-    }
-}
-
-
-void Foam::faceZonesIntegration::execute()
-{
-    // Do nothing - only valid on write
-}
-
-
-void Foam::faceZonesIntegration::end()
-{
-    // Do nothing - only valid on write
-}
-
-
-void Foam::faceZonesIntegration::write()
-{
-    if (active_)
-    {
-        makeFile();
-
-        forAll(fieldNames_, fieldI)
-        {
-            const word& fieldName = fieldNames_[fieldI];
-
-            const surfaceScalarField& sField =
-                obr_.lookupObject<surfaceScalarField>(fieldName);
-
-            const fvMesh& mesh = sField.mesh();
-
-            // 1. integrate over all face zones
-
-            scalarField integralVals(zoneNames_.size());
-
-            forAll(integralVals, zoneI)
-            {
-                const word& name = zoneNames_[zoneI];
-
-                label zoneID = mesh.faceZones().findZoneID(name);
-
-                const faceZone& fZone = mesh.faceZones()[zoneID];
-
-                integralVals[zoneI] = returnReduce
-                (
-                    calcIntegral(sField, fZone),
-                    sumOp<scalar>()
-                );
-            }
-
-
-            unsigned int w = IOstream::defaultPrecision() + 7;
-
-            // 2. Write only on master
-
-            if (Pstream::master() && filePtr_.found(fieldName))
-            {
-                OFstream& os = *filePtr_(fieldName);
-
-                os  << obr_.time().value();
-
-                forAll(integralVals, zoneI)
-                {
-                    os  << ' ' << setw(w) << integralVals[zoneI];
-
-                    if (log_)
-                    {
-                        Info<< "faceZonesIntegration output:" << nl
-                            << "    Integration[" << zoneI << "] "
-                            << integralVals[zoneI] << endl;
-                    }
-                }
-
-                os  << endl;
-            }
-        }
-    }
-}
-
-
-Foam::scalar Foam::faceZonesIntegration::calcIntegral
-(
-    const surfaceScalarField& sField,
-    const faceZone& fZone
-) const
-{
-    scalar sum = 0.0;
-    const fvMesh& mesh = sField.mesh();
-
-    forAll (fZone, i)
-    {
-        label faceI = fZone[i];
-
-        if (mesh.isInternalFace(faceI))
-        {
-            if (fZone.flipMap()[i])
-            {
-                sum -= sField[faceI];
-            }
-            else
-            {
-                sum += sField[faceI];
-            }
-        }
-        else
-        {
-            label patchI = mesh.boundaryMesh().whichPatch(faceI);
-            const polyPatch& pp = mesh.boundaryMesh()[patchI];
-            const fvsPatchScalarField& bField = sField.boundaryField()[patchI];
-            if (isA<processorPolyPatch>(pp))
-            {
-                if (refCast<const processorPolyPatch>(pp).owner())
-                {
-                    label patchFaceI = pp.whichFace(faceI);
-                    if (fZone.flipMap()[i])
-                    {
-                        sum -= bField[patchFaceI];
-                    }
-                    else
-                    {
-                        sum += bField[patchFaceI];
-                    }
-                }
-            }
-            else if (isA<cyclicPolyPatch>(pp))
-            {
-                label patchFaceI = faceI - pp.start();
-                if (patchFaceI < pp.size()/2)
-                {
-                    if (fZone.flipMap()[i])
-                    {
-                        sum -= bField[patchFaceI];
-                    }
-                    else
-                    {
-                        sum += bField[patchFaceI];
-                    }
-                }
-            }
-            else if (!isA<emptyPolyPatch>(pp))
-            {
-                label patchFaceI = faceI - pp.start();
-                if (fZone.flipMap()[i])
-                {
-                    sum -= bField[patchFaceI];
-                }
-                else
-                {
-                    sum += bField[patchFaceI];
-                }
-            }
-        }
-    }
-
-    return sum;
-}
-
-
-// ************************************************************************* //

src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H

@@ -1,180 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::faceZonesIntegration
-
-Description
-    Integrates surfaceScalarFields on faceZones
-
-SourceFiles
-    faceZonesIntegration.C
-    IOfaceZonesIntegration.H
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef faceZonesIntegration_H
-#define faceZonesIntegration_H
-
-#include "fvCFD.H"
-#include "primitiveFieldsFwd.H"
-#include "volFieldsFwd.H"
-#include "HashPtrTable.H"
-#include "OFstream.H"
-#include "Switch.H"
-#include "pointFieldFwd.H"
-#include "polyMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-class objectRegistry;
-class dictionary;
-class mapPolyMesh;
-
-/*---------------------------------------------------------------------------*\
-                    Class faceZonesIntegration Declaration
-\*---------------------------------------------------------------------------*/
-
-class faceZonesIntegration
-{
-
-protected:
-
-    // Protected data
-
-        //- Name of this set of face zone integration,
-        //  Also used as the name of the output directory.
-        word name_;
-
-        const objectRegistry& obr_;
-
-
-        // Read from dictionary
-
-            //- On/off switch
-            bool active_;
-
-            //- Switch to send output to Info as well as to file
-            Switch log_;
-
-            //- List of face zone names to integrate over
-            wordList zoneNames_;
-
-            //- Names of the surface fields
-            wordList fieldNames_;
-
-
-        //- Current open files
-        HashPtrTable<OFstream> filePtr_;
-
-
-
-    // Protected Member Functions
-
-        //- If the integration file has not been created create it
-        void makeFile();
-
-        scalar calcIntegral
-        (
-            const surfaceScalarField& sField,
-            const faceZone& fZone
-        ) const;
-
-
-        //- Disallow default bitwise copy construct
-        faceZonesIntegration(const faceZonesIntegration&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const faceZonesIntegration&);
-
-        //- Output file header information
-        virtual void writeFileHeader();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("faceZonesIntegration");
-
-
-    // Constructors
-
-        //- Construct for given objectRegistry and dictionary.
-        //  Allow the possibility to load fields from files
-        faceZonesIntegration
-        (
-            const word& name,
-            const objectRegistry&,
-            const dictionary&,
-            const bool loadFromFiles = false
-        );
-
-
-    //- Destructor
-    virtual ~faceZonesIntegration();
-
-
-    // Member Functions
-
-        //- Return name of the set of zones
-        virtual const word& name() const
-        {
-            return name_;
-        };
-
-        //- Read the zone integration data
-        virtual void read(const dictionary&);
-
-        //- Execute, currently does nothing
-        virtual void execute();
-
-        //- Execute at the final time-loop, currently does nothing
-        virtual void end();
-
-        //- Write the integration
-        virtual void write();
-
-        //- Update for changes of mesh
-        virtual void updateMesh(const mapPolyMesh&)
-        {}
-
-        //- Update for changes of mesh
-        virtual void movePoints(const pointField&)
-        {}
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.C

@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "faceZonesIntegrationFunctionObject.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineNamedTemplateTypeNameAndDebug(faceZonesIntegrationFunctionObject, 0);
-
-    addToRunTimeSelectionTable
-    (
-        functionObject,
-        faceZonesIntegrationFunctionObject,
-        dictionary
-    );
-}
-
-// ************************************************************************* //

src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.H

@@ -1,55 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Typedef
-    Foam::faceZonesIntegrationFunctionObject
-
-Description
-    FunctionObject wrapper around faceZonesIntegration to allow them to be
-    created via the functions list within controlDict.
-
-SourceFiles
-    faceZonesIntegrationFunctionObject.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef faceZonesIntegrationFunctionObject_H
-#define faceZonesIntegrationFunctionObject_H
-
-#include "faceZonesIntegration.H"
-#include "OutputFilterFunctionObject.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef OutputFilterFunctionObject<faceZonesIntegration>
-        faceZonesIntegrationFunctionObject;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C

@@ -54,7 +54,8 @@ Foam::RosinRammler::RosinRammler(const dictionary& dict, Random& rndGen)
         FatalErrorIn
         (
             "RosinRammler::RosinRammler(const dictionary& dict)"
-        ) << " minValue = " << minValue_ << ", it must be >0." << abort(FatalError);
+        )   << " minValue = " << minValue_ << ", it must be >0." << nl
+            << abort(FatalError);
     }
 
     if (maxValue_<minValue_)
@@ -62,7 +63,8 @@ Foam::RosinRammler::RosinRammler(const dictionary& dict, Random& rndGen)
         FatalErrorIn
         (
             "RosinRammler::RosinRammler(const dictionary& dict)"
-        ) << " maxValue is smaller than minValue." << abort(FatalError);
+        )   << " maxValue is smaller than minValue." << nl
+            << abort(FatalError);
     }
 
     // find max value so that it can be normalized to 1.0
@@ -103,26 +105,20 @@ Foam::scalar Foam::RosinRammler::sample() const
 {
     scalar y = 0;
     scalar x = 0;
-    label n = d_.size();
+    scalar p = 0.0;
-    bool success = false;
 
-    while (!success)
+    do
     {
         x = minValue_ + range_*rndGen_.scalar01();
         y = rndGen_.scalar01();
-        scalar p = 0.0;
+        p = 0.0;
 
-        for (label i=0; i<n; i++)
+        forAll(d_, i)
         {
             scalar xx = pow(x/d_[i], n_[i]);
             p += ls_[i]*xx*exp(-xx);
         }
-
+    } while(y>p);
-        if (y<p)
-        {
-            success = true;
-        }
-    }
 
     return x;
 }

src/thermophysicalModels/pdfs/exponential/exponential.C

@@ -53,7 +53,8 @@ Foam::exponential::exponential(const dictionary& dict, Random& rndGen)
         FatalErrorIn
         (
             "exponential::exponential(const dictionary& dict)"
-        ) << " minValue = " << minValue_ << ", it must be >0." << abort(FatalError);
+        )   << " minValue = " << minValue_ << ", it must be >0." << nl
+            << abort(FatalError);
     }
 
     scalar sMax = 0;
@@ -90,27 +91,21 @@ Foam::exponential::~exponential()
 
 Foam::scalar Foam::exponential::sample() const
 {
-    scalar y = 0;
+    scalar y = 0.0;
-    scalar x = 0;
+    scalar x = 0.0;
-    label n = lambda_.size();
+    scalar p = 0.0;
-    bool success = false;
 
-    while (!success)
+    do
     {
         x = minValue_ + range_*rndGen_.scalar01();
         y = rndGen_.scalar01();
-        scalar p = 0.0;
+        p = 0.0;
 
-        for(label i=0; i<n; i++)
+        forAll(lambda_, i)
         {
             p += ls_[i]*exp(-lambda_[i]*x);
         }
-
+    } while(p>y);
-        if (y<p)
-        {
-            success = true;
-        }
-    }
 
     return x;
 }

src/thermophysicalModels/pdfs/general/general.C

@@ -72,12 +72,11 @@ Foam::general::~general()
 
 Foam::scalar Foam::general::sample() const
 {
-    scalar y = 0;
+    scalar x = 0.0;
-    scalar x = 0;
+    scalar y = 0.0;
+    scalar p = 0.0;
 
-    bool success = false;
+    do
-
-    while (!success)
     {
         x = minValue_ + range_*rndGen_.scalar01();
         y = rndGen_.scalar01();
@@ -93,17 +92,11 @@ Foam::scalar Foam::general::sample() const
             }
         }
 
-        scalar p =
+        p = xy_[i][1]
-            xy_[i][1]
           + (x - xy_[i][0])
            *(xy_[i+1][1] - xy_[i][1])
            /(xy_[i+1][0] - xy_[i][0]);
-
+    } while(p>y);
-        if (y<p)
-        {
-            success = true;
-        }
-    }
 
     return x;
 }

src/thermophysicalModels/pdfs/normal/normal.C

@@ -84,18 +84,18 @@ Foam::normal::~normal()
 
 Foam::scalar Foam::normal::sample() const
 {
-    scalar y = 0;
+    scalar x = 0.0;
-    scalar x = 0;
+    scalar y = 0.0;
-    label n = expectation_.size();
+    scalar p = 0.0;
     bool success = false;
 
-    while (!success)
+    do
     {
         x = minValue_ + range_*rndGen_.scalar01();
         y = rndGen_.scalar01();
-        scalar p = 0.0;
+        p = 0.0;
 
-        for (label i=0; i<n; i++)
+        forAll(expectation_, i)
         {
             scalar nu = expectation_[i];
             scalar sigma = variance_[i];
@@ -103,12 +103,7 @@ Foam::scalar Foam::normal::sample() const
             scalar v = (x - nu)/sigma;
             p += s*exp(-0.5*v*v);
         }
-
+    } while (p>y);
-        if (y<p)
-        {
-            success = true;
-        }
-    }
 
     return x;
 }