Info -> InfoInFunction and updated comments

src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.C

@@ -50,9 +50,7 @@ tmp<d2dt2Scheme<Type>> d2dt2Scheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "d2dt2Scheme<Type>::New(const fvMesh&, Istream&) : "
+        InfoInFunction << "Constructing d2dt2Scheme<Type>" << endl;
-               "constructing d2dt2Scheme<Type>"
-            << endl;
     }
 
     if (schemeData.eof())

src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C

@@ -456,9 +456,6 @@ SLTSDdtScheme<Type>::fvmDdt
 
     scalarField rDeltaT(SLrDeltaT()().internalField());
 
-    Info<< "SLTSDdtScheme<Type>::fvmDdt: max/min rDeltaT "
-        << gMax(rDeltaT) << " " << gMin(rDeltaT) << endl;
-
     fvm.diag() = rDeltaT*mesh().V();
 
     if (mesh().moving())

src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C

@@ -50,9 +50,7 @@ tmp<ddtScheme<Type>> ddtScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "ddtScheme<Type>::New(const fvMesh&, Istream&) : "
+        InfoInFunction << "Constructing ddtScheme<Type>" << endl;
-               "constructing ddtScheme<Type>"
-            << endl;
     }
 
     if (schemeData.eof())
@@ -166,7 +164,8 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 
     if (debug > 1)
     {
-        Info<< "ddtCouplingCoeff mean max min = "
+        InfoInFunction
+            << "ddtCouplingCoeff mean max min = "
             << gAverage(ddtCouplingCoeff.internalField())
             << " " << gMax(ddtCouplingCoeff.internalField())
             << " " << gMin(ddtCouplingCoeff.internalField())

src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.C

@@ -51,9 +51,7 @@ tmp<divScheme<Type>> divScheme<Type>::New
 {
     if (fv::debug)
     {
-        Info<< "divScheme<Type>::New(const fvMesh&, Istream&) : "
+        InfoInFunction << "Constructing divScheme<Type>" << endl;
-               "constructing divScheme<Type>"
-            << endl;
     }
 
     if (schemeData.eof())

src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C

@@ -54,9 +54,7 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
 {
     if (debug)
     {
-        Info<< "LeastSquaresVectors::calcLeastSquaresVectors() :"
+        InfoInFunction << "Calculating least square gradient vectors" << endl;
-            << "Calculating least square gradient vectors"
-            << endl;
     }
 
     const fvMesh& mesh = this->mesh_;
@@ -100,9 +98,8 @@ void Foam::fv::LeastSquaresVectors<Stencil>::calcLeastSquaresVectors()
 
     if (debug)
     {
-        Info<< "LeastSquaresVectors::calcLeastSquaresVectors() :"
+        InfoInFunction
-            << "Finished calculating least square gradient vectors"
+            << "Finished calculating least square gradient vectors" << endl;
-            << endl;
     }
 }
 

src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/invDistLeastSquaresVectors.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 {
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
+        InfoInFunction << "Calculating least square gradient vectors" << endl;
-            << "Calculating least square gradient vectors"
-            << endl;
     }
 
     const fvMesh& mesh = mesh_;
@@ -170,9 +168,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
+        InfoInFunction
-            << "Finished calculating least square gradient vectors"
+            <<"Finished calculating least square gradient vectors" << endl;
-            << endl;
     }
 }
 

src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 {
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
+        InfoInFunction << "Calculating least square gradient vectors" << endl;
-            << "Calculating least square gradient vectors"
-            << endl;
     }
 
     const fvMesh& mesh = mesh_;
@@ -209,9 +207,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
+        InfoInFunction
-            << "Finished calculating least square gradient vectors"
+            << "Finished calculating least square gradient vectors" << endl;
-            << endl;
     }
 }
 

src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/unweightedLeastSquaresVectors.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,9 +84,7 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 {
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
+        InfoInFunction << "Calculating least square gradient vectors" << endl;
-            << "Calculating least square gradient vectors"
-            << endl;
     }
 
     const fvMesh& mesh = mesh_;
@@ -166,9 +164,8 @@ void Foam::leastSquaresVectors::calcLeastSquaresVectors()
 
     if (debug)
     {
-        Info<< "leastSquaresVectors::calcLeastSquaresVectors() :"
+        InfoInFunction
-            << "Finished calculating least square gradient vectors"
+            << "Finished calculating least square gradient vectors" << endl;
-            << endl;
     }
 }
 

