Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

applications/solvers/lagrangian/DPMFoam/DPMFoam.C

@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
             zeroGradientFvPatchVectorField::typeName
         );
 
-        cloudVolSUSu.internalField() = - cloudSU.source()/mesh.V();
+        cloudVolSUSu.internalField() = -cloudSU.source()/mesh.V();
         cloudVolSUSu.correctBoundaryConditions();
         cloudSU.source() = vector::zero;
 

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files

@@ -12,4 +12,8 @@ heatTransferModels/heatTransferModel/heatTransferModel.C
 heatTransferModels/heatTransferModel/newHeatTransferModel.C
 heatTransferModels/RanzMarshall/RanzMarshall.C
 
+liftModels/liftModel/liftModel.C
+liftModels/liftModel/newLiftModel.C
+liftModels/constantCoefficient/constantCoefficient.C
+
 LIB = $(FOAM_LIBBIN)/libcompressibleEulerianInterfacialModels

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantCoefficient/constantCoefficient.C

@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "constantCoefficient.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvc.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace liftModels
+{
+    defineTypeNameAndDebug(constantCoefficient, 0);
+
+    addToRunTimeSelectionTable
+    (
+        liftModel,
+        constantCoefficient,
+        dictionary
+    );
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::liftModels::constantCoefficient::constantCoefficient
+(
+    const dictionary& dict,
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
+)
+:
+    liftModel(dict, alpha1, phase1, phase2),
+    Cl_("Cl", dimless, dict.lookup("Cl"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::liftModels::constantCoefficient::~constantCoefficient()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volVectorField> Foam::liftModels::constantCoefficient::F
+(
+    const volVectorField& U
+) const
+{
+    return
+        Cl_
+       *(phase1_*phase1_.rho() + phase2_*phase2_.rho())
+       *(
+            (phase1_.U() - phase2_.U())
+          ^ fvc::curl(U)
+        );
+}
+
+
+// ************************************************************************* //

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantCoefficient/constantCoefficient.H

@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::liftModels::constantCoefficient
+
+Description
+
+SourceFiles
+    constantCoefficient.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef constantCoefficient_H
+#define constantCoefficient_H
+
+#include "liftModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace liftModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class constantCoefficient Declaration
+\*---------------------------------------------------------------------------*/
+
+class constantCoefficient
+:
+    public liftModel
+{
+    // Private data
+
+        //- Constant lift coefficient
+        dimensionedScalar Cl_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("constantCoefficient");
+
+
+    // Constructors
+
+        //- Construct from components
+        constantCoefficient
+        (
+            const dictionary& dict,
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
+        );
+
+
+    //- Destructor
+    virtual ~constantCoefficient();
+
+
+    // Member Functions
+
+        //- Lift force
+        tmp<volVectorField> F(const volVectorField& U) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace liftModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C

@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "liftModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(liftModel, 0);
+    defineRunTimeSelectionTable(liftModel, dictionary);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::liftModel::liftModel
+(
+    const dictionary& dict,
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
+)
+:
+    dict_(dict),
+    alpha1_(alpha1),
+    phase1_(phase1),
+    phase2_(phase2)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::liftModel::~liftModel()
+{}
+
+
+// ************************************************************************* //

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H

@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::liftModel
+
+Description
+
+SourceFiles
+    liftModel.C
+    newLiftModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef liftModel_H
+#define liftModel_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "dictionary.H"
+#include "phaseModel.H"
+#include "runTimeSelectionTables.H"
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class liftModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class liftModel
+{
+protected:
+
+    // Protected data
+
+        const dictionary& dict_;
+        const volScalarField& alpha1_;
+        const phaseModel& phase1_;
+        const phaseModel& phase2_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("liftModel");
+
+
+    // Declare runtime construction
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            liftModel,
+            dictionary,
+            (
+                const dictionary& dict,
+                const volScalarField& alpha1,
+                const phaseModel& phase1,
+                const phaseModel& phase2
+            ),
+            (dict, alpha1, phase1, phase2)
+        );
+
+
+    // Constructors
+
+        liftModel
+        (
+            const dictionary& dict,
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
+        );
+
+
+    //- Destructor
+    virtual ~liftModel();
+
+
+    // Selectors
+
+        static autoPtr<liftModel> New
+        (
+            const dictionary& dict,
+            const volScalarField& alpha1,
+            const phaseModel& phase1,
+            const phaseModel& phase2
+        );
+
+
+    // Member Functions
+
+        //- Lift force
+        virtual tmp<volVectorField> F(const volVectorField& U) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C

@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 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 <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "liftModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
+(
+    const dictionary& dict,
+    const volScalarField& alpha1,
+    const phaseModel& phase1,
+    const phaseModel& phase2
+)
+{
+    word liftModelType
+    (
+        dict.subDict(phase1.name()).lookup("type")
+    );
+
+    Info << "Selecting liftModel for phase "
+        << phase1.name()
+        << ": "
+        << liftModelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(liftModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn("liftModel::New")
+            << "Unknown liftModelType type "
+            << liftModelType << endl << endl
+            << "Valid liftModel types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return
+        cstrIter()
+        (
+            dict.subDict(phase1.name()).subDict(liftModelType + "Coeffs"),
+            alpha1,
+            phase1,
+            phase2
+        );
+}
+
+
+// ************************************************************************* //

applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C

@@ -55,8 +55,6 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
 
     phase_(phase),
 
-    draga_(phase.fluid().drag1()),
-
     viscosityModel_
     (
         kineticTheoryModels::viscosityModel::New
@@ -401,7 +399,11 @@ void Foam::RASModels::kineticTheoryModel::correct()
             (
                 alpha*(1.0 - alpha),
                 phase_.fluid().residualPhaseFraction()
-            )*draga_.K(magUr + phase_.fluid().residualSlip())/rho
+            )
+           *phase_.fluid().drag(phase_).K
+            (
+                magUr + phase_.fluid().residualSlip()
+            )/rho
         );
 
         // Eq. 3.25, p. 50 Js = J1 - J2

applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H

@@ -82,8 +82,8 @@ class kineticTheoryModel
             const phaseModel& phase_;
 
 
-        //- Drag model
+        ////- Drag model
-        const dragModel& draga_;
+        //const dragModel& draga_;
 
         // Sub-models
 

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,13 +111,6 @@ Foam::twoPhaseSystem::twoPhaseSystem
         lookup("Cvm")
     ),
 
-    Cl_
-    (
-        "Cl",
-        dimless,
-        lookup("Cl")
-    ),
-
     drag1_
     (
         dragModel::New
@@ -162,6 +155,28 @@ Foam::twoPhaseSystem::twoPhaseSystem
         )
     ),
 
+    lift1_
+    (
+        liftModel::New
+        (
+            subDict("lift"),
+            phase1_,
+            phase1_,
+            phase2_
+        )
+    ),
+
+    lift2_
+    (
+        liftModel::New
+        (
+            subDict("lift"),
+            phase2_,
+            phase2_,
+            phase1_
+        )
+    ),
+
     dispersedPhase_(lookup("dispersedPhase")),
 
     residualPhaseFraction_
@@ -311,11 +326,28 @@ Foam::tmp<Foam::volVectorField> Foam::twoPhaseSystem::liftForce
     );
     volVectorField& liftForce = tliftForce();
 
-    volVectorField Ur(phase1_.U() - phase2_.U());
+    if (dispersedPhase_ == phase1_.name())
-
+    {
+        liftForce = lift1().F(U);
+    }
+    else if (dispersedPhase_ == phase2_.name())
+    {
+        liftForce = lift2().F(U);
+    }
+    else if (dispersedPhase_ == "both")
+    {
         liftForce =
-        Cl_*(phase1_*phase1_.rho() + phase2_*phase2_.rho())
+        (
-       *(Ur ^ fvc::curl(U));
+            phase2_*lift1().F(U)
+          + phase1_*lift2().F(U)
+        );
+    }
+    else
+    {
+        FatalErrorIn("twoPhaseSystem::liftForce()")
+            << "dispersedPhase: " << dispersedPhase_ << " is incorrect"
+            << exit(FatalError);
+    }
 
     // Remove lift at fixed-flux boundaries
     forAll(phase1_.phi().boundaryField(), patchi)
@@ -631,7 +663,6 @@ bool Foam::twoPhaseSystem::read()
 
         lookup("sigma") >> sigma_;
         lookup("Cvm") >> Cvm_;
-        lookup("Cl") >> Cl_;
 
         // drag1_->read(*this);
         // drag2_->read(*this);

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,6 +45,7 @@ SourceFiles
 #include "IOdictionary.H"
 #include "phaseModel.H"
 #include "dragModel.H"
+#include "liftModel.H"
 #include "heatTransferModel.H"
 #include "volFields.H"
 #include "surfaceFields.H"
@@ -57,7 +58,7 @@ namespace Foam
 // Forward declarations
 class dragModel;
 class heatTransferModel;
-
+class liftModel;
 
 /*---------------------------------------------------------------------------*\
                       Class twoPhaseSystem Declaration
@@ -69,31 +70,57 @@ class twoPhaseSystem
 {
     // Private data
 
+        //- Reference to the mesh
         const fvMesh& mesh_;
 
+        //- Phase model 1
         phaseModel phase1_;
+
+        //- Phase model 2
         phaseModel phase2_;
 
+        //- Total volumetric flux
         surfaceScalarField phi_;
 
+        //-  Dilatation term
         volScalarField dgdt_;
 
+        //- Surface tension coefficient
         dimensionedScalar sigma_;
 
+        //- Virtual mass coefficient
         dimensionedScalar Cvm_;
-        dimensionedScalar Cl_;
 
+        //- Drag model for phase 1
         autoPtr<dragModel> drag1_;
+
+        //- Drag model for phase 2
         autoPtr<dragModel> drag2_;
 
+        //- Heat transfer model for phase 1 
         autoPtr<heatTransferModel> heatTransfer1_;
+
+        //- Heat transfer model for phase 2
         autoPtr<heatTransferModel> heatTransfer2_;
 
+        //- Lift model for phase 1
+        autoPtr<liftModel> lift1_;
+
+        //- Lift model for phase 2
+        autoPtr<liftModel> lift2_;
+
+        //- Name of the dispersed phase, or "both"
         word dispersedPhase_;
+
+        //- Residual phase fraction
         scalar residualPhaseFraction_;
+
+        //- Redisual slip
         dimensionedScalar residualSlip_;
 
 
+    // Private member functions
+
         //- Return the mixture flux
         tmp<surfaceScalarField> calcPhi() const;
 
@@ -113,136 +140,21 @@ public:
 
     // Member Functions
 
-        const fvMesh& mesh() const
+        //- Return the drag coefficient
-        {
-            return mesh_;
-        }
-
-        const phaseModel& phase1() const
-        {
-            return phase1_;
-        }
-
-        const phaseModel& phase2() const
-        {
-            return phase2_;
-        }
-
-        const phaseModel& otherPhase(const phaseModel& phase) const
-        {
-            if (&phase == &phase1_)
-            {
-                return phase2_;
-            }
-            else
-            {
-                return phase1_;
-            }
-        }
-
-        phaseModel& phase1()
-        {
-            return phase1_;
-        }
-
-        phaseModel& phase2()
-        {
-            return phase2_;
-        }
-
-        //- Return the mixture flux
-        const surfaceScalarField& phi() const
-        {
-            return phi_;
-        }
-
-        //- Return the mixture flux
-        surfaceScalarField& phi()
-        {
-            return phi_;
-        }
-
-        const volScalarField& dgdt() const
-        {
-            return dgdt_;
-        }
-
-        volScalarField& dgdt()
-        {
-            return dgdt_;
-        }
-
-        const dragModel& drag1() const
-        {
-            return drag1_();
-        }
-
-        const dragModel& drag2() const
-        {
-            return drag2_();
-        }
-
-        const dragModel& drag(const phaseModel& phase) const
-        {
-            if (&phase == &phase1_)
-            {
-                return drag1_();
-            }
-            else
-            {
-                return drag2_();
-            }
-        }
-
-        scalar residualPhaseFraction() const
-        {
-            return residualPhaseFraction_;
-        }
-
-        const dimensionedScalar& residualSlip() const
-        {
-            return residualSlip_;
-        }
-
         tmp<volScalarField> dragCoeff() const;
-        tmp<volVectorField> liftForce(const volVectorField& U) const;
-
-        const heatTransferModel& heatTransfer1() const
-        {
-            return heatTransfer1_();
-        }
-
-        const heatTransferModel& heatTransfer2() const
-        {
-            return heatTransfer2_();
-        }
 
+        //- Return the heat transfer coefficient
         tmp<volScalarField> heatTransferCoeff() const;
 
+        //- Return the lift force
+        tmp<volVectorField> liftForce(const volVectorField& U) const;
+
         //- Return the mixture density
         tmp<volScalarField> rho() const;
 
         //- Return the mixture velocity
         tmp<volVectorField> U() const;
 
-        //- Return the surface tension coefficient
-        dimensionedScalar sigma() const
-        {
-            return sigma_;
-        }
-
-        //- Return the virtual-mass coefficient
-        dimensionedScalar Cvm() const
-        {
-            return Cvm_;
-        }
-
-        //- Return the lift coefficient
-        dimensionedScalar Cl() const
-        {
-            return Cl_;
-        }
-
         //- Solve for the two-phase-fractions
         void solve();
 
@@ -254,6 +166,148 @@ public:
 
         //- Read base phaseProperties dictionary
         bool read();
+
+        // Access
+
+            //- Return the mesh
+            const fvMesh& mesh() const
+            {
+                return mesh_;
+            }
+
+            //- Return phase model 1
+            const phaseModel& phase1() const
+            {
+                return phase1_;
+            }
+
+            //- Return non-const access to phase model 1
+            phaseModel& phase1()
+            {
+                return phase1_;
+            }
+
+            //- Return phase model 2
+            const phaseModel& phase2() const
+            {
+                return phase2_;
+            }
+
+            //- Return non-const access to phase model 2
+            phaseModel& phase2()
+            {
+                return phase2_;
+            }
+
+            //- Return the phase not given as an argument
+            const phaseModel& otherPhase(const phaseModel& phase) const
+            {
+                if (&phase == &phase1_)
+                {
+                    return phase2_;
+                }
+                else
+                {
+                    return phase1_;
+                }
+            }
+
+            //- Return the mixture flux
+            const surfaceScalarField& phi() const
+            {
+                return phi_;
+            }
+
+            //- Return non-const access to the the mixture flux
+            surfaceScalarField& phi()
+            {
+                return phi_;
+            }
+
+            //- Return the dilatation term
+            const volScalarField& dgdt() const
+            {
+                return dgdt_;
+            }
+
+            //- Return non-const access to the
+            volScalarField& dgdt()
+            {
+                return dgdt_;
+            }
+
+            //- Return the drag model for phase 1
+            const dragModel& drag1() const
+            {
+                return drag1_();
+            }
+
+            //- Return the drag model for phase 2
+            const dragModel& drag2() const
+            {
+                return drag2_();
+            }
+
+            //- Return the drag model for the supplied phase
+            const dragModel& drag(const phaseModel& phase) const
+            {
+                if (&phase == &phase1_)
+                {
+                    return drag1_();
+                }
+                else
+                {
+                    return drag2_();
+                }
+            }
+
+            //- Return non-const access to the residual phase fraction
+            scalar residualPhaseFraction() const
+            {
+                return residualPhaseFraction_;
+            }
+
+            //- Return the residual slip
+            const dimensionedScalar& residualSlip() const
+            {
+                return residualSlip_;
+            }
+
+            //- Return the heat transfer model for phase 1
+            const heatTransferModel& heatTransfer1() const
+            {
+                return heatTransfer1_();
+            }
+
+            //- Return the heat transfer model for phase 2
+            const heatTransferModel& heatTransfer2() const
+            {
+                return heatTransfer2_();
+            }
+
+            //- Return the lift model for phase 1
+            const liftModel& lift1() const
+            {
+                return lift1_();
+            }
+
+            //- Return the lift model for phase 2
+            const liftModel& lift2() const
+            {
+                return lift2_();
+            }
+
+            //- Return the surface tension coefficient
+            dimensionedScalar sigma() const
+            {
+                return sigma_;
+            }
+
+            //- Return the virtual-mass coefficient
+            dimensionedScalar Cvm() const
+            {
+                return Cvm_;
+            }
 };
 
 

applications/test/hexRef8/Test-hexRef8.C

@@ -34,11 +34,14 @@ Description
 #include "Time.H"
 #include "volFields.H"
 #include "surfaceFields.H"
+#include "pointFields.H"
 #include "hexRef8.H"
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
 #include "Random.H"
 #include "zeroGradientFvPatchFields.H"
+#include "calculatedPointPatchFields.H"
+#include "pointConstraints.H"
 #include "fvcDiv.H"
 
 using namespace Foam;
@@ -61,6 +64,8 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
 
 
+    const pointConstraints& pc = pointConstraints::New(pointMesh::New(mesh));
+
     const Switch inflate(args.args()[1]);
 
     if (inflate)
@@ -144,6 +149,29 @@ int main(int argc, char *argv[])
     surfaceOne.write();
 
 
+    // Uniform point field
+    pointScalarField pointX
+    (
+        IOobject
+        (
+            "pointX",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        pointMesh::New(mesh),
+        dimensionedScalar("one", dimless, 1.0),
+        calculatedPointPatchScalarField::typeName
+    );
+    pointX.internalField() = mesh.points().component(0);
+    pointX.correctBoundaryConditions();
+    Info<< "Writing x-component field "
+        << pointX.name() << " in " << runTime.timeName() << endl;
+    pointX.write();
+
+
+
     // Force allocation of V. Important for any mesh changes since otherwise
     // old time volumes are not stored
     const scalar totalVol = gSum(mesh.V());
@@ -163,11 +191,24 @@ int main(int argc, char *argv[])
         }
 
 
+        mesh.moving(false);
+        mesh.topoChanging(false);
 
+
+        label action = rndGen.integer(0, 5);
+
+
+        if (action == 0)
+        {
+            Info<< nl << "-- moving only" << endl;
+            mesh.movePoints(pointField(mesh.points()));
+        }
+        else if (action == 1 || action == 2)
+        {
             // Mesh changing engine.
             polyTopoChange meshMod(mesh);
 
-        if (rndGen.bit())
+            if (action == 1)
             {
                 // Refine
                 label nRefine = mesh.nCells()/20;
@@ -204,10 +245,8 @@ int main(int argc, char *argv[])
 
                 for (label i=0; i<nUnrefine; i++)
                 {
-                candidates.insert
+                    label index = rndGen.integer(0, allSplitPoints.size()-1);
-                (
+                    candidates.insert(allSplitPoints[index]);
-                    allSplitPoints[rndGen.integer(0, allSplitPoints.size()-1)]
-                );
                 }
 
                 labelList splitPoints = meshCutter.consistentUnrefinement
@@ -246,6 +285,13 @@ int main(int argc, char *argv[])
             // Update numbering of cells/vertices.
             Info<< nl << "-- mapping hexRef8 data" << endl;
             meshCutter.updateMesh(map);
+        }
+
+
+        Info<< nl<< "-- Mesh : moving:" << mesh.moving()
+            << " topoChanging:" << mesh.topoChanging()
+            << " changing:" << mesh.changing()
+            << endl;
 
 
 
@@ -362,6 +408,9 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
+    Info<< "pc:" << pc.patchPatchPointConstraintPoints().size() << endl;
+
+
     Info<< "End\n" << endl;
 
     return 0;

applications/test/hexRef8/block/system/controlDict

@@ -20,6 +20,9 @@ DebugSwitches
     primitiveMesh       1;
     polyMesh            1;
     fvMesh              1;
+    polyTopoChange      1;
+    pointMesh           1;
+    pointConstraints    1;
 }
 
 application     icoFoam;

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict

@@ -488,7 +488,7 @@ meshQualityControls
 //(
 //    mesh            // write intermediate meshes
 //    intersections   // write current mesh intersections as .obj files
-//    featureSeeds,   // write information about explicit feature edge refinement
+//    featureSeeds    // write information about explicit feature edge refinement
 //    layerInfo       // write information about layers
 //);
 //

applications/utilities/postProcessing/sampling/sample/sample.C

@@ -132,6 +132,11 @@ int main(int argc, char *argv[])
             )
         );
 
+        // Note: both IOsampledSets and IOsampledSurfaces read the
+        //       same dictionary. Unregister one to make sure no duplicates
+        //       trying to register
+        sSetsPtr().checkOut();
+
         sSurfsPtr.reset
         (
             new IOsampledSurfaces
@@ -160,6 +165,8 @@ int main(int argc, char *argv[])
             )
         );
 
+        sSetsPtr().checkOut();
+
         sSurfsPtr.reset
         (
             new IOsampledSurfaces

applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C

@@ -209,6 +209,7 @@ int main(int argc, char *argv[])
         }
 
         // Mu
+        if (mu != 0)
         {
             pointField newLocalPoints
             (

src/OpenFOAM/db/error/messageStream.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,6 +57,26 @@ Foam::messageStream::messageStream(const dictionary& dict)
 {}
 
 
+Foam::OSstream& Foam::messageStream::masterStream(const label communicator)
+{
+    if (UPstream::warnComm != -1 && communicator != UPstream::warnComm)
+    {
+        Pout<< "** messageStream with comm:" << communicator
+            << endl;
+        error::printStack(Pout);
+    }
+
+    if (communicator == UPstream::worldComm)
+    {
+        return operator()();
+    }
+    else
+    {
+        return operator()(UPstream::master(communicator));
+    }
+}
+
+
 Foam::OSstream& Foam::messageStream::operator()
 (
     const char* functionName,
@@ -166,29 +186,14 @@ Foam::OSstream& Foam::messageStream::operator()
 }
 
 
-Foam::OSstream& Foam::messageStream::operator()(const label communicator)
+Foam::OSstream& Foam::messageStream::operator()(const bool output)
 {
-    if (UPstream::warnComm != -1 && communicator != UPstream::warnComm)
+    if (output && level)
-    {
-        Pout<< "** messageStream with comm:" << communicator
-            << endl;
-        error::printStack(Pout);
-    }
-
-    if (communicator == UPstream::worldComm)
-    {
-        return operator()();
-    }
-    else
-    {
-        bool master = UPstream::master(communicator);
-
-        if (level)
     {
         bool collect = (severity_ == INFO || severity_ == WARNING);
 
         // Report the error
-            if (!master && collect)
+        if (collect)
         {
             return Snull;
         }
@@ -214,7 +219,6 @@ Foam::OSstream& Foam::messageStream::operator()(const label communicator)
             return Pout;
         }
     }
-    }
 
     return Snull;
 }

src/OpenFOAM/db/error/messageStream.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -134,6 +134,11 @@ public:
             return maxErrors_;
         }
 
+        //- Convert to OSstream
+        //  Prints to Pout for the master stream
+        OSstream& masterStream(const label communicator);
+
+
         //- Convert to OSstream
         //  Prints basic message and returns OSstream for further info.
         OSstream& operator()
@@ -185,9 +190,8 @@ public:
         );
 
         //- Convert to OSstream
-        //  Use Info for default communicator, use Pout
+        //  Use Info for default communicator, control output using bool flag
-        //  on master for non-default one.
+        OSstream& operator()(const bool output);
-        OSstream& operator()(const label communicator);
 
         //- Convert to OSstream for << operations
         operator OSstream&();

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ Foam::solverPerformance Foam::GAMGSolver::solve
 
             if (debug >= 2)
             {
-                solverPerf.print(Info(matrix().mesh().comm()));
+                solverPerf.print(Info.masterStream(matrix().mesh().comm()));
             }
         } while
         (
@@ -631,7 +631,7 @@ void Foam::GAMGSolver::solveCoarsestLevel
     //
     //    if (debug >= 2)
     //    {
-    //        coarseSolverPerf.print(Info(coarseComm));
+    //        coarseSolverPerf.print(Info.masterStream(coarseComm));
     //    }
     //
     //    Pout<< "procAgglom: coarsestSource   :" << coarsestSource << endl;
@@ -679,7 +679,7 @@ void Foam::GAMGSolver::solveCoarsestLevel
 
         if (debug >= 2)
         {
-            coarseSolverPerf.print(Info(coarseComm));
+            coarseSolverPerf.print(Info.masterStream(coarseComm));
         }
     }
 

src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ Foam::solverPerformance Foam::smoothSolver::solve
 
         if (lduMatrix::debug >= 2)
         {
-            Info(matrix().mesh().comm())
+            Info.masterStream(matrix().mesh().comm())
                 << "   Normalisation factor = " << normFactor << endl;
         }
 

src/OpenFOAM/meshes/polyMesh/polyMesh.C

@@ -34,7 +34,7 @@ License
 #include "indexedOctree.H"
 #include "treeDataCell.H"
 #include "MeshObject.H"
-
+#include "pointMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1160,6 +1160,7 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
     solutionD_ = Vector<label>::zero;
 
     meshObject::movePoints<polyMesh>(*this);
+    meshObject::movePoints<pointMesh>(*this);
 
     const_cast<Time&>(time()).functionObjects().movePoints(*this);
 

src/OpenFOAM/meshes/polyMesh/polyMeshClear.C

@@ -29,6 +29,7 @@ License
 #include "MeshObject.H"
 #include "indexedOctree.H"
 #include "treeDataCell.H"
+#include "pointMesh.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -61,6 +62,7 @@ void Foam::polyMesh::clearGeom()
     }
 
     // Clear all geometric mesh objects
+    meshObject::clear<pointMesh, GeometricMeshObject>(*this);
     meshObject::clear<polyMesh, GeometricMeshObject>(*this);
 
     primitiveMesh::clearGeom();
@@ -108,6 +110,15 @@ void Foam::polyMesh::clearAddressing(const bool isMeshUpdate)
         // Part of a mesh update. Keep meshObjects that have an updateMesh
         // callback
         meshObject::clearUpto
+        <
+            pointMesh,
+            TopologicalMeshObject,
+            UpdateableMeshObject
+        >
+        (
+            *this
+        );
+        meshObject::clearUpto
         <
             polyMesh,
             TopologicalMeshObject,
@@ -119,6 +130,7 @@ void Foam::polyMesh::clearAddressing(const bool isMeshUpdate)
     }
     else
     {
+        meshObject::clear<pointMesh, TopologicalMeshObject>(*this);
         meshObject::clear<polyMesh, TopologicalMeshObject>(*this);
     }
 

src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C

@@ -92,6 +92,7 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
     }
 
     meshObject::updateMesh<polyMesh>(*this, mpm);
+    meshObject::updateMesh<pointMesh>(*this, mpm);
 
     // Reset valid directions (could change by faces put into empty patches)
     geometricD_ = Vector<label>::zero;

src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetryPlane/symmetryPlanePolyPatch.C

@@ -25,6 +25,7 @@ License
 
 #include "symmetryPlanePolyPatch.H"
 #include "addToRunTimeSelectionTable.H"
+#include "symmetryPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -131,7 +132,11 @@ const Foam::vector& Foam::symmetryPlanePolyPatch::n() const
                 if (magSqr(n_ - nf[facei]) > SMALL)
                 {
                     FatalErrorIn("symmetryPlanePolyPatch::n()")
-                        << "Symmetry plane '" << name() << "' is not planar"
+                        << "Symmetry plane '" << name() << "' is not planar."
+                        << endl
+                        << " Either split the patch into planar parts"
+                        << " or use the " << symmetryPolyPatch::typeName
+                        << " patch type"
                         << exit(FatalError);
                 }
             }

src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,6 +62,7 @@ void Foam::polyPatch::movePoints(PstreamBuffers&, const pointField& p)
 void Foam::polyPatch::updateMesh(PstreamBuffers&)
 {
     clearAddressing();
+    primitivePatch::clearOut();
 }
 
 

src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "fvSchemes.H"
 #include "Time.H"
+#include "steadyStateDdtScheme.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -108,6 +109,11 @@ void Foam::fvSchemes::read(const dictionary& dict)
     )
     {
         defaultDdtScheme_ = ddtSchemes_.lookup("default");
+        steady_ =
+        (
+            word(defaultDdtScheme_)
+         == fv::steadyStateDdtScheme<scalar>::typeName
+        );
     }
 
 
@@ -364,7 +370,8 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
             tokenList()
         )()
     ),
-    defaultFluxRequired_(false)
+    defaultFluxRequired_(false),
+    steady_(false)
 {
     // persistent settings across reads is incorrect
     clear();

src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,6 +78,10 @@ class fvSchemes
         dictionary fluxRequired_;
         bool defaultFluxRequired_;
 
+        //- Steady-state run indicator
+        //  Set true if the default ddtScheme is steadyState
+        bool steady_;
+
 
     // Private Member Functions
 
@@ -128,6 +132,18 @@ public:
 
             bool fluxRequired(const word& name) const;
 
+            //- Return true if the default ddtScheme is steadyState
+            bool steady() const
+            {
+                return steady_;
+            }
+
+            //- Return true if the default ddtScheme is not steadyState
+            bool transient() const
+            {
+                return !steady_;
+            }
+
 
         // Read
 

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2348,6 +2348,8 @@ Foam::operator&
     GeometricField<Type, fvPatchField, volMesh>& Mphi = tMphi();
 
     // Loop over field components
+    if (M.hasDiag())
+    {
         for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
         {
             scalarField psiCmpt(psi.field().component(cmpt));
@@ -2355,6 +2357,11 @@ Foam::operator&
             M.addBoundaryDiag(boundaryDiagCmpt, cmpt);
             Mphi.internalField().replace(cmpt, -boundaryDiagCmpt*psiCmpt);
         }
+    }
+    else
+    {
+        Mphi.internalField() = pTraits<Type>::zero;
+    }
 
     Mphi.internalField() += M.lduMatrix::H(psi.field()) + M.source();
     M.addBoundarySource(Mphi.internalField());

src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solve
 {
     if (debug)
     {
-        Info(this->mesh().comm())
+        Info.masterStream(this->mesh().comm())
             << "fvMatrix<Type>::solve(const dictionary& solverControls) : "
                "solving fvMatrix<Type>"
             << endl;
@@ -108,7 +108,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveSegregated
 {
     if (debug)
     {
-        Info(this->mesh().comm())
+        Info.masterStream(this->mesh().comm())
             << "fvMatrix<Type>::solveSegregated"
                "(const dictionary& solverControls) : "
                "solving fvMatrix<Type>"
@@ -202,7 +202,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveSegregated
 
         if (solverPerformance::debug)
         {
-            solverPerf.print(Info(this->mesh().comm()));
+            solverPerf.print(Info.masterStream(this->mesh().comm()));
         }
 
         solverPerfVec = max(solverPerfVec, solverPerf);
@@ -228,7 +228,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveCoupled
 {
     if (debug)
     {
-        Info(this->mesh().comm())
+        Info.masterStream(this->mesh().comm())
             << "fvMatrix<Type>::solveCoupled"
                "(const dictionary& solverControls) : "
                "solving fvMatrix<Type>"
@@ -269,7 +269,7 @@ Foam::solverPerformance Foam::fvMatrix<Type>::solveCoupled
 
     if (SolverPerformance<Type>::debug)
     {
-        solverPerf.print(Info(this->mesh().comm()));
+        solverPerf.print(Info.masterStream(this->mesh().comm()));
     }
 
     psi.correctBoundaryConditions();

src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ Foam::fvMatrix<Foam::scalar>::solver
 {
     if (debug)
     {
-        Info(this->mesh().comm())
+        Info.masterStream(this->mesh().comm())
             << "fvMatrix<scalar>::solver(const dictionary& solverControls) : "
                "solver for fvMatrix<scalar>"
             << endl;
@@ -120,7 +120,7 @@ Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::fvSolver::solve
 
     if (solverPerformance::debug)
     {
-        solverPerf.print(Info(fvMat_.mesh().comm()));
+        solverPerf.print(Info.masterStream(fvMat_.mesh().comm()));
     }
 
     fvMat_.diag() = saveDiag;
@@ -141,7 +141,7 @@ Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
 {
     if (debug)
     {
-        Info(this->mesh().comm())
+        Info.masterStream(this->mesh().comm())
             << "fvMatrix<scalar>::solveSegregated"
                "(const dictionary& solverControls) : "
                "solving fvMatrix<scalar>"
@@ -170,7 +170,7 @@ Foam::solverPerformance Foam::fvMatrix<Foam::scalar>::solveSegregated
 
     if (solverPerformance::debug)
     {
-        solverPerf.print(Info(mesh().comm()));
+        solverPerf.print(Info.masterStream(mesh().comm()));
     }
 
     diag() = saveDiag;

src/finiteVolume/interpolation/volPointInterpolation/pointConstraints.C

@@ -48,7 +48,7 @@ void pointConstraints::makePatchPatchAddressing()
     {
         Pout<< "pointConstraints::makePatchPatchAddressing() : "
             << "constructing boundary addressing"
-            << endl;
+            << endl << incrIndent;
     }
 
     const pointMesh& pMesh = mesh();
@@ -72,7 +72,7 @@ void pointConstraints::makePatchPatchAddressing()
 
             if (debug)
             {
-                Pout<< "On patch:" << pbm[patchi].name()
+                Pout<< indent << "On patch:" << pbm[patchi].name()
                     << " nBoundaryPoints:" << bp.size() << endl;
             }
         }
@@ -80,7 +80,8 @@ void pointConstraints::makePatchPatchAddressing()
 
     if (debug)
     {
-        Pout<< "Found nPatchPatchPoints:" << nPatchPatchPoints << endl;
+        Pout<< indent << "Found nPatchPatchPoints:" << nPatchPatchPoints
+            << endl;
     }
 
 
@@ -137,7 +138,7 @@ void pointConstraints::makePatchPatchAddressing()
 
     if (debug)
     {
-        Pout<< "Have (local) constrained points:"
+        Pout<< indent << "Have (local) constrained points:"
             << nPatchPatchPoints << endl;
     }
 
@@ -224,7 +225,7 @@ void pointConstraints::makePatchPatchAddressing()
 
                 if (iter == patchPatchPointSet.end())
                 {
-                    //Pout<< "on meshpoint:" << meshPointI
+                    //Pout<< indent << "on meshpoint:" << meshPointI
                     //    << " coupled:" << coupledPointI
                     //    << " at:" << mesh.points()[meshPointI]
                     //    << " have new constraint:"
@@ -242,7 +243,7 @@ void pointConstraints::makePatchPatchAddressing()
                 }
                 else
                 {
-                    //Pout<< "on meshpoint:" << meshPointI
+                    //Pout<< indent << "on meshpoint:" << meshPointI
                     //    << " coupled:" << coupledPointI
                     //    << " at:" << mesh.points()[meshPointI]
                     //    << " have possibly extended constraint:"
@@ -271,7 +272,7 @@ void pointConstraints::makePatchPatchAddressing()
 
     if (debug)
     {
-        Pout<< "Have (global) constrained points:"
+        Pout<< indent << "Have (global) constrained points:"
             << nPatchPatchPoints << endl;
     }
 
@@ -303,7 +304,7 @@ void pointConstraints::makePatchPatchAddressing()
 
     if (debug)
     {
-        Pout<< "Have non-trivial constrained points:"
+        Pout<< indent << "Have non-trivial constrained points:"
             << nConstraints << endl;
     }
 
@@ -314,7 +315,8 @@ void pointConstraints::makePatchPatchAddressing()
 
     if (debug)
     {
-        Pout<< "pointConstraints::makePatchPatchAddressing() : "
+        Pout<< decrIndent
+            << "pointConstraints::makePatchPatchAddressing() : "
             << "finished constructing boundary addressing"
             << endl;
     }
@@ -327,6 +329,13 @@ pointConstraints::pointConstraints(const pointMesh& pm)
 :
     MeshObject<pointMesh, Foam::UpdateableMeshObject, pointConstraints>(pm)
 {
+    if (debug)
+    {
+        Pout<< "pointConstraints::pointConstraints(const pointMesh&): "
+            << "Constructing from pointMesh " << pm.name()
+            << endl;
+    }
+
     makePatchPatchAddressing();
 }
 

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,7 +98,7 @@ void Foam::CellZoneInjection<CloudType>::setPositions
 
             injectorCells.append(cellI);
             injectorTetFaces.append(cellTetIs[tetI].face());
-            injectorTetPts.append(cellTetIs[tetI].faceBasePt());
+            injectorTetPts.append(cellTetIs[tetI].tetPt());
         }
     }
 
@@ -240,7 +240,7 @@ void Foam::CellZoneInjection<CloudType>::updateMesh()
     Info<< "    cell zone size      = " << nCellsTotal << endl;
     Info<< "    cell zone volume    = " << VCellsTotal << endl;
 
-    if ((nCells == 0) || (VCellsTotal*numberDensity_ < 1))
+    if ((nCellsTotal == 0) || (VCellsTotal*numberDensity_ < 1))
     {
         WarningIn("Foam::CellZoneInjection<CloudType>::updateMesh()")
             << "Number of particles to be added to cellZone " << cellZoneName_

src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,8 @@ Foam::AveragingMethod<Type>::New
         (
             "Foam::AveragingMethod<Type>::New"
             "("
-                "const dictionary&"
+                "const IOobject&, "
+                "const dictionary&, "
                 "const fvMesh&"
             ")"
         )   << "Unknown averaging method " << averageType
@@ -243,10 +244,10 @@ bool Foam::AveragingMethod<Type>::write() const
     pointGrad.internalField() /= pointVolume;
 
     // write
-    if(!cellValue.write()) return false;
+    if (!cellValue.write()) return false;
-    if(!cellGrad.write()) return false;
+    if (!cellGrad.write()) return false;
-    if(!pointValue.write()) return false;
+    if (!pointValue.write()) return false;
-    if(!pointGrad.write()) return false;
+    if (!pointGrad.write()) return false;
 
     return true;
 }

src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.C

@@ -123,7 +123,7 @@ void Foam::AveragingMethods::Dual<Type>::tetGeometry
 
     tetIs.tet(this->mesh_).barycentric(position, tetCoordinates_);
 
-    tetCoordinates_ = max(tetCoordinates_, 0.0);
+    tetCoordinates_ = max(tetCoordinates_, scalar(0));
 }
 
 

src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Dual/Dual.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Moment/Moment.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,6 @@ Foam::CorrectionLimitingMethod::New
         (
             "CorrectionLimitingMethod::New"
             "("
-                "const word&, "
                 "const dictionary&"
             ")"
         )   << "Unknown correction limiter type " << modelType

src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/CorrectionLimitingMethod/CorrectionLimitingMethod.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/noCorrectionLimiting/noCorrectionLimiting.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C

@@ -198,16 +198,6 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
 
         alphaEqn.solve();
 
-        //// updated stress
-        //tauPrime.internalField() =
-        //    this->particleStressModel_->tauPrime
-        //    (
-        //        alpha_.internalField(),
-        //        rho.internalField(),
-        //        uSqrAverage.internalField()
-        //    )();
-        //tauPrime.correctBoundaryConditions();
-
 
         // Generate correction fields
         // ~~~~~~~~~~~~~~~~~
@@ -229,8 +219,6 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
             (
                 cloudName + ":uCorrect",
                 fvc::reconstruct(phiCorrect_())
-            //  - deltaT*fvc::grad(tauPrime)/(rho*alpha_)
-            //  + (applyGravity_ ? deltaT*g*(1.0 - rhoc/rho) : 0.0)
             )
 
         );

src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/equilibrium/equilibrium.C

@@ -87,7 +87,7 @@ Foam::TimeScaleModels::equilibrium::oneByTau
 
     return
         a
-       *alpha*sqrt(max(uSqr, 0.0))/max(r32, SMALL)
+       *alpha*sqrt(max(uSqr, scalar(0)))/max(r32, SMALL)
        *alphaPacked_/max(alphaPacked_ - alpha, SMALL);
 }
 

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C

@@ -3508,7 +3508,7 @@ void Foam::autoLayerDriver::addLayers
     meshRefiner_.updateMesh(map, labelList(0));
 
     // Update numbering of faceWantedThickness
-    meshRefinement::updateList(map().faceMap(), 0.0, faceWantedThickness);
+    meshRefinement::updateList(map().faceMap(), scalar(0), faceWantedThickness);
 
     // Update numbering on baffles
     forAll(baffles, i)

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C

@@ -35,7 +35,6 @@ License
 #include "fvMeshDistribute.H"
 #include "polyTopoChange.H"
 #include "mapDistributePolyMesh.H"
-#include "featureEdgeMesh.H"
 #include "Cloud.H"
 //#include "globalIndex.H"
 #include "OBJstream.H"
@@ -358,7 +357,7 @@ void Foam::meshRefinement::markFeatureCellLevel
 
         forAll(features_, featI)
         {
-            const featureEdgeMesh& featureMesh = features_[featI];
+            const edgeMesh& featureMesh = features_[featI];
             const label featureLevel = features_.levels()[featI][0];
             const labelListList& pointEdges = featureMesh.pointEdges();
 
@@ -505,7 +504,7 @@ void Foam::meshRefinement::markFeatureCellLevel
         label featI = startTp.i();
         label pointI = startTp.j();
 
-        const featureEdgeMesh& featureMesh = features_[featI];
+        const edgeMesh& featureMesh = features_[featI];
         const labelList& pEdges = featureMesh.pointEdges()[pointI];
 
         // Now shoot particles down all pEdges.
@@ -561,7 +560,7 @@ void Foam::meshRefinement::markFeatureCellLevel
             label featI = tp.i();
             label pointI = tp.j();
 
-            const featureEdgeMesh& featureMesh = features_[featI];
+            const edgeMesh& featureMesh = features_[featI];
             const labelList& pEdges = featureMesh.pointEdges()[pointI];
 
             // Particle now at pointI. Check connected edges to see which one

src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C

@@ -186,7 +186,7 @@ void Foam::refinementFeatures::read
             set(featI, new extendedFeatureEdgeMesh(featObj, eeMesh));
         }
 
-        const edgeMesh& eMesh = operator[](featI);
+        const extendedEdgeMesh& eMesh = operator[](featI);
 
         //eMesh.mergePoints(meshRefiner_.mergeDistance());
 
@@ -258,13 +258,9 @@ void Foam::refinementFeatures::read
 }
 
 
-void Foam::refinementFeatures::buildTrees
+void Foam::refinementFeatures::buildTrees(const label featI)
-(
-    const label featI,
-    const labelList& featurePoints
-)
 {
-    const edgeMesh& eMesh = operator[](featI);
+    const extendedEdgeMesh& eMesh = operator[](featI);
     const pointField& points = eMesh.points();
     const edgeList& edges = eMesh.edges();
 
@@ -299,6 +295,9 @@ void Foam::refinementFeatures::buildTrees
         )
     );
 
+
+    labelList featurePoints(identity(eMesh.nonFeatureStart()));
+
     pointTrees_.set
     (
         featI,
@@ -408,24 +407,7 @@ Foam::refinementFeatures::refinementFeatures
     // Search engines
     forAll(*this, i)
     {
-        const extendedEdgeMesh& eMesh = operator[](i);
+        buildTrees(i);
-        const labelListList& pointEdges = eMesh.pointEdges();
-
-        DynamicList<label> featurePoints;
-        forAll(pointEdges, pointI)
-        {
-            if (pointEdges[pointI].size() > 2)
-            {
-                featurePoints.append(pointI);
-            }
-        }
-
-        Info<< "Detected " << featurePoints.size()
-            << " featurePoints out of " << pointEdges.size()
-            << " points on feature " << operator[](i).name()
-            << endl;
-
-        buildTrees(i, featurePoints);
     }
 }
 

src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.H

@@ -76,7 +76,7 @@ private:
         void read(const objectRegistry&, const PtrList<dictionary>&);
 
         //- Build edge tree and feature point tree
-        void buildTrees(const label, const labelList&);
+        void buildTrees(const label);
 
         //- Find shell level higher than ptLevel
         void findHigherLevel

src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C

@@ -90,15 +90,23 @@ Foam::trackedParticle::trackedParticle
 bool Foam::trackedParticle::move
 (
     trackingData& td,
-    const scalar trackedParticle
+    const scalar trackTime
 )
 {
     td.switchProcessor = false;
-    td.keepParticle = true;
 
-    scalar tEnd = (1.0 - stepFraction())*trackedParticle;
+    scalar tEnd = (1.0 - stepFraction())*trackTime;
     scalar dtMax = tEnd;
 
+    if (tEnd <= SMALL)
+    {
+        // Remove the particle
+        td.keepParticle = false;
+    }
+    else
+    {
+        td.keepParticle = true;
+
         while (td.keepParticle && !td.switchProcessor && tEnd > SMALL)
         {
             // set the lagrangian time-step
@@ -110,7 +118,8 @@ bool Foam::trackedParticle::move
             dt *= trackToFace(end_, td);
 
             tEnd -= dt;
-        stepFraction() = 1.0 - tEnd/trackedParticle;
+            stepFraction() = 1.0 - tEnd/trackTime;
+        }
     }
 
     return td.keepParticle;

src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C

@@ -91,10 +91,10 @@ void Foam::cyclicACMIPolyPatch::resetAMI
         );
 
         srcMask_ =
-            min(1.0 - tolerance_, max(tolerance_, AMI().srcWeightsSum()));
+            min(scalar(1) - tolerance_, max(tolerance_, AMI().srcWeightsSum()));
 
         tgtMask_ =
-            min(1.0 - tolerance_, max(tolerance_, AMI().tgtWeightsSum()));
+            min(scalar(1) - tolerance_, max(tolerance_, AMI().tgtWeightsSum()));
 
         forAll(Sf, faceI)
         {

src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ void Foam::removeRegisteredObject::execute()
 
 void Foam::removeRegisteredObject::end()
 {
-    // Do nothing - only valid on execute
+    execute();
 }
 
 

src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -195,7 +195,7 @@ void Foam::writeDictionary::execute()
 
 void Foam::writeDictionary::end()
 {
-    // do nothing
+    execute();
 }
 
 

src/postProcessing/functionObjects/field/Make/files

@@ -34,9 +34,6 @@ streamLine/streamLineParticle.C
 streamLine/streamLineParticleCloud.C
 streamLine/streamLineFunctionObject.C
 
-turbulenceFields/turbulenceFields.C
-turbulenceFields/turbulenceFieldsFunctionObject.C
-
 wallBoundedStreamLine/wallBoundedStreamLine.C
 wallBoundedStreamLine/wallBoundedStreamLineFunctionObject.C
 wallBoundedStreamLine/wallBoundedStreamLineParticle.C

src/postProcessing/functionObjects/field/Make/options

@@ -3,11 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude
 
 LIB_LIBS = \
@@ -16,8 +12,5 @@ LIB_LIBS = \
     -lsurfMesh \
     -llagrangian \
     -lfileFormats \
-    -lsurfMesh \
     -lsampling \
-    -lincompressibleTransportModels \
+    -lsurfMesh
-    -lcompressibleTurbulenceModel \
-    -lincompressibleTurbulenceModel

src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,8 +111,6 @@ void Foam::fieldAverage::calcAverages()
         initialize();
     }
 
-    Info<< type() << " " << name_ << " output:" << nl;
-
     const label currentTimeIndex =
         static_cast<const fvMesh&>(obr_).time().timeIndex();
 
@@ -125,6 +123,8 @@ void Foam::fieldAverage::calcAverages()
         prevTimeIndex_ = currentTimeIndex;
     }
 
+    Info<< type() << " " << name_ << " output:" << nl;
+
     Info<< "    Calculating averages" << nl;
 
     addMeanSqrToPrime2Mean<scalar, scalar>();
@@ -317,14 +317,19 @@ void Foam::fieldAverage::execute()
     if (active_)
     {
         calcAverages();
-
         Info<< endl;
     }
 }
 
 
 void Foam::fieldAverage::end()
-{}
+{
+    if (active_)
+    {
+        calcAverages();
+        Info<< endl;
+    }
+}
 
 
 void Foam::fieldAverage::timeSet()

src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,10 @@ void Foam::fieldCoordinateSystemTransform::execute()
 
 void Foam::fieldCoordinateSystemTransform::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,10 +159,7 @@ void Foam::fieldMinMax::write()
     {
         functionObjectFile::write();
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ <<  " output:" << nl;
-        {
-            Info<< type() << " " << name_ <<  " output:" << nl;
-        }
 
         forAll(fieldSet_, fieldI)
         {
@@ -173,10 +170,7 @@ void Foam::fieldMinMax::write()
             calcMinMaxFields<tensor>(fieldSet_[fieldI], mode_);
         }
 
-        if (log_)
+        Info(log_)<< endl;
-        {
-            Info<< endl;
-        }
     }
 }
 

src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,6 +139,20 @@ protected:
 
     // Private Member Functions
 
+        //- Helper function to write the output
+        template<class Type>
+        void output
+        (
+            const word& fieldName,
+            const word& outputName,
+            const vector& minC,
+            const vector& maxC,
+            const label minProcI,
+            const label maxProcI,
+            const Type& minValue,
+            const Type& maxValue
+        );
+
         //- Disallow default bitwise copy construct
         fieldMinMax(const fieldMinMax&);
 

src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,62 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::fieldMinMax::output
+(
+    const word& fieldName,
+    const word& outputName,
+    const vector& minC,
+    const vector& maxC,
+    const label minProcI,
+    const label maxProcI,
+    const Type& minValue,
+    const Type& maxValue
+)
+{
+    file()<< obr_.time().value();
+    writeTabbed(file(), fieldName);
+
+    file()
+        << token::TAB << minValue
+        << token::TAB << minC;
+
+    if (Pstream::parRun())
+    {
+        file()<< token::TAB << minProcI;
+    }
+
+    file()
+        << token::TAB << maxValue
+        << token::TAB << maxC;
+
+    if (Pstream::parRun())
+    {
+        file()<< token::TAB << maxProcI;
+    }
+
+    file() << endl;
+
+    Info(log_)<< "    min(" << outputName << ") = "
+        << minValue << " at position " << minC;
+
+    if (Pstream::parRun())
+    {
+        Info(log_)<< " on processor " << minProcI;
+    }
+
+    Info(log_)<< nl << "    max(" << outputName << ") = "
+        << maxValue << " at position " << maxC;
+
+    if (Pstream::parRun())
+    {
+        Info(log_)<< " on processor " << maxProcI;
+    }
+
+    Info(log_)<< endl;
+}
+
+
 template<class Type>
 void Foam::fieldMinMax::calcMinMaxFields
 (
@@ -111,49 +167,17 @@ void Foam::fieldMinMax::calcMinMaxFields
                     scalar maxValue = maxVs[maxI];
                     const vector& maxC = maxCs[maxI];
 
-                    file()<< obr_.time().value();
+                    output
-                    writeTabbed(file(), fieldName);
+                    (
-
+                        fieldName,
-                    file()
+                        word("mag(" + fieldName + ")"),
-                        << token::TAB << minValue
+                        minC,
-                        << token::TAB << minC;
+                        maxC,
-
+                        minI,
-                    if (Pstream::parRun())
+                        maxI,
-                    {
+                        minValue,
-                        file()<< token::TAB << minI;
+                        maxValue
-                    }
+                    );
-
-                    file()
-                        << token::TAB << maxValue
-                        << token::TAB << maxC;
-
-                    if (Pstream::parRun())
-                    {
-                        file()<< token::TAB << maxI;
-                    }
-
-                    file() << endl;
-
-                    if (log_)
-                    {
-                        Info<< "    min(mag(" << fieldName << ")) = "
-                            << minValue << " at position " << minC;
-
-                        if (Pstream::parRun())
-                        {
-                            Info<< " on processor " << minI;
-                        }
-
-                        Info<< nl << "    max(mag(" << fieldName << ")) = "
-                            << maxValue << " at position " << maxC;
-
-                        if (Pstream::parRun())
-                        {
-                            Info<< " on processor " << maxI;
-                        }
-
-                        Info<< endl;
-                    }
                 }
                 break;
             }
@@ -216,49 +240,17 @@ void Foam::fieldMinMax::calcMinMaxFields
                     Type maxValue = maxVs[maxI];
                     const vector& maxC = maxCs[maxI];
 
-                    file()<< obr_.time().value();
+                    output
-                    writeTabbed(file(), fieldName);
+                    (
-
+                        fieldName,
-                    file()
+                        fieldName,
-                        << token::TAB << minValue
+                        minC,
-                        << token::TAB << minC;
+                        maxC,
-
+                        minI,
-                    if (Pstream::parRun())
+                        maxI,
-                    {
+                        minValue,
-                        file()<< token::TAB << minI;
+                        maxValue
-                    }
+                    );
-
-                    file()
-                        << token::TAB << maxValue
-                        << token::TAB << maxC;
-
-                    if (Pstream::parRun())
-                    {
-                        file()<< token::TAB << maxI;
-                    }
-
-                    file() << endl;
-
-                    if (log_)
-                    {
-                        Info<< "    min(" << fieldName << ") = "
-                            << minValue << " at position " << minC;
-
-                        if (Pstream::parRun())
-                        {
-                            Info<< " on processor " << minI;
-                        }
-
-                        Info<< nl << "    max(" << fieldName << ") = "
-                            << maxValue << " at position " << maxC;
-
-                        if (Pstream::parRun())
-                        {
-                            Info<< " on processor " << maxI;
-                        }
-
-                        Info<< endl;
-                    }
                 }
                 break;
             }

src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -245,10 +245,7 @@ void Foam::fieldValues::cellSource::write()
             file()<< endl;
         }
 
-        if (log_)
+        Info(log_)<< endl;
-        {
-            Info<< endl;
-        }
     }
 }
 

src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -200,14 +200,11 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
 
             file()<< tab << result;
 
-            if (log_)
+            Info(log_)<< "    " << operationTypeNames_[operation_]
-            {
-                Info<< "    " << operationTypeNames_[operation_]
                 << "(" << sourceName_ << ") for " << fieldName
                 <<  " = " << result << endl;
         }
     }
-    }
 
     return ok;
 }

src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -663,10 +663,7 @@ void Foam::fieldValues::faceSource::write()
             file()<< endl;
         }
 
-        if (log_)
+        Info(log_)<< endl;
-        {
-            Info<< endl;
-        }
     }
 }
 

src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -344,14 +344,11 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName)
 
             file()<< tab << result;
 
-            if (log_)
+            Info(log_)<< "    " << operationTypeNames_[operation_]
-            {
-                Info<< "    " << operationTypeNames_[operation_]
                 << "(" << sourceName_ << ") for " << fieldName
                 <<  " = " << result << endl;
         }
     }
-    }
 
     return ok;
 }

src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,10 +58,7 @@ void Foam::fieldValue::write()
     {
         functionObjectFile::write();
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ << " output:" << nl;
-        {
-            Info<< type() << " " << name_ << " output:" << nl;
-        }
     }
 }
 

src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,10 +158,7 @@ void Foam::fieldValues::fieldValueDelta::write()
         file()<< obr_.time().value();
     }
 
-    if (log_)
+    Info(log_)<< type() << " " << name_ << " output:" << endl;
-    {
-        Info<< type() << " " << name_ << " output:" << endl;
-    }
 
     bool found = false;
     processFields<scalar>(found);

src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,12 +114,9 @@ void Foam::fieldValues::fieldValueDelta::processFields(bool& found)
 
             Type result = applyOperation(r1, r2);
 
-            if (log_)
+            Info(log_)<< "    " << operationTypeNames_[operation_]
-            {
-                Info<< "    " << operationTypeNames_[operation_]
                 << "(" << fieldName << ") = " << result
                 << endl;
-            }
 
             if (Pstream::master())
             {

src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -374,6 +374,11 @@ void Foam::nearWallFields::end()
     {
         Info<< "nearWallFields:end()" << endl;
     }
+
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/field/processorField/processorField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,10 @@ void Foam::processorField::execute()
 
 void Foam::processorField::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/field/readFields/readFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,8 +91,8 @@ void Foam::readFields::read(const dictionary& dict)
 
 void Foam::readFields::execute()
 {
-    //Info<< type() << " " << name_ << ":" << nl;
+    if (active_)
-
+    {
         // Clear out any previously loaded fields
         vsf_.clear();
         vvf_.clear();
@@ -108,19 +108,25 @@ void Foam::readFields::execute()
 
         forAll(fieldSet_, fieldI)
         {
+            const word& fieldName = fieldSet_[fieldI];
+
             // If necessary load field
-        loadField<scalar>(fieldSet_[fieldI], vsf_, ssf_);
+            loadField<scalar>(fieldName, vsf_, ssf_);
-        loadField<vector>(fieldSet_[fieldI], vvf_, svf_);
+            loadField<vector>(fieldName, vvf_, svf_);
-        loadField<sphericalTensor>(fieldSet_[fieldI], vSpheretf_, sSpheretf_);
+            loadField<sphericalTensor>(fieldName, vSpheretf_, sSpheretf_);
-        loadField<symmTensor>(fieldSet_[fieldI], vSymmtf_, sSymmtf_);
+            loadField<symmTensor>(fieldName, vSymmtf_, sSymmtf_);
-        loadField<tensor>(fieldSet_[fieldI], vtf_, stf_);
+            loadField<tensor>(fieldName, vtf_, stf_);
+        }
     }
 }
 
 
 void Foam::readFields::end()
 {
+    if (active_)
+    {
         execute();
+    }
 }
 
 

src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,7 +114,10 @@ void Foam::surfaceInterpolateFields::execute()
 
 void Foam::surfaceInterpolateFields::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -227,15 +227,12 @@ void Foam::forceCoeffs::write()
             << obr_.time().value() << tab << Cm << tab  << Cd
             << tab << Cl << tab << Clf << tab << Clr << endl;
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ << " output:" << nl
-        {
-            Info<< type() << " " << name_ << " output:" << nl
             << "    Cm    = " << Cm << nl
             << "    Cd    = " << Cd << nl
             << "    Cl    = " << Cl << nl
             << "    Cl(f) = " << Clf << nl
             << "    Cl(r) = " << Clr << endl;
-        }
 
         if (nBin_ > 1)
         {
@@ -262,10 +259,7 @@ void Foam::forceCoeffs::write()
             file(1) << endl;
         }
 
-        if (log_)
+        Info(log_)<< endl;
-        {
-            Info<< endl;
-        }
     }
 }
 

src/postProcessing/functionObjects/forces/forces/forces.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -391,9 +391,8 @@ void Foam::forces::applyBins
 
 void Foam::forces::writeForces()
 {
-    if (log_)
+    Info(log_)
-    {
+        << type() << " " << name_ << " output:" << nl
-        Info<< type() << " " << name_ << " output:" << nl
         << "    sum of forces:" << nl
         << "        pressure : " << sum(force_[0]) << nl
         << "        viscous  : " << sum(force_[1]) << nl
@@ -403,7 +402,6 @@ void Foam::forces::writeForces()
         << "        viscous  : " << sum(moment_[1]) << nl
         << "        porous   : " << sum(moment_[2])
         << endl;
-    }
 
     file(0) << obr_.time().value() << tab << setw(1) << '['
         << sum(force_[0]) << setw(1) << ','
@@ -642,10 +640,7 @@ void Foam::forces::read(const dictionary& dict)
 
         log_ = dict.lookupOrDefault<Switch>("log", false);
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ << ":" << nl;
-        {
-            Info<< type() << " " << name_ << ":" << nl;
-        }
 
         directForceDensity_ = dict.lookupOrDefault("directForceDensity", false);
 
@@ -809,10 +804,7 @@ void Foam::forces::write()
 
         writeBins();
 
-        if (log_)
+        Info(log_)<< endl;
-        {
-            Info<< endl;
-        }
     }
 }
 

src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,7 +154,10 @@ void Foam::calcFvcDiv::execute()
 
 void Foam::calcFvcDiv::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,10 @@ void Foam::calcFvcGrad::execute()
 
 void Foam::calcFvcGrad::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,10 @@ void Foam::calcMag::execute()
 
 void Foam::calcMag::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,7 +185,10 @@ void Foam::CourantNo::execute()
 
 void Foam::CourantNo::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -142,10 +142,7 @@ void Foam::DESModelRegions::execute()
 
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ <<  " output:" << nl;
-        {
-            Info<< type() << " " << name_ <<  " output:" << nl;
-        }
 
         volScalarField& DESModelRegions =
             const_cast<volScalarField&>
@@ -196,27 +193,25 @@ void Foam::DESModelRegions::execute()
                     << endl;
             }
 
-            if (log_)
+            Info(log_)
-            {
+                << "    LES = " << prc << " % (volume)" << nl
-                Info<< "    LES = " << prc << " % (volume)" << nl
                 << "    RAS = " << 100.0 - prc << " % (volume)" << endl;
         }
-        }
         else
         {
-            if (log_)
+            Info(log_)<< "    No DES turbulence model found in database" << nl
-            {
-                Info<< "    No DES turbulence model found in database" << nl
                 << endl;
         }
     }
-    }
 }
 
 
 void Foam::DESModelRegions::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,10 @@ void Foam::Lambda2::execute()
 
 void Foam::Lambda2::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/Make/files

@@ -30,6 +30,9 @@ scalarTransport/scalarTransportFunctionObject.C
 timeActivatedFileUpdate/timeActivatedFileUpdate.C
 timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.C
 
+turbulenceFields/turbulenceFields.C
+turbulenceFields/turbulenceFieldsFunctionObject.C
+
 wallShearStress/wallShearStress.C
 wallShearStress/wallShearStressFunctionObject.C
 

src/postProcessing/functionObjects/utilities/Peclet/Peclet.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,7 +197,10 @@ void Foam::Peclet::execute()
 
 void Foam::Peclet::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 void Foam::Peclet::timeSet()

src/postProcessing/functionObjects/utilities/Q/Q.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,10 @@ void Foam::Q::execute()
 
 void Foam::Q::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,10 @@ void Foam::blendingFactor::execute()
 
 void Foam::blendingFactor::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 void Foam::blendingFactor::timeSet()

src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -309,7 +309,10 @@ void Foam::pressureTools::execute()
 
 void Foam::pressureTools::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -214,6 +214,8 @@ void Foam::scalarTransport::read(const dictionary& dict)
 
 void Foam::scalarTransport::execute()
 {
+    if (active_)
+    {
         Info<< type() << " output:" << endl;
 
         const surfaceScalarField& phi =
@@ -292,14 +294,17 @@ void Foam::scalarTransport::execute()
                 << dimVolume/dimTime << endl;
         }
 
-
         Info<< endl;
+    }
 }
 
 
 void Foam::scalarTransport::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H

@@ -43,9 +43,6 @@ SourceFiles
     scalarTransport.C
     IOscalarTransport.H
 
-SeeAlso
-    Foam::basicSourceList
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef scalarTransport_H

src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,10 @@ void Foam::timeActivatedFileUpdate::execute()
 
 void Foam::timeActivatedFileUpdate::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/turbulenceFields/IOturbulenceFields.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -257,7 +257,10 @@ void Foam::turbulenceFields::execute()
 
 void Foam::turbulenceFields::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 

src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,12 +82,9 @@ void Foam::wallShearStress::calcShearStress
                 << endl;
         }
 
-        if (log_)
+        Info(log_)<< "    min/max(" << pp.name() << ") = "
-        {
-            Info<< "    min/max(" << pp.name() << ") = "
             << minSsp << ", " << maxSsp << endl;
     }
-    }
 }
 
 
@@ -240,10 +237,7 @@ void Foam::wallShearStress::execute()
                 mesh.lookupObject<volVectorField>(type())
             );
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ << " output:" << nl;
-        {
-            Info<< type() << " " << name_ << " output:" << nl;
-        }
 
 
         tmp<volSymmTensorField> Reff;
@@ -275,7 +269,10 @@ void Foam::wallShearStress::execute()
 
 void Foam::wallShearStress::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 
@@ -294,12 +291,9 @@ void Foam::wallShearStress::write()
         const volVectorField& wallShearStress =
             obr_.lookupObject<volVectorField>(type());
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ << " output:" << nl
-        {
-            Info<< type() << " " << name_ << " output:" << nl
             << "    writing field " << wallShearStress.name() << nl
             << endl;
-        }
 
         wallShearStress.write();
     }

src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,15 +94,12 @@ void Foam::yPlusLES::calcIncompressibleYPlus
             scalar maxYp = gMax(Yp);
             scalar avgYp = gAverage(Yp);
 
-            if (log_)
-            {
-                Info<< "    patch " << currPatch.name()
-                    << " y+ : min = " << minYp << ", max = " << maxYp
-                    << ", average = " << avgYp << nl;
-            }
-
             if (Pstream::master())
             {
+                Info(log_)<< "    patch " << currPatch.name()
+                    << " y+ : min = " << minYp << ", max = " << maxYp
+                    << ", average = " << avgYp << nl;
+
                 file() << obr_.time().value()
                     << token::TAB << currPatch.name()
                     << token::TAB << minYp
@@ -162,15 +159,12 @@ void Foam::yPlusLES::calcCompressibleYPlus
             scalar maxYp = gMax(Yp);
             scalar avgYp = gAverage(Yp);
 
-            if (log_)
-            {
-                Info<< "    patch " << currPatch.name()
-                    << " y+ : min = " << minYp << ", max = " << maxYp
-                    << ", average = " << avgYp << nl;
-            }
-
             if (Pstream::master())
             {
+                Info(log_)<< "    patch " << currPatch.name()
+                    << " y+ : min = " << minYp << ", max = " << maxYp
+                    << ", average = " << avgYp << nl;
+
                 file() << obr_.time().value()
                     << token::TAB << currPatch.name()
                     << token::TAB << minYp
@@ -286,10 +280,7 @@ void Foam::yPlusLES::execute()
                 mesh.lookupObject<volScalarField>(type())
             );
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ << " output:" << nl;
-        {
-            Info<< type() << " " << name_ << " output:" << nl;
-        }
 
         if (phi.dimensions() == dimMass/dimTime)
         {
@@ -305,7 +296,10 @@ void Foam::yPlusLES::execute()
 
 void Foam::yPlusLES::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 
@@ -324,10 +318,7 @@ void Foam::yPlusLES::write()
         const volScalarField& yPlusLES =
             obr_.lookupObject<volScalarField>(type());
 
-        if (log_)
+        Info(log_)<< "    writing field " << yPlusLES.name() << nl << endl;
-        {
-            Info<< "    writing field " << yPlusLES.name() << nl << endl;
-        }
 
         yPlusLES.write();
     }

src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,15 +89,12 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
             scalar maxYp = gMax(Yp);
             scalar avgYp = gAverage(Yp);
 
-            if (log_)
-            {
-                Info<< "    patch " << nutPw.patch().name()
-                    << " y+ : min = " << minYp << ", max = " << maxYp
-                    << ", average = " << avgYp << nl;
-            }
-
             if (Pstream::master())
             {
+                Info(log_)<< "    patch " << nutPw.patch().name()
+                    << " y+ : min = " << minYp << ", max = " << maxYp
+                    << ", average = " << avgYp << nl;
+
                 file() << obr_.time().value()
                     << token::TAB << nutPw.patch().name()
                     << token::TAB << minYp
@@ -149,15 +146,12 @@ void Foam::yPlusRAS::calcCompressibleYPlus
             scalar maxYp = gMax(Yp);
             scalar avgYp = gAverage(Yp);
 
-            if (log_)
-            {
-                Info<< "    patch " << mutPw.patch().name()
-                    << " y+ : min = " << minYp << ", max = " << maxYp
-                    << ", average = " << avgYp << nl;
-            }
-
             if (Pstream::master())
             {
+                Info(log_)<< "    patch " << mutPw.patch().name()
+                    << " y+ : min = " << minYp << ", max = " << maxYp
+                    << ", average = " << avgYp << nl;
+
                 file() << obr_.time().value()
                     << token::TAB << mutPw.patch().name()
                     << token::TAB << minYp
@@ -271,10 +265,7 @@ void Foam::yPlusRAS::execute()
                 mesh.lookupObject<volScalarField>(type())
             );
 
-        if (log_)
+        Info(log_)<< type() << " " << name_ << " output:" << nl;
-        {
-            Info<< type() << " " << name_ << " output:" << nl;
-        }
 
         if (phi.dimensions() == dimMass/dimTime)
         {
@@ -290,7 +281,10 @@ void Foam::yPlusRAS::execute()
 
 void Foam::yPlusRAS::end()
 {
-    // Do nothing
+    if (active_)
+    {
+        execute();
+    }
 }
 
 
@@ -309,10 +303,7 @@ void Foam::yPlusRAS::write()
         const volScalarField& yPlusRAS =
             obr_.lookupObject<volScalarField>(type());
 
-        if (log_)
+        Info(log_)<< "    writing field " << yPlusRAS.name() << nl << endl;
-        {
-            Info<< "    writing field " << yPlusRAS.name() << nl << endl;
-        }
 
         yPlusRAS.write();
     }

src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C

@@ -121,9 +121,9 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
                 max
                 (
                     (do_ - pDist.internalField())/(do_ - di_),
-                    0.0
+                    scalar(0)
                 ),
-                1.0
+                scalar(1)
             );
 
         // Convert the scale function to a cosine
@@ -136,9 +136,9 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
                   - 0.5
                    *cos(scale_.internalField()
                    *Foam::constant::mathematical::pi),
-                    0.0
+                    scalar(0)
                 ),
-                1.0
+                scalar(1)
             );
 
         scale_.correctBoundaryConditions();

tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict

@@ -86,7 +86,7 @@ castellatedMeshControls
     features
     (
         {
-            file "flange.eMesh";
+            file "flange.extendedFeatureEdgeMesh";
             level 0;
         }
     );
@@ -301,12 +301,13 @@ meshQualityControls
 
 // Advanced
 
-// Flags for optional output
+// Write flags
-// 0 : only write final meshes
+writeFlags
-// 1 : write intermediate meshes
+(
-// 2 : write volScalarField with cellLevel for postprocessing
+    scalarLevels    // write volScalarField with cellLevel for postprocessing
-// 4 : write current intersections as .obj files
+    layerSets       // write cellSets, faceSets of faces in layer
-debug 0;
+    layerFields     // write volScalarField for layer coverage
+);
 
 
 // Merge tolerance. Is fraction of overall bounding box of initial mesh.