diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C index 25b7bd9e4e..b684735939 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/createPolyBoundary.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 @@ -89,9 +89,8 @@ void Foam::starMesh::createPolyBoundary() > nInternalFaces_ ) { - Info - << "void starMesh::createPolyBoundary()" - << ": Problem with face: " << curFace + InfoInFunction + << "Problem with face: " << curFace << "\nProbably multiple definitions " << "of a single boundary face. " << endl << "Other boundary face: " @@ -110,8 +109,7 @@ void Foam::starMesh::createPolyBoundary() < starPointID_.size() ) { - Info - << "," + Info<< "," << starPointID_ [curCellFaces[cellFaceI][spI]]; } @@ -124,9 +122,8 @@ void Foam::starMesh::createPolyBoundary() } else { - Info - << "void starMesh::createPolyBoundary()" - << ": Problem with face: " << curFace + InfoInFunction + << "Problem with face: " << curFace << "\nProbably trying to define a " << "boundary face on a previously " << "matched internal face. " << endl @@ -146,8 +143,7 @@ void Foam::starMesh::createPolyBoundary() < starPointID_.size() ) { - Info - << "," + Info<< "," << starPointID_ [curCellFaces[cellFaceI][spI]]; } @@ -190,8 +186,8 @@ void Foam::starMesh::createPolyBoundary() { const face& missingFace = cellFaces_[cellI][faceI]; - Info<< "starMesh::createPolyBoundary() : " - << "missing face found in cell " << cellI + InfoInFunction + << "Missing face found in cell " << cellI << ".\nType: " << cellShapes_[cellI].model().name() << ". STAR cell number: " << starCellID_[cellI] << ". Face: " << missingFace << endl; @@ -255,8 +251,8 @@ void Foam::starMesh::createPolyBoundary() { const face& problemFace = meshFaces_[faceI]; - Info<< "starMesh::createPolyBoundary() : " - << "problem with face " << faceI << ": addressed " + InfoInFunction + << "Problem with face " << faceI << ": addressed " << markupFaces[faceI] << " times (should be 2!). Face: " << problemFace << endl; diff --git a/src/OSspecific/POSIX/timer.C b/src/OSspecific/POSIX/timer.C index 7e1f5886d3..d9c1bac05e 100644 --- a/src/OSspecific/POSIX/timer.C +++ b/src/OSspecific/POSIX/timer.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 @@ -48,8 +48,7 @@ void Foam::timer::signalHandler(int) { if (debug) { - Info<< "Foam::timer::signalHandler(int sig) : " - << " timed out. Jumping." + InfoInFunction<< "Timed out. Jumping." << endl; } longjmp(envAlarm, 1); @@ -91,8 +90,8 @@ Foam::timer::timer(const unsigned int newTimeOut) if (debug) { - Info<< "Foam::timer::timer(const unsigned int) : " - << " installing timeout " << int(newTimeOut_) + InfoInFunction + << "Installing timeout " << int(newTimeOut_) << " seconds" << " (overriding old timeout " << int(oldTimeOut_) << ")." << endl; @@ -109,8 +108,8 @@ Foam::timer::~timer() { if (debug) { - Info<< "Foam::timer::~timer(const unsigned int) : timeOut=" - << int(newTimeOut_) + InfoInFunction + << "timeOut=" << int(newTimeOut_) << " : resetting timeOut to " << int(oldTimeOut_) << endl; } @@ -128,4 +127,5 @@ Foam::timer::~timer() } } + // ************************************************************************* // diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C index 7f4c315da4..e3013bc02d 100644 --- a/src/OpenFOAM/db/IOobject/IOobject.C +++ b/src/OpenFOAM/db/IOobject/IOobject.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 @@ -133,7 +133,8 @@ Foam::IOobject::IOobject { if (objectRegistry::debug) { - Info<< "Constructing IOobject called " << name_ + InfoInFunction + << "Constructing IOobject called " << name_ << " of type " << headerClassName_ << endl; } @@ -164,7 +165,8 @@ Foam::IOobject::IOobject { if (objectRegistry::debug) { - Info<< "Constructing IOobject called " << name_ + InfoInFunction + << "Constructing IOobject called " << name_ << " of type " << headerClassName_ << endl; } @@ -200,7 +202,8 @@ Foam::IOobject::IOobject if (objectRegistry::debug) { - Info<< "Constructing IOobject called " << name_ + InfoInFunction + << "Constructing IOobject called " << name_ << " of type " << headerClassName_ << endl; } @@ -405,9 +408,8 @@ bool Foam::IOobject::headerOk() { if (objectRegistry::debug) { - Info - << "IOobject::headerOk() : " - << "file " << objectPath() << " could not be opened" + InfoInFunction + << "File " << objectPath() << " could not be opened" << endl; } @@ -421,7 +423,7 @@ bool Foam::IOobject::headerOk() if (objectRegistry::debug) { IOWarningInFunction((*isPtr)) - << "failed to read header of file " << objectPath() + << "Failed to read header of file " << objectPath() << endl; } @@ -440,14 +442,14 @@ void Foam::IOobject::setBad(const string& s) if (objState_ != GOOD) { FatalErrorInFunction - << "recurrent failure for object " << s + << "Recurrent failure for object " << s << exit(FatalError); } if (error::level) { - Info<< "IOobject::setBad(const string&) : " - << "broken object " << s << info() << endl; + InfoInFunction + << "Broken object " << s << info() << endl; } objState_ = BAD; diff --git a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C index 98b5e3e3ee..7d639e7b5c 100644 --- a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C +++ b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.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,7 @@ bool Foam::IOobject::readHeader(Istream& is) { if (IOobject::debug) { - Info<< "IOobject::readHeader(Istream&) : reading header for file " - << is.name() << endl; + InfoInFunction << "Reading header for file " << is.name() << endl; } // Check Istream not already bad @@ -114,8 +113,8 @@ bool Foam::IOobject::readHeader(Istream& is) if (IOobject::debug) { - Info<< "IOobject::readHeader(Istream&) :" - << " stream failure while reading header" + InfoInFunction + << "Stream failure while reading header" << " on line " << is.lineNumber() << " of file " << is.name() << endl; } diff --git a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C index 5c9fd3210d..b10a6bd1d8 100644 --- a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C +++ b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C @@ -36,8 +36,8 @@ bool Foam::IOobject::writeHeader(Ostream& os, const word& type) const { if (!os.good()) { - Info<< "IOobject::writeHeader(Ostream&) : " - << "no stream open for write" << nl + InfoInFunction + << "No stream open for write" << nl << os.info() << endl; return false; diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C index b1f2643c9e..a3e1ece14d 100644 --- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C +++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.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 @@ -133,8 +133,7 @@ Foam::IOobject* Foam::IOobjectList::lookup(const word& name) const { if (IOobject::debug) { - Info<< "IOobjectList::lookup : found " - << name << endl; + InfoInFunction << "Found " << name << endl; } return const_cast(*iter); @@ -143,8 +142,7 @@ Foam::IOobject* Foam::IOobjectList::lookup(const word& name) const { if (IOobject::debug) { - Info<< "IOobjectList::lookup : could not find " - << name << endl; + InfoInFunction << "Could not find " << name << endl; } return NULL; @@ -162,7 +160,7 @@ Foam::IOobjectList Foam::IOobjectList::lookup(const wordRe& name) const { if (IOobject::debug) { - Info<< "IOobjectList::lookupRe : found " << iter.key() << endl; + InfoInFunction << "Found " << iter.key() << endl; } objectsOfName.insert(iter.key(), new IOobject(*iter())); @@ -185,7 +183,7 @@ Foam::IOobjectList Foam::IOobjectList::lookup(const wordReList& patterns) const { if (IOobject::debug) { - Info<< "IOobjectList::lookupRe : found " << iter.key() << endl; + InfoInFunction << "Found " << iter.key() << endl; } objectsOfName.insert(iter.key(), new IOobject(*iter())); @@ -206,8 +204,7 @@ Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& ClassName) const { if (IOobject::debug) { - Info<< "IOobjectList::lookupClass : found " - << iter.key() << endl; + InfoInFunction << "Found " << iter.key() << endl; } objectsOfClass.insert(iter.key(), new IOobject(*iter())); diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C index 4802ccbaf3..31b18133bb 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.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 @@ -56,8 +56,8 @@ void Foam::sampledIsoSurface::getIsoFields() const { if (debug) { - Info<< "sampledIsoSurface::getIsoFields() : lookup volField " - << isoField_ << endl; + InfoInFunction + << "Lookup volField " << isoField_ << endl; } storedVolFieldPtr_.clear(); volFieldPtr_ = &fvm.lookupObject(isoField_); @@ -68,8 +68,9 @@ void Foam::sampledIsoSurface::getIsoFields() const if (debug) { - Info<< "sampledIsoSurface::getIsoFields() : checking " - << isoField_ << " for same time " << fvm.time().timeName() + InfoInFunction + << "Checking " << isoField_ + << " for same time " << fvm.time().timeName() << endl; } @@ -81,8 +82,9 @@ void Foam::sampledIsoSurface::getIsoFields() const { if (debug) { - Info<< "sampledIsoSurface::getIsoFields() : reading volField " - << isoField_ << " from time " << fvm.time().timeName() + InfoInFunction + << "Reading volField " << isoField_ + << " from time " << fvm.time().timeName() << endl; } @@ -111,9 +113,9 @@ void Foam::sampledIsoSurface::getIsoFields() const else { FatalErrorInFunction - << "Cannot find isosurface field " << isoField_ - << " in database or directory " << vfHeader.path() - << exit(FatalError); + << "Cannot find isosurface field " << isoField_ + << " in database or directory " << vfHeader.path() + << exit(FatalError); } } } @@ -130,8 +132,8 @@ void Foam::sampledIsoSurface::getIsoFields() const { if (debug) { - Info<< "sampledIsoSurface::getIsoFields() : lookup pointField " - << pointFldName << endl; + InfoInFunction + << "Lookup pointField " << pointFldName << endl; } pointFieldPtr_ = &fvm.lookupObject(pointFldName); } @@ -141,8 +143,8 @@ void Foam::sampledIsoSurface::getIsoFields() const if (debug) { - Info<< "sampledIsoSurface::getIsoFields() : " - << "checking pointField " << pointFldName + InfoInFunction + << "Checking pointField " << pointFldName << " for same time " << fvm.time().timeName() << endl; } @@ -155,8 +157,8 @@ void Foam::sampledIsoSurface::getIsoFields() const { if (debug) { - Info<< "sampledIsoSurface::getIsoFields() :" - << " interpolating volField " << volFieldPtr_->name() + InfoInFunction + << "Interpolating volField " << volFieldPtr_->name() << " to get pointField " << pointFldName << endl; } @@ -185,11 +187,12 @@ void Foam::sampledIsoSurface::getIsoFields() const if (debug) { - Info<< "sampledIsoSurface::getIsoFields() : volField " - << volFieldPtr_->name() << " min:" << min(*volFieldPtr_).value() + InfoInFunction + << "volField " << volFieldPtr_->name() + << " min:" << min(*volFieldPtr_).value() << " max:" << max(*volFieldPtr_).value() << endl; - Info<< "sampledIsoSurface::getIsoFields() : pointField " - << pointFieldPtr_->name() + InfoInFunction + << "pointField " << pointFieldPtr_->name() << " min:" << gMin(pointFieldPtr_->internalField()) << " max:" << gMax(pointFieldPtr_->internalField()) << endl; } @@ -205,8 +208,8 @@ void Foam::sampledIsoSurface::getIsoFields() const { if (debug) { - Info<< "sampledIsoSurface::getIsoFields() :" - << " submesh lookup volField " + InfoInFunction + << "Sub-mesh lookup volField " << isoField_ << endl; } storedVolSubFieldPtr_.clear(); @@ -216,8 +219,8 @@ void Foam::sampledIsoSurface::getIsoFields() const { if (debug) { - Info<< "sampledIsoSurface::getIsoFields() : " - << "subsetting volField " << isoField_ << endl; + InfoInFunction + << "Sub-setting volField " << isoField_ << endl; } storedVolSubFieldPtr_.reset ( @@ -242,8 +245,8 @@ void Foam::sampledIsoSurface::getIsoFields() const { if (debug) { - Info<< "sampledIsoSurface::getIsoFields() :" - << " submesh lookup pointField " << pointFldName << endl; + InfoInFunction + << "Sub-mesh lookup pointField " << pointFldName << endl; } storedPointSubFieldPtr_.clear(); pointSubFieldPtr_ = &subFvm.lookupObject @@ -255,8 +258,8 @@ void Foam::sampledIsoSurface::getIsoFields() const { if (debug) { - Info<< "sampledIsoSurface::getIsoFields() :" - << " interpolating submesh volField " + InfoInFunction + << "Interpolating submesh volField " << volSubFieldPtr_->name() << " to get submesh pointField " << pointFldName << endl; }