src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.C

@@ -49,9 +49,7 @@ tmp<laplacianScheme<Type, GType>> laplacianScheme<Type, GType>::New
 {
     if (fv::debug)
     {
-        Info<< "laplacianScheme<Type, GType>::New(const fvMesh&, Istream&) : "
+        InfoInFunction << "Constructing laplacianScheme<Type, GType>" << endl;
-               "constructing laplacianScheme<Type, GType>"
-            << endl;
     }
 
     if (schemeData.eof())

src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C

@@ -52,16 +52,15 @@ Foam::CentredFitSnGradData<Polynomial>::CentredFitSnGradData
 {
     if (debug)
     {
-        Info<< "Contructing CentredFitSnGradData<Polynomial>" << endl;
+        InfoInFunction
+            << "Contructing CentredFitSnGradData<Polynomial>" << endl;
     }
 
     calcFit();
 
     if (debug)
     {
-        Info<< "CentredFitSnGradData<Polynomial>::CentredFitSnGradData() :"
+        Info<< "    Finished constructing polynomialFit data" << endl;
-            << "Finished constructing polynomialFit data"
-            << endl;
     }
 }
 

src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C

@@ -76,7 +76,8 @@ limitedSnGrad<Type>::correction
 
     if (fv::debug)
     {
-        Info<< "limitedSnGrad :: limiter min: " << min(limiter.internalField())
+        InfoInFunction
+            << "limiter min: " << min(limiter.internalField())
             << " max: "<< max(limiter.internalField())
             << " avg: " << average(limiter.internalField()) << endl;
     }

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C

@@ -280,10 +280,8 @@ Foam::fvMatrix<Type>::fvMatrix
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>(GeometricField<Type, fvPatchField, volMesh>&,"
+        InfoInFunction
-               " const dimensionSet&) : "
+            << "Constructing fvMatrix<Type> for field " << psi_.name() << endl;
-               "constructing fvMatrix<Type> for field " << psi_.name()
-            << endl;
     }
 
     // Initialise coupling coefficients
@@ -334,9 +332,8 @@ Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>::fvMatrix(const fvMatrix<Type>&) : "
+        InfoInFunction
-            << "copying fvMatrix<Type> for field " << psi_.name()
+            << "Copying fvMatrix<Type> for field " << psi_.name() << endl;
-            << endl;
     }
 
     if (fvm.faceFluxCorrectionPtr_)
@@ -381,9 +378,8 @@ Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>&) : "
+        InfoInFunction
-            << "copying fvMatrix<Type> for field " << psi_.name()
+            << "Copying fvMatrix<Type> for field " << psi_.name() << endl;
-            << endl;
     }
 
     if (tfvm().faceFluxCorrectionPtr_)
@@ -425,10 +421,8 @@ Foam::fvMatrix<Type>::fvMatrix
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>"
+        InfoInFunction
-               "(GeometricField<Type, fvPatchField, volMesh>&, Istream&) : "
+            << "Constructing fvMatrix<Type> for field " << psi_.name() << endl;
-               "constructing fvMatrix<Type> for field " << psi_.name()
-            << endl;
     }
 
     // Initialise coupling coefficients
