From aa38e25c922addfa0c4c541b723eecb293971ba8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 20 Jan 2016 17:51:15 +0000
Subject: [PATCH] Info -> InfoInFunction and updated comments
---
src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C | 7 +-
src/OpenFOAM/db/Time/findInstance.C | 26 +++----
.../GeometricField/GeometricBoundaryField.C | 62 +++-------------
.../GeometricField/GeometricField.C | 72 ++++++++-----------
.../pointPatchField/pointPatchFieldNew.C | 20 +-----
.../GAMGProcAgglomeration.C | 7 +-
.../facePointPatch/facePointPatchNew.C | 7 +-
.../polyMesh/polyMeshCheck/polyMeshCheck.C | 37 ++--------
.../polyPatches/polyPatch/polyPatchNew.C | 15 ++--
.../polyMesh/zones/cellZone/cellZoneNew.C | 6 +-
.../polyMesh/zones/faceZone/faceZoneNew.C | 6 +-
.../polyMesh/zones/pointZone/pointZoneNew.C | 6 +-
.../PrimitivePatch/PrimitivePatchBdryPoints.C | 13 +---
.../PrimitivePatch/PrimitivePatchCheck.C | 22 ++----
.../PrimitivePatch/PrimitivePatchClear.C | 15 ++--
.../PrimitivePatch/PrimitivePatchEdgeLoops.C | 12 +---
.../PrimitivePatchPointAddressing.C | 16 ++---
.../polyMeshModifier/polyMeshModifierNew.C | 7 +-
src/edgeMesh/edgeMeshIO.C | 7 +-
.../fvPatchField/fvPatchFieldNew.C | 17 ++---
.../fvsPatchField/fvsPatchFieldNew.C | 35 ++-------
.../convectionScheme/convectionScheme.C | 12 +---
.../gradSchemes/gradScheme/gradScheme.C | 5 +-
.../snGradSchemes/snGradScheme/snGradScheme.C | 8 +--
src/finiteVolume/fvMesh/fvMeshGeometry.C | 49 ++++++-------
.../limitedSurfaceInterpolationScheme.C | 11 ++-
.../multivariateSurfaceInterpolationScheme.C | 8 +--
.../surfaceInterpolationScheme.C | 31 +++-----
src/lagrangian/basic/Cloud/Cloud.C | 5 +-
src/lagrangian/basic/particle/particle.C | 4 +-
.../coordinateSystems/coordinateSystem.C | 7 +-
.../mappedPolyPatch/mappedPatchBase.C | 7 +-
.../reactingOneDim/reactingOneDim.C | 8 +--
.../kinematicSingleLayer.C | 26 +++----
.../thermoSingleLayer/thermoSingleLayer.C | 14 ++--
.../thermalBaffle/thermalBaffle.C | 4 +-
.../MeshedSurfaceProxy/MeshedSurfaceProxy.C | 14 ++--
.../UnsortedMeshedSurface.C | 5 +-
.../basic/psiThermo/hePsiThermo.C | 8 +--
.../basic/rhoThermo/heRhoThermo.C | 6 +-
.../psiuReactionThermo/heheuPsiThermo.C | 8 +--
.../solidThermo/solidThermo/heSolidThermo.C | 6 +-
42 files changed, 201 insertions(+), 460 deletions(-)
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index f008767f6b7..1dd2c0531cd 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -31,7 +31,7 @@ License
namespace Foam
{
-defineTypeNameAndDebug(OFstream, 0);
+ defineTypeNameAndDebug(OFstream, 0);
}
@@ -103,9 +103,8 @@ Foam::OFstream::OFstream
{
if (debug)
{
- Info<< "OFstream::OFstream(const fileName&,"
- "streamFormat, versionNumber, compressionType) : "
- "could not open file " << pathname
+ InfoInFunction
+ << "Could not open file " << pathname
<< "for input\n"
"in stream " << info() << Foam::endl;
}
diff --git a/src/OpenFOAM/db/Time/findInstance.C b/src/OpenFOAM/db/Time/findInstance.C
index e12b9beca2f..a19581f0430 100644
--- a/src/OpenFOAM/db/Time/findInstance.C
+++ b/src/OpenFOAM/db/Time/findInstance.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
@@ -62,10 +62,8 @@ Foam::word Foam::Time::findInstance
{
if (debug)
{
- Info<< "Time::findInstance"
- "(const fileName&, const word&"
- ", const IOobject::readOption, const word&)"
- << " : found \"" << name
+ InfoInFunction
+ << "Found \"" << name
<< "\" in " << timeName()/dir
<< endl;
}
@@ -103,10 +101,8 @@ Foam::word Foam::Time::findInstance
{
if (debug)
{
- Info<< "Time::findInstance"
- "(const fileName&, const word&"
- ", const IOobject::readOption, const word&)"
- << " : found \"" << name
+ InfoInFunction
+ << "Found \"" << name
<< "\" in " << ts[instanceI].name()/dir
<< endl;
}
@@ -119,10 +115,8 @@ Foam::word Foam::Time::findInstance
{
if (debug)
{
- Info<< "Time::findInstance"
- "(const fileName&, const word&"
- ", const IOobject::readOption, const word&)"
- << " : hit stopInstance " << stopInstance
+ InfoInFunction
+ << "Hit stopInstance " << stopInstance
<< endl;
}
@@ -174,10 +168,8 @@ Foam::word Foam::Time::findInstance
{
if (debug)
{
- Info<< "Time::findInstance"
- "(const fileName&, const word&"
- ", const IOobject::readOption, const word&)"
- << " : found \"" << name
+ InfoInFunction
+ << "Found \"" << name
<< "\" in " << constant()/dir
<< endl;
}
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 2cc32642156..88fc8b81d2b 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -43,13 +43,7 @@ readField
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField::readField"
- "("
- "const DimensionedField<Type, GeoMesh>&, "
- "const dictionary&"
- ")"
- << endl;
+ InfoInFunction << endl;
}
@@ -230,11 +224,7 @@ GeometricBoundaryField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField::"
- "GeometricBoundaryField(const BoundaryMesh&, "
- "const DimensionedField<Type>&, const word&)"
- << endl;
+ InfoInFunction << endl;
}
forAll(bmesh_, patchi)
@@ -268,16 +258,7 @@ GeometricBoundaryField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField::"
- "GeometricBoundaryField"
- "("
- "const BoundaryMesh&, "
- "const DimensionedField<Type>&, "
- "const wordList&, "
- "const wordList&"
- ")"
- << endl;
+ InfoInFunction << endl;
}
if
@@ -344,15 +325,7 @@ GeometricBoundaryField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField::"
- "GeometricBoundaryField"
- "("
- "const BoundaryMesh&, "
- "const DimensionedField<Type, GeoMesh>&, "
- "const PtrLIst<PatchField<Type>>&"
- ")"
- << endl;
+ InfoInFunction << endl;
}
forAll(bmesh_, patchi)
@@ -376,15 +349,7 @@ GeometricBoundaryField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField::"
- "GeometricBoundaryField"
- "("
- "const DimensionedField<Type, GeoMesh>&, "
- "const typename GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField&"
- ")"
- << endl;
+ InfoInFunction << endl;
}
forAll(bmesh_, patchi)
@@ -412,14 +377,7 @@ GeometricBoundaryField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField::"
- "GeometricBoundaryField"
- "("
- "const GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField&"
- ")"
- << endl;
+ InfoInFunction << endl;
}
}
@@ -448,9 +406,7 @@ updateCoeffs()
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField::"
- "updateCoeffs()" << endl;
+ InfoInFunction << endl;
}
forAll(*this, patchi)
@@ -466,9 +422,7 @@ evaluate()
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::"
- "GeometricBoundaryField::"
- "evaluate()" << endl;
+ InfoInFunction << endl;
}
if
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index c88a4ac4835..4d32e95ae23 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -146,7 +146,7 @@ bool Foam::GeometricField<Type, PatchField, GeoMesh>::readOldTimeIfPresent()
{
if (debug)
{
- Info<< "Reading old time level for field"
+ InfoInFunction << "Reading old time level for field"
<< endl << this->info() << endl;
}
@@ -189,9 +189,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "creating temporary"
- << endl << this->info() << endl;
+ InfoInFunction << "Creating temporary" << endl << this->info() << endl;
}
readIfPresent();
@@ -216,9 +214,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "creating temporary"
- << endl << this->info() << endl;
+ InfoInFunction << "Creating temporary" << endl << this->info() << endl;
}
readIfPresent();
@@ -242,9 +238,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "creating temporary"
- << endl << this->info() << endl;
+ InfoInFunction << "Creating temporary" << endl << this->info() << endl;
}
boundaryField_ == dt.value();
@@ -271,9 +265,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "creating temporary"
- << endl << this->info() << endl;
+ InfoInFunction << "Creating temporary" << endl << this->info() << endl;
}
boundaryField_ == dt.value();
@@ -300,9 +292,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing from components"
- << endl << this->info() << endl;
+ InfoInFunction
+ << "Constructing from components" << endl << this->info() << endl;
}
readIfPresent();
@@ -338,9 +329,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
if (debug)
{
- Info<< "Finishing read-construct of "
- "GeometricField<Type, PatchField, GeoMesh>"
- << endl << this->info() << endl;
+ InfoInFunction
+ << "Finishing read-construction of" << endl << this->info() << endl;
}
}
@@ -375,8 +365,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
if (debug)
{
- Info<< "Finishing dictionary-construct of "
- "GeometricField<Type, PatchField, GeoMesh>"
+ InfoInFunction
+ << "Finishing dictionary-construct of "
<< endl << this->info() << endl;
}
}
@@ -396,9 +386,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing as copy"
- << endl << this->info() << endl;
+ InfoInFunction
+ << "Constructing as copy" << endl << this->info() << endl;
}
if (gf.field0Ptr_)
@@ -432,9 +421,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing as copy"
- << endl << this->info() << endl;
+ InfoInFunction
+ << "Constructing as copy" << endl << this->info() << endl;
}
this->writeOpt() = IOobject::NO_WRITE;
@@ -459,8 +447,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing as copy resetting IO params"
+ InfoInFunction
+ << "Constructing as copy resetting IO params"
<< endl << this->info() << endl;
}
@@ -496,8 +484,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing from tmp resetting IO params"
+ InfoInFunction
+ << "Constructing from tmp resetting IO params"
<< endl << this->info() << endl;
}
@@ -523,8 +511,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing as copy resetting name"
+ InfoInFunction
+ << "Constructing as copy resetting name"
<< endl << this->info() << endl;
}
@@ -560,8 +548,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing from tmp resetting name"
+ InfoInFunction
+ << "Constructing from tmp resetting name"
<< endl << this->info() << endl;
}
@@ -586,8 +574,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing as copy resetting IO params"
+ InfoInFunction
+ << "Constructing as copy resetting IO params"
<< endl << this->info() << endl;
}
@@ -628,8 +616,8 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
{
if (debug)
{
- Info<< "GeometricField<Type, PatchField, GeoMesh>::GeometricField : "
- "constructing as copy resetting IO params and patch types"
+ InfoInFunction
+ << "Constructing as copy resetting IO params and patch types"
<< endl << this->info() << endl;
}
@@ -721,7 +709,8 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::storeOldTime() const
if (debug)
{
- Info<< "Storing old time field for field" << endl
+ InfoInFunction
+ << "Storing old time field for field" << endl
<< this->info() << endl;
}
@@ -797,7 +786,8 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::storePrevIter() const
{
if (debug)
{
- Info<< "Allocating previous iteration field" << endl
+ InfoInFunction
+ << "Allocating previous iteration field" << endl
<< this->info() << endl;
}
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
index 4a05a01acb2..277f4c54071 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C
@@ -36,11 +36,7 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
{
if (debug)
{
- Info<< "PointPatchField<Type>::"
- "New(const word&, const word&"
- ", const pointPatch&, const Field<Type>&) : "
- "constructing pointPatchField<Type>"
- << endl;
+ InfoInFunction << "Constructing pointPatchField<Type>" << endl;
}
typename pointPatchConstructorTable::iterator cstrIter =
@@ -116,10 +112,7 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
{
if (debug)
{
- Info<< "PointPatchField<Type>::"
- "New(const pointPatch&, const Field<Type>&, const dictionary&)"
- " : constructing pointPatchField<Type>"
- << endl;
+ InfoInFunction << "Constructing pointPatchField<Type>" << endl;
}
word patchFieldType(dict.lookup("type"));
@@ -186,8 +179,6 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
}
-// Return a pointer to a new patch created on freestore from
-// a given pointPatchField<Type> mapped onto a new patch
template<class Type>
Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
(
@@ -199,12 +190,7 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
{
if (debug)
{
- Info<< "PointPatchField<Type>::"
- "New(const pointPatchField<Type>&,"
- " const pointPatch&, const Field<Type>&, "
- "const pointPatchFieldMapper&) : "
- "constructing pointPatchField<Type>"
- << endl;
+ InfoInFunction << "Constructing pointPatchField<Type>" << endl;
}
typename patchMapperConstructorTable::iterator cstrIter =
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
index 9233d11cfc3..6c219acacda 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.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
@@ -358,10 +358,7 @@ Foam::autoPtr<Foam::GAMGProcAgglomeration> Foam::GAMGProcAgglomeration::New
{
if (debug)
{
- Info<< "GAMGProcAgglomeration::New(const word&, GAMGAgglomeration&"
- ", const dictionary&) : "
- "constructing GAMGProcAgglomeration"
- << endl;
+ InfoInFunction << "Constructing GAMGProcAgglomeration" << endl;
}
GAMGAgglomerationConstructorTable::iterator cstrIter =
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
index b5a1b29dc9a..8969bacec96 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatchNew.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
@@ -35,10 +35,7 @@ Foam::autoPtr<Foam::facePointPatch> Foam::facePointPatch::New
{
if (debug)
{
- Info<< "facePointPatch::New(const polyPatch&, "
- << " const pointBoundaryMesh&) : "
- << "constructing facePointPatch"
- << endl;
+ InfoInFunction << "Constructing facePointPatch" << endl;
}
polyPatchConstructorTable::iterator cstrIter =
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
index f4716969867..e75191e3403 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@@ -41,9 +41,7 @@ bool Foam::polyMesh::checkFaceOrthogonality
{
if (debug)
{
- Info<< "bool polyMesh::checkFaceOrthogonality("
- << "const bool, labelHashSet*) const: "
- << "checking mesh non-orthogonality" << endl;
+ InfoInFunction << "Checking mesh non-orthogonality" << endl;
}
const labelList& own = faceOwner();
@@ -182,9 +180,7 @@ bool Foam::polyMesh::checkFaceSkewness
{
if (debug)
{
- Info<< "bool polyMesh::checkFaceSkewnesss("
- << "const bool, labelHashSet*) const: "
- << "checking face skewness" << endl;
+ InfoInFunction << "Checking face skewness" << endl;
}
const labelList& own = faceOwner();
@@ -289,9 +285,7 @@ bool Foam::polyMesh::checkEdgeAlignment
{
if (debug)
{
- Info<< "bool polyMesh::checkEdgeAlignment("
- << "const bool, const Vector<label>&, labelHashSet*) const: "
- << "checking edge alignment" << endl;
+ InfoInFunction << "Checking edge alignment" << endl;
}
label nDirs = 0;
@@ -422,9 +416,7 @@ bool Foam::polyMesh::checkCellDeterminant
if (debug)
{
- Info<< "bool polyMesh::checkCellDeterminant(const bool"
- << ", labelHashSet*) const: "
- << "checking for under-determined cells" << endl;
+ InfoInFunction << "Checking for under-determined cells" << endl;
}
tmp<scalarField> tcellDeterminant = primitiveMeshTools::cellDeterminant
@@ -506,9 +498,7 @@ bool Foam::polyMesh::checkFaceWeight
{
if (debug)
{
- Info<< "bool polyMesh::checkFaceWeight(const bool"
- << ", labelHashSet*) const: "
- << "checking for low face interpolation weights" << endl;
+ InfoInFunction << "Checking for low face interpolation weights" << endl;
}
tmp<scalarField> tfaceWght = polyMeshTools::faceWeights
@@ -601,9 +591,7 @@ bool Foam::polyMesh::checkVolRatio
{
if (debug)
{
- Info<< "bool polyMesh::checkVolRatio(const bool"
- << ", labelHashSet*) const: "
- << "checking for volume ratio < " << minRatio << endl;
+ InfoInFunction << "Checking for volume ratio < " << minRatio << endl;
}
tmp<scalarField> tvolRatio = polyMeshTools::volRatio(*this, cellVols);
@@ -680,19 +668,6 @@ bool Foam::polyMesh::checkVolRatio
}
-//- Could override checkClosedBoundary to not look at (collocated!) coupled
-// faces
-//bool Foam::polyMesh::checkClosedBoundary(const bool report) const
-//{
-// return primitiveMesh::checkClosedBoundary
-// (
-// faceAreas(),
-// report,
-// syncTools::getInternalOrCollocatedCoupledFaces(*this)
-// );
-//}
-
-
bool Foam::polyMesh::checkFaceOrthogonality
(
const bool report,
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
index b161194fc3b..e44810932db 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.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
@@ -40,10 +40,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
{
if (debug)
{
- Info<< "polyPatch::New(const word&, const word&, const label, "
- "const label, const label, const polyBoundaryMesh&) : "
- "constructing polyPatch"
- << endl;
+ InfoInFunction << "Constructing polyPatch" << endl;
}
wordConstructorTable::iterator cstrIter =
@@ -84,9 +81,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
{
if (debug)
{
- Info<< "polyPatch::New(const word&, const dictionary&, const label, "
- "const polyBoundaryMesh&) : constructing polyPatch"
- << endl;
+ InfoInFunction << "Constructing polyPatch" << endl;
}
word patchType(dict.lookup("type"));
@@ -107,9 +102,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
{
if (debug)
{
- Info<< "polyPatch::New(const word&, const word&, const dictionary&, "
- "const label, const polyBoundaryMesh&) : constructing polyPatch"
- << endl;
+ InfoInFunction << "Constructing polyPatch" << endl;
}
dictionaryConstructorTable::iterator cstrIter =
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
index 983ff5d8b8a..fd6ed39cdd5 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZoneNew.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
@@ -38,9 +38,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
{
if (debug)
{
- Info<< "cellZone::New(const word&, const dictionary&, const label, "
- "const cellZoneMesh&) : constructing cellZone " << name
- << endl;
+ InfoInFunction << "Constructing cellZone " << name << endl;
}
const word zoneType(dict.lookup("type"));
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
index 8c75b01c088..2b6954b340c 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZoneNew.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
@@ -38,9 +38,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
{
if (debug)
{
- Info<< "faceZone::New(const word&, const dictionary&, const label, "
- "const faceZoneMesh&) : constructing faceZone " << name
- << endl;
+ InfoInFunction << "Constructing faceZone " << name << endl;
}
const word zoneType(dict.lookup("type"));
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
index f2ddb5480c5..3c5feac399e 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZoneNew.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
@@ -38,9 +38,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
{
if (debug)
{
- Info<< "pointZone::New(const word&, const dictionary&, const label, "
- "const pointZoneMesh&) : constructing pointZone " << name
- << endl;
+ InfoInFunction << "Constructing pointZone " << name << endl;
}
const word zoneType(dict.lookup("type"));
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
index fe0a80ef28d..fc3cdce9028 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.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
@@ -26,7 +26,6 @@ License
#include "PrimitivePatch.H"
#include "HashSet.H"
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template
@@ -42,10 +41,7 @@ calcBdryPoints() const
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "calcBdryPoints() : "
- << "calculating boundary points"
- << endl;
+ InfoInFunction << "Calculating boundary points" << endl;
}
if (boundaryPointsPtr_)
@@ -74,10 +70,7 @@ calcBdryPoints() const
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "calcBdryPoints() : "
- << "finished calculating boundary points"
- << endl;
+ Info<< " Finished." << endl;
}
}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
index 68be5b7ab58..28452cd286a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.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
@@ -121,10 +121,7 @@ surfaceType() const
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- "surfaceType() : "
- "calculating patch topology"
- << endl;
+ InfoInFunction << "Calculating patch topology" << endl;
}
const labelListList& edgeFcs = edgeFaces();
@@ -151,10 +148,7 @@ surfaceType() const
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- "surfaceType() : "
- "finished calculating patch topology"
- << endl;
+ Info<< " Finished." << endl;
}
return pType;
@@ -178,10 +172,7 @@ checkTopology
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- "checkTopology(const bool, labelHashSet&) : "
- "checking patch topology"
- << endl;
+ InfoInFunction << "Checking patch topology" << endl;
}
// Check edgeFaces
@@ -217,10 +208,7 @@ checkTopology
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- "checkTopology(const bool, labelHashSet&) : "
- "finished checking patch topology"
- << endl;
+ Info<< " Finished." << endl;
}
return illegalTopo;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
index d4aa873dadb..96962082592 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -42,9 +42,7 @@ clearGeom()
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "clearGeom() : clearing geometric data"
- << endl;
+ InfoInFunction << "Clearing geometric data" << endl;
}
deleteDemandDrivenData(localPointsPtr_);
@@ -67,9 +65,7 @@ clearTopology()
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "clearTopology() : clearing patch addressing"
- << endl;
+ InfoInFunction << "Clearing patch addressing" << endl;
}
// group created and destroyed together
@@ -109,10 +105,7 @@ clearPatchMeshAddr()
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "clearPatchMeshAddr() : "
- << "clearing patch-mesh addressing"
- << endl;
+ InfoInFunction << "Clearing patch-mesh addressing" << endl;
}
deleteDemandDrivenData(meshPointsPtr_);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
index 3a7501083a4..48094cce32c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.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
@@ -45,10 +45,7 @@ calcEdgeLoops() const
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "calcEdgeLoops() : "
- << "calculating boundary edge loops"
- << endl;
+ InfoInFunction << "Calculating boundary edge loops" << endl;
}
if (edgeLoopsPtr_)
@@ -153,10 +150,7 @@ calcEdgeLoops() const
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "calcEdgeLoops() : "
- << "finished calculating boundary edge loops"
- << endl;
+ Info<< " Finished." << endl;
}
}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index 497e38f918d..1e9ad11835b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -46,9 +46,7 @@ calcPointEdges() const
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "calcPointEdges() : calculating pointEdges"
- << endl;
+ InfoInFunction << "Calculating pointEdges" << endl;
}
if (pointEdgesPtr_)
@@ -68,9 +66,7 @@ calcPointEdges() const
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "calcPointEdges() finished calculating pointEdges"
- << endl;
+ Info<< " Finished." << endl;
}
}
@@ -88,9 +84,7 @@ calcPointFaces() const
{
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "calcPointFaces() : calculating pointFaces"
- << endl;
+ InfoInFunction << "Calculating pointFaces" << endl;
}
if (pointFacesPtr_)
@@ -135,9 +129,7 @@ calcPointFaces() const
if (debug)
{
- Info<< "PrimitivePatch<Face, FaceList, PointField, PointType>::"
- << "calcPointFaces() finished calculating pointFaces"
- << endl;
+ Info<< " Finished." << endl;
}
}
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
index 23f90fefca8..e85f4d59593 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.C
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifierNew.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
@@ -38,10 +38,7 @@ Foam::autoPtr<Foam::polyMeshModifier> Foam::polyMeshModifier::New
{
if (debug)
{
- Info<< "polyMeshModifier::New(const word&, const dictionary&, "
- << "const label, const polyTopoChanger&) : "
- << "constructing polyMeshModifier"
- << endl;
+ InfoInFunction << "Constructing polyMeshModifier" << endl;
}
const word modifierType(dict.lookup("type"));
diff --git a/src/edgeMesh/edgeMeshIO.C b/src/edgeMesh/edgeMeshIO.C
index 074510f2c10..e8bc88f4026 100644
--- a/src/edgeMesh/edgeMeshIO.C
+++ b/src/edgeMesh/edgeMeshIO.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
@@ -91,10 +91,7 @@ void Foam::edgeMesh::write
{
if (debug)
{
- Info<< "edgeMesh::write"
- "(const fileName&, const edgeMesh&) : "
- "writing to " << name
- << endl;
+ InfoInFunction << "Writing to " << name << endl;
}
const word ext = name.ext();
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
index af6e721b8b4..e8f97d0cf8a 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchFieldNew.C
@@ -36,10 +36,8 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
{
if (debug)
{
- Info<< "fvPatchField<Type>::New(const word&, const word&, "
- "const fvPatch&, const DimensionedField<Type, volMesh>&) :"
- " patchFieldType="
- << patchFieldType
+ InfoInFunction
+ << "patchFieldType = " << patchFieldType
<< " : " << p.type()
<< endl;
}
@@ -113,9 +111,8 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
if (debug)
{
- Info<< "fvPatchField<Type>::New(const fvPatch&, "
- "const DimensionedField<Type, volMesh>&, "
- "const dictionary&) : patchFieldType=" << patchFieldType
+ InfoInFunction
+ << "patchFieldType = " << patchFieldType
<< endl;
}
@@ -182,11 +179,7 @@ Foam::tmp<Foam::fvPatchField<Type>> Foam::fvPatchField<Type>::New
{
if (debug)
{
- Info<< "fvPatchField<Type>::New(const fvPatchField<Type>&, "
- "const fvPatch&, const DimensionedField<Type, volMesh>&, "
- "const fvPatchFieldMapper&) : "
- "constructing fvPatchField<Type>"
- << endl;
+ InfoInFunction << "Constructing fvPatchField<Type>" << endl;
}
typename patchMapperConstructorTable::iterator cstrIter =
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
index c47e89ada24..9becf00ccfd 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFieldNew.C
@@ -23,15 +23,10 @@ License
\*---------------------------------------------------------------------------*/
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
template<class Type>
-tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
+Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
(
const word& patchFieldType,
const word& actualPatchType,
@@ -41,10 +36,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
{
if (debug)
{
- Info<< "fvsPatchField<Type>::New(const word&, const word&"
- ", const fvPatch&, const Field<Type>&) : "
- "constructing fvsPatchField<Type>"
- << endl;
+ InfoInFunction << "Constructing fvsPatchField<Type>" << endl;
}
typename patchConstructorTable::iterator cstrIter =
@@ -86,7 +78,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
template<class Type>
-tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
+Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
(
const word& patchFieldType,
const fvPatch& p,
@@ -98,7 +90,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
template<class Type>
-tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
+Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
@@ -107,10 +99,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
{
if (debug)
{
- Info<< "fvsPatchField<Type>::New(const fvPatch&, const Field<Type>&, "
- "const dictionary&) : "
- "constructing fvsPatchField<Type>"
- << endl;
+ InfoInFunction << "Constructing fvsPatchField<Type>" << endl;
}
const word patchFieldType(dict.lookup("type"));
@@ -167,10 +156,8 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
}
-// Return a pointer to a new patch created on freestore from
-// a given fvsPatchField<Type> mapped onto a new patch
template<class Type>
-tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
+Foam::tmp<Foam::fvsPatchField<Type>> Foam::fvsPatchField<Type>::New
(
const fvsPatchField<Type>& ptf,
const fvPatch& p,
@@ -180,11 +167,7 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
{
if (debug)
{
- Info<< "fvsPatchField<Type>::New(const fvsPatchField<Type>&,"
- " const fvPatch&, const Field<Type>&, "
- "const fvPatchFieldMapper&) : "
- "constructing fvsPatchField<Type>"
- << endl;
+ InfoInFunction << "Constructing fvsPatchField<Type>" << endl;
}
typename patchMapperConstructorTable::iterator cstrIter =
@@ -213,8 +196,4 @@ tmp<fvsPatchField<Type>> fvsPatchField<Type>::New
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
index 851ff9fe846..d3e257b0c2b 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.C
@@ -63,10 +63,7 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
{
if (fv::debug)
{
- Info<< "convectionScheme<Type>::New"
- "(const fvMesh&, const surfaceScalarField&, Istream&) : "
- "constructing convectionScheme<Type>"
- << endl;
+ InfoInFunction << "Constructing convectionScheme<Type>" << endl;
}
if (schemeData.eof())
@@ -112,12 +109,7 @@ tmp<convectionScheme<Type>> convectionScheme<Type>::New
{
if (fv::debug)
{
- Info<< "convectionScheme<Type>::New"
- "(const fvMesh&, "
- "const typename multivariateSurfaceInterpolationScheme<Type>"
- "::fieldTable&, const surfaceScalarField&, Istream&) : "
- "constructing convectionScheme<Type>"
- << endl;
+ InfoInFunction << "Constructing convectionScheme<Type>" << endl;
}
if (schemeData.eof())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 318bdcd8fa7..2c045538e2e 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -38,10 +38,7 @@ Foam::tmp<Foam::fv::gradScheme<Type>> Foam::fv::gradScheme<Type>::New
{
if (fv::debug)
{
- Info<< "gradScheme<Type>::New"
- "(const fvMesh& mesh, Istream& schemeData) : "
- "constructing gradScheme<Type>"
- << endl;
+ InfoInFunction << "Constructing gradScheme<Type>" << endl;
}
if (schemeData.eof())
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index 0335b0d8df9..c667c4410de 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -50,9 +50,7 @@ tmp<snGradScheme<Type>> snGradScheme<Type>::New
{
if (fv::debug)
{
- Info<< "snGradScheme<Type>::New(const fvMesh&, Istream&)"
- " : constructing snGradScheme<Type>"
- << endl;
+ InfoInFunction << "Constructing snGradScheme<Type>" << endl;
}
if (schemeData.eof())
@@ -171,8 +169,6 @@ snGradScheme<Type>::sndGrad
}
-//- Return the face-snGrad of the given cell field
-// with explicit correction
template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
snGradScheme<Type>::snGrad
@@ -194,8 +190,6 @@ snGradScheme<Type>::snGrad
}
-//- Return the face-snGrad of the given cell field
-// with explicit correction
template<class Type>
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
snGradScheme<Type>::snGrad
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index c35da60ef0a..17bb30ec055 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -33,20 +33,13 @@ License
#include "cyclicFvPatchFields.H"
#include "cyclicAMIFvPatchFields.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void fvMesh::makeSf() const
+void Foam::fvMesh::makeSf() const
{
if (debug)
{
- Info<< "void fvMesh::makeSf() : "
- << "assembling face areas"
- << endl;
+ InfoInFunction << "Assembling face areas" << endl;
}
// It is an error to attempt to recalculate
@@ -77,7 +70,7 @@ void fvMesh::makeSf() const
}
-void fvMesh::makeMagSf() const
+void Foam::fvMesh::makeMagSf() const
{
if (debug)
{
@@ -113,7 +106,7 @@ void fvMesh::makeMagSf() const
}
-void fvMesh::makeC() const
+void Foam::fvMesh::makeC() const
{
if (debug)
{
@@ -153,7 +146,7 @@ void fvMesh::makeC() const
}
-void fvMesh::makeCf() const
+void Foam::fvMesh::makeCf() const
{
if (debug)
{
@@ -190,7 +183,7 @@ void fvMesh::makeCf() const
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-const volScalarField::DimensionedInternalField& fvMesh::V() const
+const Foam::volScalarField::DimensionedInternalField& Foam::fvMesh::V() const
{
if (!VPtr_)
{
@@ -221,7 +214,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V() const
}
-const volScalarField::DimensionedInternalField& fvMesh::V0() const
+const Foam::volScalarField::DimensionedInternalField& Foam::fvMesh::V0() const
{
if (!V0Ptr_)
{
@@ -234,7 +227,7 @@ const volScalarField::DimensionedInternalField& fvMesh::V0() const
}
-volScalarField::DimensionedInternalField& fvMesh::setV0()
+Foam::volScalarField::DimensionedInternalField& Foam::fvMesh::setV0()
{
if (!V0Ptr_)
{
@@ -247,7 +240,7 @@ volScalarField::DimensionedInternalField& fvMesh::setV0()
}
-const volScalarField::DimensionedInternalField& fvMesh::V00() const
+const Foam::volScalarField::DimensionedInternalField& Foam::fvMesh::V00() const
{
if (!V00Ptr_)
{
@@ -278,7 +271,8 @@ const volScalarField::DimensionedInternalField& fvMesh::V00() const
}
-tmp<volScalarField::DimensionedInternalField> fvMesh::Vsc() const
+Foam::tmp<Foam::volScalarField::DimensionedInternalField>
+Foam::fvMesh::Vsc() const
{
if (moving() && time().subCycling())
{
@@ -306,7 +300,8 @@ tmp<volScalarField::DimensionedInternalField> fvMesh::Vsc() const
}
-tmp<volScalarField::DimensionedInternalField> fvMesh::Vsc0() const
+Foam::tmp<Foam::volScalarField::DimensionedInternalField>
+Foam::fvMesh::Vsc0() const
{
if (moving() && time().subCycling())
{
@@ -335,7 +330,7 @@ tmp<volScalarField::DimensionedInternalField> fvMesh::Vsc0() const
}
-const surfaceVectorField& fvMesh::Sf() const
+const Foam::surfaceVectorField& Foam::fvMesh::Sf() const
{
if (!SfPtr_)
{
@@ -346,7 +341,7 @@ const surfaceVectorField& fvMesh::Sf() const
}
-const surfaceScalarField& fvMesh::magSf() const
+const Foam::surfaceScalarField& Foam::fvMesh::magSf() const
{
if (!magSfPtr_)
{
@@ -357,7 +352,7 @@ const surfaceScalarField& fvMesh::magSf() const
}
-const volVectorField& fvMesh::C() const
+const Foam::volVectorField& Foam::fvMesh::C() const
{
if (!CPtr_)
{
@@ -368,7 +363,7 @@ const volVectorField& fvMesh::C() const
}
-const surfaceVectorField& fvMesh::Cf() const
+const Foam::surfaceVectorField& Foam::fvMesh::Cf() const
{
if (!CfPtr_)
{
@@ -379,7 +374,7 @@ const surfaceVectorField& fvMesh::Cf() const
}
-tmp<surfaceVectorField> fvMesh::delta() const
+Foam::tmp<Foam::surfaceVectorField> Foam::fvMesh::delta() const
{
if (debug)
{
@@ -424,7 +419,7 @@ tmp<surfaceVectorField> fvMesh::delta() const
}
-const surfaceScalarField& fvMesh::phi() const
+const Foam::surfaceScalarField& Foam::fvMesh::phi() const
{
if (!phiPtr_)
{
@@ -444,7 +439,7 @@ const surfaceScalarField& fvMesh::phi() const
}
-surfaceScalarField& fvMesh::setPhi()
+Foam::surfaceScalarField& Foam::fvMesh::setPhi()
{
if (!phiPtr_)
{
@@ -457,8 +452,4 @@ surfaceScalarField& fvMesh::setPhi()
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index 388683c2f97..9b26d679ada 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -40,10 +40,8 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
{
if (surfaceInterpolation::debug)
{
- Info<< "limitedSurfaceInterpolationScheme<Type>::"
- "New(const fvMesh&, Istream&)"
- " : constructing limitedSurfaceInterpolationScheme<Type>"
- << endl;
+ InfoInFunction
+ << "Constructing limitedSurfaceInterpolationScheme<Type>" << endl;
}
if (schemeData.eof())
@@ -90,9 +88,8 @@ Foam::limitedSurfaceInterpolationScheme<Type>::New
{
if (surfaceInterpolation::debug)
{
- Info<< "limitedSurfaceInterpolationScheme<Type>::New"
- "(const fvMesh&, const surfaceScalarField&, Istream&) : "
- "constructing limitedSurfaceInterpolationScheme<Type>"
+ InfoInFunction
+ << "Constructing limitedSurfaceInterpolationScheme<Type>"
<< endl;
}
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
index 516f2387f01..62288018b0c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.C
@@ -33,7 +33,6 @@ Description
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-//- Construct from face-flux field and coefficient
template<class Type>
Foam::multivariateSurfaceInterpolationScheme<Type>::
multivariateSurfaceInterpolationScheme
@@ -63,11 +62,8 @@ Foam::multivariateSurfaceInterpolationScheme<Type>::New
{
if (fv::debug)
{
- Info<< "multivariateSurfaceInterpolationScheme<Type>::New"
- "(const fvMesh& mesh, const fieldTable&, "
- "const surfaceScalarField&, Istream&) : "
- "constructing surfaceInterpolationScheme<Type>"
- << endl;
+ InfoInFunction
+ << "Constructing surfaceInterpolationScheme<Type>" << endl;
}
const word schemeName(schemeData);
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 462d93d2654..43bcbe9d1cf 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -54,11 +54,7 @@ Foam::surfaceInterpolationScheme<Type>::New
if (surfaceInterpolation::debug || surfaceInterpolationScheme<Type>::debug)
{
- Info<< "surfaceInterpolationScheme<Type>::New"
- "(const fvMesh&, Istream&)"
- " : discretisation scheme === "
- << schemeName
- << endl;
+ InfoInFunction << "Discretisation scheme = " << schemeName << endl;
}
typename MeshConstructorTable::iterator constructorIter =
@@ -105,11 +101,8 @@ Foam::surfaceInterpolationScheme<Type>::New
if (surfaceInterpolation::debug || surfaceInterpolationScheme<Type>::debug)
{
- Info<< "surfaceInterpolationScheme<Type>::New"
- "(const fvMesh&, const surfaceScalarField&, Istream&)"
- " : discretisation scheme = "
- << schemeName
- << endl;
+ InfoInFunction
+ << "Discretisation scheme = " << schemeName << endl;
}
typename MeshFluxConstructorTable::iterator constructorIter =
@@ -151,11 +144,8 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
{
if (surfaceInterpolation::debug)
{
- Info<< "surfaceInterpolationScheme<Type>::uncorrectedInterpolate"
- "(const GeometricField<Type, fvPatchField, volMesh>&, "
- "const tmp<surfaceScalarField>&, "
- "const tmp<surfaceScalarField>&) : "
- "interpolating "
+ InfoInFunction
+ << "Interpolating "
<< vf.type() << " "
<< vf.name()
<< " from cells to faces "
@@ -234,10 +224,8 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
{
if (surfaceInterpolation::debug)
{
- Info<< "surfaceInterpolationScheme<Type>::interpolate"
- "(const GeometricField<Type, fvPatchField, volMesh>&, "
- "const tmp<surfaceScalarField>&) : "
- "interpolating "
+ InfoInFunction
+ << "Interpolating "
<< vf.type() << " "
<< vf.name()
<< " from cells to faces "
@@ -310,9 +298,8 @@ Foam::surfaceInterpolationScheme<Type>::interpolate
{
if (surfaceInterpolation::debug)
{
- Info<< "surfaceInterpolationScheme<Type>::interpolate"
- "(const GeometricField<Type, fvPatchField, volMesh>&) : "
- "interpolating "
+ InfoInFunction
+ << "Interpolating "
<< vf.type() << " "
<< vf.name()
<< " from cells to faces"
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 9b959cfafa9..4a573a46ee3 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -402,15 +402,14 @@ void Foam::Cloud<ParticleType>::autoMap
{
if (cloud::debug)
{
- Info<< "Cloud<ParticleType>::autoMap(TrackData&, const mapPolyMesh&) "
- << "for lagrangian cloud " << cloud::name() << endl;
+ InfoInFunction << "for lagrangian cloud " << cloud::name() << endl;
}
const labelList& reverseCellMap = mapper.reverseCellMap();
const labelList& reverseFaceMap = mapper.reverseFaceMap();
// Reset stored data that relies on the mesh
-// polyMesh_.clearCellTree();
+ // polyMesh_.clearCellTree();
cellWallFacesPtr_.clear();
// Ask for the tetBasePtIs to trigger all processors to build
diff --git a/src/lagrangian/basic/particle/particle.C b/src/lagrangian/basic/particle/particle.C
index c71559d042e..9bf602eaba0 100644
--- a/src/lagrangian/basic/particle/particle.C
+++ b/src/lagrangian/basic/particle/particle.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
@@ -130,8 +130,6 @@ void Foam::particle::transformProperties(const vector&)
Foam::scalar Foam::particle::wallImpactDistance(const vector&) const
{
- Info<< "particle::wallImpactDistance" << endl;
-
return 0.0;
}
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index 68aa5e06f90..e3d9a53c10b 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.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
@@ -139,9 +139,8 @@ Foam::coordinateSystem::coordinateSystem
if (debug)
{
- Info<< "coordinateSystem::coordinateSystem"
- "(const objectRegistry&, const dictionary&):"
- << nl << "using global coordinate system: "
+ InfoInFunction
+ << "Using global coordinate system: "
<< key << "=" << index << endl;
}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 7cbb79b7b17..22e92fa7c36 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.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
@@ -478,8 +478,9 @@ void Foam::mappedPatchBase::findSamples
if (debug)
{
- Info<< "mappedPatchBase::findSamples on mesh " << sampleRegion()
- << " : " << endl;
+ InfoInFunction
+ << "mesh " << sampleRegion() << " : " << endl;
+
forAll(nearest, sampleI)
{
label procI = nearest[sampleI].second().second();
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index 7b0a694e900..ae118fa10a3 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -243,7 +243,7 @@ void reactingOneDim::solveContinuity()
{
if (debug)
{
- Info<< "reactingOneDim::solveContinuity()" << endl;
+ InfoInFunction << endl;
}
const scalarField mass0 = rho_*regionMesh().V();
@@ -275,7 +275,7 @@ void reactingOneDim::solveSpeciesMass()
{
if (debug)
{
- Info<< "reactingOneDim::solveSpeciesMass()" << endl;
+ InfoInFunction << endl;
}
volScalarField Yt(0.0*Ys_[0]);
@@ -316,7 +316,7 @@ void reactingOneDim::solveEnergy()
{
if (debug)
{
- Info<< "reactingOneDim::solveEnergy()" << endl;
+ InfoInFunction << endl;
}
tmp<volScalarField> alpha(solidThermo_.alpha());
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 13a4cb86273..e87619f67ff 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -83,7 +83,7 @@ void kinematicSingleLayer::resetPrimaryRegionSourceTerms()
{
if (debug)
{
- Info<< "kinematicSingleLayer::resetPrimaryRegionSourceTerms()" << endl;
+ InfoInFunction << endl;
}
rhoSpPrimary_ == dimensionedScalar("zero", rhoSp_.dimensions(), 0.0);
@@ -96,8 +96,7 @@ void kinematicSingleLayer::transferPrimaryRegionThermoFields()
{
if (debug)
{
- Info<< "kinematicSingleLayer::"
- << "transferPrimaryRegionThermoFields()" << endl;
+ InfoInFunction << endl;
}
// Update fields from primary region via direct mapped
@@ -113,8 +112,7 @@ void kinematicSingleLayer::transferPrimaryRegionSourceFields()
{
if (debug)
{
- Info<< "kinematicSingleLayer::"
- << "transferPrimaryRegionSourceFields()" << endl;
+ InfoInFunction << endl;
}
// Convert accummulated source terms into per unit area per unit time
@@ -201,7 +199,7 @@ void kinematicSingleLayer::updateSubmodels()
{
if (debug)
{
- Info<< "kinematicSingleLayer::updateSubmodels()" << endl;
+ InfoInFunction << endl;
}
// Update injection model - mass returned is mass available for injection
@@ -240,7 +238,8 @@ void kinematicSingleLayer::continuityCheck()
cumulativeContErr_ += globalContErr;
- Info<< "Surface film: " << type() << nl
+ InfoInFunction
+ << "Surface film: " << type() << nl
<< " time step continuity errors: sum local = "
<< sumLocalContErr << ", global = " << globalContErr
<< ", cumulative = " << cumulativeContErr_ << endl;
@@ -252,7 +251,7 @@ void kinematicSingleLayer::solveContinuity()
{
if (debug)
{
- Info<< "kinematicSingleLayer::solveContinuity()" << endl;
+ InfoInFunction << endl;
}
solve
@@ -290,7 +289,7 @@ tmp<Foam::fvVectorMatrix> kinematicSingleLayer::solveMomentum
{
if (debug)
{
- Info<< "kinematicSingleLayer::solveMomentum()" << endl;
+ InfoInFunction << endl;
}
// Momentum
@@ -349,7 +348,7 @@ void kinematicSingleLayer::solveThickness
{
if (debug)
{
- Info<< "kinematicSingleLayer::solveThickness()" << endl;
+ InfoInFunction << endl;
}
volScalarField rUA(1.0/UEqn.A());
@@ -836,7 +835,8 @@ void kinematicSingleLayer::addSources
{
if (debug)
{
- Info<< "\nSurface film: " << type() << ": adding to film source:" << nl
+ InfoInFunction
+ << "\nSurface film: " << type() << ": adding to film source:" << nl
<< " mass = " << massSource << nl
<< " momentum = " << momentumSource << nl
<< " pressure = " << pressureSource << endl;
@@ -854,7 +854,7 @@ void kinematicSingleLayer::preEvolveRegion()
{
if (debug)
{
- Info<< "kinematicSingleLayer::preEvolveRegion()" << endl;
+ InfoInFunction << endl;
}
surfaceFilmModel::preEvolveRegion();
@@ -877,7 +877,7 @@ void kinematicSingleLayer::evolveRegion()
{
if (debug)
{
- Info<< "kinematicSingleLayer::evolveRegion()" << endl;
+ InfoInFunction << endl;
}
// Update film coverage indicator
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 4161f1a95d8..f29d5d64ed8 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -89,7 +89,7 @@ void thermoSingleLayer::resetPrimaryRegionSourceTerms()
{
if (debug)
{
- Info<< "thermoSingleLayer::resetPrimaryRegionSourceTerms()" << endl;
+ InfoInFunction << endl;
}
kinematicSingleLayer::resetPrimaryRegionSourceTerms();
@@ -146,7 +146,7 @@ void thermoSingleLayer::transferPrimaryRegionThermoFields()
{
if (debug)
{
- Info<< "thermoSingleLayer::transferPrimaryRegionThermoFields()" << endl;
+ InfoInFunction << endl;
}
kinematicSingleLayer::transferPrimaryRegionThermoFields();
@@ -165,7 +165,7 @@ void thermoSingleLayer::transferPrimaryRegionSourceFields()
{
if (debug)
{
- Info<< "thermoSingleLayer::transferPrimaryRegionSourceFields()" << endl;
+ InfoInFunction << endl;
}
kinematicSingleLayer::transferPrimaryRegionSourceFields();
@@ -224,7 +224,7 @@ void thermoSingleLayer::updateSubmodels()
{
if (debug)
{
- Info<< "thermoSingleLayer::updateSubmodels()" << endl;
+ InfoInFunction << endl;
}
// Update heat transfer coefficient sub-models
@@ -271,7 +271,7 @@ void thermoSingleLayer::solveEnergy()
{
if (debug)
{
- Info<< "thermoSingleLayer::solveEnergy()" << endl;
+ InfoInFunction << endl;
}
updateSurfaceTemperatures();
@@ -608,7 +608,7 @@ void thermoSingleLayer::preEvolveRegion()
{
if (debug)
{
- Info<< "thermoSingleLayer::preEvolveRegion()" << endl;
+ InfoInFunction << endl;
}
// correctHsForMappedT();
@@ -625,7 +625,7 @@ void thermoSingleLayer::evolveRegion()
{
if (debug)
{
- Info<< "thermoSingleLayer::evolveRegion()" << endl;
+ InfoInFunction << endl;
}
// Update film coverage indicator
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index f63ccde2389..360bdfeb1fc 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.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
@@ -68,7 +68,7 @@ void thermalBaffle::solveEnergy()
{
if (debug)
{
- Info<< "thermalBaffle::solveEnergy()" << endl;
+ InfoInFunction << endl;
}
const polyBoundaryMesh& rbm = regionMesh().boundaryMesh();
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index ac75fa52d89..4b8a754bcaa 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.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
@@ -62,10 +62,7 @@ void Foam::MeshedSurfaceProxy<Face>::write
{
if (debug)
{
- Info<< "MeshedSurfaceProxy::write"
- "(const fileName&, const MeshedSurfaceProxy&) : "
- "writing to " << name
- << endl;
+ InfoInFunction << "Writing to " << name << endl;
}
word ext = name.ext();
@@ -98,14 +95,11 @@ void Foam::MeshedSurfaceProxy<Face>::write
if (debug)
{
- Info<< "MeshedSurfaceProxy::write"
- "(const Time&, const word&) : "
- "writing to " << name
- << endl;
+ InfoInFunction << "Writing to " << name << endl;
}
- // the local location
+ // The local location
const fileName objectDir
(
t.timePath()/surfaceRegistry::prefix/name/surfMesh::meshSubDir
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 1315c05536d..10a973eb053 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -107,10 +107,7 @@ void Foam::UnsortedMeshedSurface<Face>::write
{
if (debug)
{
- Info<< "UnsortedMeshedSurface::write"
- "(const fileName&, const UnsortedMeshedSurface&) : "
- "writing to " << name
- << endl;
+ InfoInFunction << "Writing to " << name << endl;
}
const word ext = name.ext();
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
index 970fc82fe3e..67063b57c45 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -131,8 +131,7 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::correct()
{
if (debug)
{
- Info<< "entering hePsiThermo<BasicPsiThermo, MixtureType>::correct()"
- << endl;
+ InfoInFunction << endl;
}
// force the saving of the old-time values
@@ -142,8 +141,7 @@ void Foam::hePsiThermo<BasicPsiThermo, MixtureType>::correct()
if (debug)
{
- Info<< "exiting hePsiThermo<BasicPsiThermo, MixtureType>::correct()"
- << endl;
+ Info<< " Finished" << endl;
}
}
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
index ec7aad7e72a..7db79d8fc8f 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -133,14 +133,14 @@ void Foam::heRhoThermo<BasicPsiThermo, MixtureType>::correct()
{
if (debug)
{
- Info<< "entering heRhoThermo<MixtureType>::correct()" << endl;
+ InfoInFunction << endl;
}
calculate();
if (debug)
{
- Info<< "exiting heRhoThermo<MixtureType>::correct()" << endl;
+ Info<< " Finished" << endl;
}
}
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index 982446ccb11..7d51293208e 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.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
@@ -204,8 +204,7 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()
{
if (debug)
{
- Info<< "entering heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()"
- << endl;
+ InfoInFunction << endl;
}
// force the saving of the old-time values
@@ -215,8 +214,7 @@ void Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()
if (debug)
{
- Info<< "exiting heheuPsiThermo<BasicPsiThermo, MixtureType>::correct()"
- << endl;
+ Info<< " Finished" << endl;
}
}
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
index d70e42a77e4..75de2bc0031 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -168,14 +168,14 @@ void Foam::heSolidThermo<BasicSolidThermo, MixtureType>::correct()
{
if (debug)
{
- Info<< "entering heSolidThermo<MixtureType>::correct()" << endl;
+ InfoInFunction << endl;
}
calculate();
if (debug)
{
- Info<< "exiting heSolidThermo<MixtureType>::correct()" << endl;
+ Info<< " Finished" << endl;
}
}
--
GitLab