Commit aa38e25c authored by Henry Weller's avatar Henry Weller
Browse files

Info -> InfoInFunction and updated comments

parent 5779e4fd
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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 =
......
......@@ -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 =
......
......@@ -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 =
......
......@@ -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,
......
......@@ -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 =
......