@@ -463,9 +457,8 @@ Foam::fvMatrix<Type>::~fvMatrix()
 {
     if (debug)
     {
-        Info<< "fvMatrix<Type>::~fvMatrix<Type>() : "
+        InfoInFunction
-            << "destroying fvMatrix<Type> for field " << psi_.name()
+            << "Destroying fvMatrix<Type> for field " << psi_.name() << endl;
-            << endl;
     }
 
     if (faceFluxCorrectionPtr_)
@@ -526,8 +519,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
     if (debug)
     {
         InfoInFunction
-            << "Relaxing " << psi_.name() << " by " << alpha
+            << "Relaxing " << psi_.name() << " by " << alpha << endl;
-            << endl;
     }
 
     Field<Type>& S = source();

src/finiteVolume/fvMesh/fvMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,8 +125,7 @@ void Foam::fvMesh::clearAddressing(const bool isMeshUpdate)
 {
     if (debug)
     {
-        Info<< "fvMesh::clearAddressing(const bool) :"
+        InfoInFunction << "isMeshUpdate: " << isMeshUpdate << endl;
-            << " isMeshUpdate:" << isMeshUpdate << endl;
     }
 
     if (isMeshUpdate)
@@ -167,7 +166,7 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
     {
         if (debug)
         {
-            Info<< "fvMesh::storeOldVol(const scalarField&) :"
+            InfoInFunction
                 << " Storing old time volumes since from time " << curTimeIndex_
                 << " and time now " << time().timeIndex()
                 << " V:" << V.size()
@@ -214,12 +213,12 @@ void Foam::fvMesh::storeOldVol(const scalarField& V)
 
         if (debug)
         {
-            Info<< "fvMesh::storeOldVol() :"
+            InfoInFunction
                 << " Stored old time volumes V0:" << V0Ptr_->size()
                 << endl;
             if (V00Ptr_)
             {
-                Info<< "fvMesh::storeOldVol() :"
+                InfoInFunction
                     << " Stored oldold time volumes V00:" << V00Ptr_->size()
                     << endl;
             }
@@ -265,8 +264,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from IOobject"
+        InfoInFunction << "Constructing fvMesh from IOobject" << endl;
-            << endl;
     }
 
     // Check the existance of the cell volumes and read if present
@@ -376,7 +374,7 @@ Foam::fvMesh::fvMesh
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from cellShapes" << endl;
+        InfoInFunction << "Constructing fvMesh from cellShapes" << endl;
     }
 }
 
@@ -410,7 +408,7 @@ Foam::fvMesh::fvMesh
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from components" << endl;
+        InfoInFunction << "Constructing fvMesh from components" << endl;
     }
 }
 
@@ -443,7 +441,7 @@ Foam::fvMesh::fvMesh
 {
     if (debug)
     {
-        Info<< "Constructing fvMesh from components" << endl;
+        InfoInFunction << "Constructing fvMesh from components" << endl;
     }
 }
 
@@ -481,9 +479,7 @@ void Foam::fvMesh::removeFvBoundary()
 {
     if (debug)
     {
-        Info<< "void fvMesh::removeFvBoundary(): "
+        InfoInFunction << "Removing boundary patches." << endl;
-            << "Removing boundary patches."
-            << endl;
     }
 
     // Remove fvBoundaryMesh data first.
@@ -499,8 +495,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate()
 {
     if (debug)
     {
-        Info<< "polyMesh::readUpdateState fvMesh::readUpdate() : "
+        InfoInFunction << "Updating fvMesh.  ";
-            << "Updating fvMesh.  ";
     }
 
     polyMesh::readUpdateState state = polyMesh::readUpdate();
@@ -568,7 +563,7 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
 {
     if (debug)
     {
-        Info<< "fvMesh::mapFields :"
+        InfoInFunction
             << " nOldCells:" << meshMap.nOldCells()
             << " nCells:" << nCells()
             << " nOldFaces:" << meshMap.nOldFaces()

src/finiteVolume/fvMesh/fvMeshGeometry.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,7 @@ void fvMesh::makeMagSf() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::makeMagSf() : "
+        InfoInFunction << "Assembling mag face areas" << endl;
-            << "assembling mag face areas"
-            << endl;
     }
 
     // It is an error to attempt to recalculate
@@ -119,9 +117,7 @@ void fvMesh::makeC() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::makeC() : "
+        InfoInFunction << "Assembling cell centres" << endl;
-            << "assembling cell centres"
-            << endl;
     }
 
     // It is an error to attempt to recalculate
@@ -161,9 +157,7 @@ void fvMesh::makeCf() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::makeCf() : "
+        InfoInFunction << "Assembling face centres" << endl;
-            << "assembling face centres"
-            << endl;
     }
 
     // It is an error to attempt to recalculate
@@ -202,9 +196,8 @@ const volScalarField::DimensionedInternalField& fvMesh::V() const
     {
         if (debug)
         {
-            Info<< "fvMesh::V() const: "
+            InfoInFunction
-                << "constructing from primitiveMesh::cellVolumes()"
+                << "Constructing from primitiveMesh::cellVolumes()" << endl;
-                << endl;
         }
 
         VPtr_ = new slicedVolScalarField::DimensionedInternalField
@@ -260,9 +253,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V00() const
     {
         if (debug)
         {
-            Info<< "fvMesh::V00() const: "
+            InfoInFunction << "Constructing from V0" << endl;
-                << "constructing from V0"
-                << endl;
         }
 
         V00Ptr_ = new DimensionedField<scalar, volMesh>
@@ -392,9 +383,7 @@ tmp<surfaceVectorField> fvMesh::delta() const
 {
     if (debug)
     {
-        Info<< "void fvMesh::delta() : "
+        InfoInFunction << "Calculating face deltas" << endl;
-            << "calculating face deltas"
-            << endl;
     }
 
     tmp<surfaceVectorField> tdelta

src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,9 +37,7 @@ Foam::autoPtr<Foam::fvPatch> Foam::fvPatch::New
 {
     if (debug)
     {
-        Info<< "fvPatch::New(const polyPatch&, const fvBoundaryMesh&) : "
+        InfoInFunction << "Constructing fvPatch" << endl;
-            << "constructing fvPatch"
-            << endl;
     }
 
     polyPatchConstructorTable::iterator cstrIter =

src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C

@@ -54,16 +54,14 @@ Foam::CentredFitData<Polynomial>::CentredFitData
 {
     if (debug)
     {
-        Info<< "Contructing CentredFitData<Polynomial>" << endl;
+        InfoInFunction << "Contructing CentredFitData<Polynomial>" << endl;
     }
 
     calcFit();
 
     if (debug)
     {
-        Info<< "CentredFitData<Polynomial>::CentredFitData() :"
+        Info<<     "Finished constructing polynomialFit data" << endl;
-            << "Finished constructing polynomialFit data"
-            << endl;
     }
 }
 

src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C

@@ -55,16 +55,14 @@ Foam::UpwindFitData<Polynomial>::UpwindFitData
 {
     if (debug)
     {
-        Info<< "Contructing UpwindFitData<Polynomial>" << endl;
+        InfoInFunction << "Contructing UpwindFitData<Polynomial>" << endl;
     }
 
     calcFit();
 
     if (debug)
     {
-        Info<< "UpwindFitData<Polynomial>::UpwindFitData() :"
+        Info<< "    Finished constructing polynomialFit data" << endl;
-            << "Finished constructing polynomialFit data"
-            << endl;
     }
 }
 

src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,9 +67,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
 {
     if (debug)
     {
-        Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
+        InfoInFunction << "Calculating skew correction vectors" << endl;
-            << "Calculating skew correction vectors"
-            << endl;
     }
 
     // Set local references to mesh data
@@ -135,8 +133,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
 
     if (debug)
     {
-        Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
+        InfoInFunction << "skew coefficient = " << skewCoeff << endl;
-            << "skew coefficient = " << skewCoeff << endl;
     }
 
     if (skewCoeff < 1e-5)
@@ -150,9 +147,7 @@ void Foam::skewCorrectionVectors::calcSkewCorrectionVectors()
 
     if (debug)
     {
-        Info<< "surfaceInterpolation::calcSkewCorrectionVectors() : "
+        Info<< "    Finished constructing skew correction vectors" << endl;
-            << "Finished constructing skew correction vectors"
-            << endl;
     }
 }
 

src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulated6DoFAcceleration/tabulated6DoFAcceleration.C

@@ -89,7 +89,7 @@ Foam::tabulated6DoFAcceleration::acceleration() const
         values_
     );
 
-    Info<< "tabulated6DoFAcceleration::acceleration(): "
+    InfoInFunction
         << "Time = " << t << " accelerations: " << avs << endl;
 
     return avs;

src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,8 +46,7 @@ void Foam::ParticleTracks<CloudType>::write()
     {
         if (debug)
         {
-            Info<< "void Foam::ParticleTracks<CloudType>::write()" << nl
+            InfoInFunction << "cloupPtr invalid" << endl;
-                << "cloupPtr invalid" << endl;
         }
     }
 }

src/mesh/blockMesh/curvedEdges/curvedEdge.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,9 +81,7 @@ Foam::autoPtr<Foam::curvedEdge> Foam::curvedEdge::New
 {
     if (debug)
     {
-        Info<< "curvedEdge::New(const pointField&, Istream&) : "
+        InfoInFunction << "Constructing curvedEdge" << endl;
-            << "constructing curvedEdge"
-            << endl;
     }
 
     const word edgeType(is);

src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolationParallelOps.C

@@ -60,7 +60,7 @@ Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
             procI = -1;
             if (debug)
             {
-                Info<< "AMIInterpolation::calcDistribution: "
+                InfoInFunction
                     << "AMI split across multiple processors" << endl;
             }
         }
@@ -69,7 +69,7 @@ Foam::label Foam::AMIInterpolation<SourcePatch, TargetPatch>::calcDistribution
             procI = findIndex(facesPresentOnProc, 1);
             if (debug)
             {
-                Info<< "AMIInterpolation::calcDistribution: "
+                InfoInFunction
                     << "AMI local to processor" << procI << endl;
             }
         }

src/meshTools/searchableSurface/searchablePlate.C

@@ -31,10 +31,8 @@ License
 
 namespace Foam
 {
-
+    defineTypeNameAndDebug(searchablePlate, 0);
-defineTypeNameAndDebug(searchablePlate, 0);
+    addToRunTimeSelectionTable(searchableSurface, searchablePlate, dict);
-addToRunTimeSelectionTable(searchableSurface, searchablePlate, dict);
-
 }
 
 
@@ -220,7 +218,7 @@ Foam::searchablePlate::searchablePlate
 {
     if (debug)
     {
-        Info<< "searchablePlate::searchablePlate :"
+        InfoInFunction
             << " origin:" << origin_
             << " origin+span:" << origin_+span_
             << " normal:" << vector::componentNames[normalDir_]
@@ -244,7 +242,7 @@ Foam::searchablePlate::searchablePlate
 {
     if (debug)
     {
-        Info<< "searchablePlate::searchablePlate :"
+        InfoInFunction
             << " origin:" << origin_
             << " origin+span:" << origin_+span_
             << " normal:" << vector::componentNames[normalDir_]

src/meshTools/searchableSurface/triSurfaceMesh.C

@@ -98,7 +98,6 @@ addToRunTimeSelectionTable(searchableSurface, triSurfaceMesh, dict);
 //}
 
 
-//- Check file existence
 const Foam::fileName& Foam::triSurfaceMesh::checkFile
 (
     const fileName& fName,
@@ -690,10 +689,10 @@ void Foam::triSurfaceMesh::getNormal
             if (info[i].hit())
             {
                 label faceI = info[i].index();
-                //- Cached:
+                // Cached:
                 //normal[i] = faceNormals()[faceI];
 
-                //- Uncached
+                // Uncached
                 normal[i] = s[faceI].normal(pts);
                 normal[i] /= mag(normal[i]) + VSMALL;
             }
@@ -784,16 +783,12 @@ void Foam::triSurfaceMesh::getVolumeType
             // - use cached volume type per each tree node
             volType[pointI] = tree().getVolumeType(pt);
         }
-
-//        Info<< "octree : " << pt << " = "
-//            << volumeType::names[volType[pointI]] << endl;
     }
 
     indexedOctree<treeDataTriSurface>::perturbTol() = oldTol;
 }
 
 
-//- Write using given format, version and compression
 bool Foam::triSurfaceMesh::writeObject
 (
     IOstream::streamFormat fmt,
@@ -815,7 +810,6 @@ bool Foam::triSurfaceMesh::writeObject
         return false;
     }
 
-    //return objectRegistry::writeObject(fmt, ver, cmp);
     return true;
 }
 

src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(pointToPointPlanarInterpolation, 0);
+    defineTypeNameAndDebug(pointToPointPlanarInterpolation, 0);
 }
 
 
@@ -112,7 +112,7 @@ Foam::pointToPointPlanarInterpolation::calcCoordinateSystem
 
     if (debug)
     {
-        Info<< "pointToPointPlanarInterpolation::calcCoordinateSystem :"
+        InfoInFunction
             << " Used points " << p0 << ' ' << points[index1]
             << ' ' << points[index2]
             << " to define coordinate system with normal " << n << endl;
@@ -204,7 +204,7 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
 
         if (debug)
         {
-            Info<< "pointToPointPlanarInterpolation::calcWeights :"
+            InfoInFunction
                 << " Perturbing points with " << perturb_
                 << " fraction of a random position inside " << bb
                 << " to break any ties on regular meshes."

src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C

@@ -922,7 +922,7 @@ bool Foam::distributedTriSurfaceMesh::overlaps
         triBb.max() = max(triBb.max(), p1);
         triBb.max() = max(triBb.max(), p2);
 
-        //- Exact test of triangle intersecting bb
+        // Exact test of triangle intersecting bb
 
         // Quick rejection. If whole bounding box of tri is outside cubeBb then
         // there will be no intersection.
@@ -1313,7 +1313,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
 
     if (debug)
     {
-        Info<< "Constructed from triSurface:" << endl;
+        InfoInFunction << "Constructed from triSurface:" << endl;
         writeStats(Info);
 
         labelList nTris(Pstream::nProcs());
@@ -1390,7 +1390,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh(const IOobject& io)
 
     if (debug)
     {
-        Info<< "Read distributedTriSurface from " << io.objectPath()
+        InfoInFunction << "Read distributedTriSurface from " << io.objectPath()
             << ':' << endl;
         writeStats(Info);
 
@@ -1473,7 +1473,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
 
     if (debug)
     {
-        Info<< "Read distributedTriSurface from " << io.objectPath()
+        InfoInFunction << "Read distributedTriSurface from " << io.objectPath()
             << " and dictionary:" << endl;
         writeStats(Info);
 
@@ -2084,13 +2084,6 @@ void Foam::distributedTriSurfaceMesh::distribute
             break;
         }
 
-        //if (debug)
-        //{
-        //    Info<< "old bb:" << procBb_ << endl << endl;
-        //    Info<< "new bb:" << newProcBb << endl << endl;
-        //    Info<< "Same:" << (newProcBb == procBb_) << endl;
-        //}
-
         if (newProcBb == procBb_)
         {
             return;
@@ -2111,9 +2104,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         Pstream::gatherList(nTris);
         Pstream::scatterList(nTris);
 
-        Info<< "distributedTriSurfaceMesh::distribute : before distribution:"
+        InfoInFunction
-            << endl
+            << "before distribution:" << endl << "\tproc\ttris" << endl;
-            << "\tproc\ttris" << endl;
 
         forAll(nTris, procI)
         {
@@ -2368,9 +2360,8 @@ void Foam::distributedTriSurfaceMesh::distribute
         Pstream::gatherList(nTris);
         Pstream::scatterList(nTris);
 
-        Info<< "distributedTriSurfaceMesh::distribute : after distribution:"
+        InfoInFunction
-            << endl
+            << "after distribution:" << endl << "\tproc\ttris" << endl;
-            << "\tproc\ttris" << endl;
 
         forAll(nTris, procI)
         {
@@ -2381,7 +2372,6 @@ void Foam::distributedTriSurfaceMesh::distribute
 }
 
 
-//- Write using given format, version and compression
 bool Foam::distributedTriSurfaceMesh::writeObject
 (
     IOstream::streamFormat fmt,

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

@@ -56,8 +56,7 @@ void Foam::nearWallFields::calcAddressing()
 
     if (debug)
     {
-        Info<< "nearWallFields::calcAddressing() :"
+        InfoInFunction << "nPatchFaces: " << globalWalls.size() << endl;
-            << " nPatchFaces:" << globalWalls.size() << endl;
     }
 
     // Construct cloud
@@ -139,8 +138,7 @@ void Foam::nearWallFields::calcAddressing()
             mesh.time().path()
            /"wantedTracks_" + mesh.time().timeName() + ".obj"
         );
-        Info<< "nearWallFields::calcAddressing() :"
+        InfoInFunction << "Dumping tracks to " << str.name() << endl;
-            << "Dumping tracks to " << str.name() << endl;
 
         forAllConstIter(Cloud<findCellParticle>, cloud, iter)
         {
@@ -202,8 +200,7 @@ void Foam::nearWallFields::calcAddressing()
                 mesh.time().path()
                /"obtainedTracks_" + mesh.time().timeName() + ".obj"
             );
-            Info<< "nearWallFields::calcAddressing() :"
+            InfoInFunction << "Dumping obtained to " << str.name() << endl;
-                << "Dumping obtained to " << str.name() << endl;
 
             forAll(cellToWalls_, cellI)
             {
@@ -256,7 +253,7 @@ Foam::nearWallFields::~nearWallFields()
 {
     if (debug)
     {
-        Info<< "nearWallFields::~nearWallFields()" << endl;
+        InfoInFunction << endl;
     }
 }
 
@@ -267,7 +264,7 @@ void Foam::nearWallFields::read(const dictionary& dict)
 {
     if (debug)
     {
-        Info<< "nearWallFields::read(const dictionary&)" << endl;
+        InfoInFunction << endl;
     }
 
     if (active_)
@@ -317,7 +314,7 @@ void Foam::nearWallFields::execute()
 {
     if (debug)
     {
-        Info<< "nearWallFields:execute()" << endl;
+        InfoInFunction << endl;
     }
 
 
@@ -363,7 +360,7 @@ void Foam::nearWallFields::end()
 {
     if (debug)
     {
-        Info<< "nearWallFields:end()" << endl;
+        InfoInFunction << endl;
     }
 
     if (active_)
@@ -383,7 +380,7 @@ void Foam::nearWallFields::write()
 {
     if (debug)
     {
-        Info<< "nearWallFields:write()" << endl;
+        InfoInFunction << endl;
     }
 
     if (active_)

src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C

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

src/sampling/meshToMesh/meshToMeshParallelOps.C

@@ -63,7 +63,7 @@ Foam::label Foam::meshToMesh::calcDistribution
             procI = -1;
             if (debug)
             {
-                Info<< "meshToMesh::calcDistribution: "
+                InfoInFunction
                     << "Meshes split across multiple processors" << endl;
             }
         }
@@ -72,7 +72,7 @@ Foam::label Foam::meshToMesh::calcDistribution
             procI = findIndex(cellsPresentOnProc, 1);
             if (debug)
             {
-                Info<< "meshToMesh::calcDistribution: "
+                InfoInFunction
                     << "Meshes local to processor" << procI << endl;
             }
         }
@@ -138,7 +138,8 @@ Foam::autoPtr<Foam::mapDistribute> Foam::meshToMesh::calcProcMap
 
     if (debug)
     {
-        Info<< "Determining extent of src mesh per processor:" << nl
+        InfoInFunction
+            << "Determining extent of src mesh per processor:" << nl
             << "\tproc\tbb" << endl;
         forAll(procBb, procI)
         {

src/sampling/meshToMesh0/calculateMeshToMesh0Addressing.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,8 +41,8 @@ void Foam::meshToMesh0::calcAddressing()
 {
     if (debug)
     {
-        Info<< "meshToMesh0::calculateAddressing() : "
+        InfoInFunction
-            << "calculating mesh-to-mesh cell addressing" << endl;
+            << "Calculating mesh-to-mesh cell addressing" << endl;
     }
 
     // set reference to cells
@@ -62,8 +62,7 @@ void Foam::meshToMesh0::calcAddressing()
 
     if (debug)
     {
-        Info<< "meshToMesh0::calculateAddressing() : "
+        InfoInFunction << "Setting up rescue" << endl;
-            << "Setting up rescue" << endl;
     }
 
     List<bool> boundaryCell(fromCells.size(), false);
@@ -203,8 +202,8 @@ void Foam::meshToMesh0::calcAddressing()
 
     if (debug)
     {
-        Info<< "meshToMesh0::calculateAddressing() : "
+        InfoInFunction
-            << "finished calculating mesh-to-mesh cell addressing" << endl;
+            << "Finished calculating mesh-to-mesh cell addressing" << endl;
     }
 }
 

src/sampling/meshToMesh0/calculateMeshToMesh0Weights.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,8 @@ void Foam::meshToMesh0::calculateInverseDistanceWeights() const
 {
     if (debug)
     {
-        Info<< "meshToMesh0::calculateInverseDistanceWeights() : "
+        InfoInFunction
-            << "calculating inverse distance weighting factors" << endl;
+            << "Calculating inverse distance weighting factors" << endl;
     }
 
     if (inverseDistanceWeightsPtr_)
@@ -134,8 +134,8 @@ void Foam::meshToMesh0::calculateInverseVolumeWeights() const
 {
     if (debug)
     {
-        Info<< "meshToMesh0::calculateInverseVolumeWeights() : "
+        InfoInFunction
-            << "calculating inverse volume weighting factors" << endl;
+            << "Calculating inverse volume weighting factors" << endl;
     }
 
     if (inverseVolumeWeightsPtr_)
@@ -197,8 +197,8 @@ void Foam::meshToMesh0::calculateCellToCellAddressing() const
 {
     if (debug)
     {
-        Info<< "meshToMesh0::calculateCellToCellAddressing() : "
+        InfoInFunction
-            << "calculating cell to cell addressing" << endl;
+            << "Calculating cell to cell addressing" << endl;
     }
 
     if (cellToCellAddressingPtr_)
@@ -223,9 +223,6 @@ void Foam::meshToMesh0::calculateCellToCellAddressing() const
             overlapEngine.overlappingCells(fromMesh_, toMesh_, iTo);
         if (overLapCells.size() > 0)
         {
-            //Info << "To " << iTo << endl;
-            //Info << "cellToCell " << overLapCells << endl;
-
             cellToCell[iTo].setSize(overLapCells.size());
             forAll(overLapCells, j)
             {

src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C

@@ -289,11 +289,13 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
         if (debug)
         {
-            Info<< "sampledIsoSurface::getIsoFields() : volSubField "
+            InfoInFunction
+                << "volSubField "
                 << volSubFieldPtr_->name()
                 << " min:" << min(*volSubFieldPtr_).value()
                 << " max:" << max(*volSubFieldPtr_).value() << endl;
-            Info<< "sampledIsoSurface::getIsoFields() : pointSubField "
+            InfoInFunction
+                << "pointSubField "
                 << pointSubFieldPtr_->name()
                 << " min:" << gMin(pointSubFieldPtr_->internalField())
                 << " max:" << gMax(pointSubFieldPtr_->internalField()) << endl;

src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C

@@ -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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,8 +75,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
     {
         if (debug)
         {
-            Info<< "sampledIsoSurfaceCell::updateGeometry() : lookup "
+            InfoInFunction << "Lookup " << isoField_ << endl;
-                << isoField_ << endl;
         }
 
         cellFldPtr = &fvm.lookupObject<volScalarField>(isoField_);
@@ -87,8 +86,9 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
 
         if (debug)
         {
-            Info<< "sampledIsoSurfaceCell::updateGeometry() : reading "
+            InfoInFunction
-                << isoField_ << " from time " <<fvm.time().timeName()
+                << "Reading " << isoField_
+                << " from time " <<fvm.time().timeName()
                 << endl;
         }
 
@@ -212,15 +212,7 @@ Foam::sampledIsoSurfaceCell::sampledIsoSurfaceCell
     facesPtr_(NULL),
     prevTimeIndex_(-1),
     meshCells_(0)
-{
+{}
-//    dict.readIfPresent("zone", zoneKey_);
-//
-//    if (debug && zoneKey_.size() && mesh.cellZones().findZoneID(zoneKey_) < 0)
-//    {
-//        Info<< "cellZone " << zoneKey_
-//            << " not found - using entire mesh" << endl;
-//    }
-}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //

src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "sampledThresholdCellFaces.H"
-
 #include "dictionary.H"
 #include "volFields.H"
 #include "volPointInterpolation.H"
@@ -70,8 +69,7 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
     {
         if (debug)
         {
-            Info<< "sampledThresholdCellFaces::updateGeometry() : lookup "
+            InfoInFunction<< "Lookup " << fieldName_ << endl;
-                << fieldName_ << endl;
         }
 
         cellFldPtr = &fvm.lookupObject<volScalarField>(fieldName_);
@@ -82,8 +80,9 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
 
         if (debug)
         {
-            Info<< "sampledThresholdCellFaces::updateGeometry() : reading "
+            InfoInFunction
-                << fieldName_ << " from time " << fvm.time().timeName()
+                << "Reading " << fieldName_
+                << " from time " << fvm.time().timeName()
                 << endl;
         }
 
@@ -167,14 +166,6 @@ Foam::sampledThresholdCellFaces::sampledThresholdCellFaces
             << "require at least one of 'lowerLimit' or 'upperLimit'" << endl
             << abort(FatalError);
     }
-
-//    dict.readIfPresent("zone", zoneKey_);
-//
-//    if (debug && zoneKey_.size() && mesh.cellZones().findZoneID(zoneKey_) < 0)
-//    {
-//        Info<< "cellZone " << zoneKey_
-//            << " not found - using entire mesh" << endl;
-//    }
 }
 
 

src/surfMesh/MeshedSurface/MeshedSurface.C

@@ -600,8 +600,7 @@ bool Foam::MeshedSurface<Face>::stitchFaces
 
     if (verbose)
     {
-        Info<< "MeshedSurface::stitchFaces : Renumbering all faces"
+        InfoInFunction<< "Renumbering all faces" << endl;
-            << endl;
     }
 
     // Set the coordinates to the merged ones