research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove confusing IInfo macro the benefit of which is insufficient

Browse source 
Simply use the indent manipulator
This commit is contained in:
Henry 2014-05-13 10:34:11 +01:00
parent d8c53d1f8a
commit 78d8f619ee
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/OpenFOAM/db/error/messageStream.H
View file

@ -282,13 +282,6 @@ extern messageStream Info;
::Foam::Pout<< "["<< __FILE__ << ":" << __LINE__ << "] " \ ::Foam::Pout<< "["<< __FILE__ << ":" << __LINE__ << "] " \
<< #var " = " << var << ::Foam::endl << #var " = " << var << ::Foam::endl
/**
* \def IInfo
* Indented Info
*/
#define IInfo \
::Foam::Info<< indent
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

22
src/fvOptions/fvOptions/fvOption.C
View file

@ -113,7 +113,7 @@ void Foam::fv::option::setCellSet()
{ {
case smPoints: case smPoints:
{ {
IInfo<< "- selecting cells using points" << endl; Info<< indent << "- selecting cells using points" << endl;
labelHashSet selectedCells; labelHashSet selectedCells;
@ -141,7 +141,8 @@ void Foam::fv::option::setCellSet()
} }
case smCellSet: case smCellSet:
{ {
IInfo<< "- selecting cells using cellSet " << cellSetName_ << endl; Info<< indent
<< "- selecting cells using cellSet " << cellSetName_ << endl;
cellSet selectedCells(mesh_, cellSetName_); cellSet selectedCells(mesh_, cellSetName_);
cells_ = selectedCells.toc(); cells_ = selectedCells.toc();
@ -150,7 +151,8 @@ void Foam::fv::option::setCellSet()
} }
case smCellZone: case smCellZone:
{ {
IInfo<< "- selecting cells using cellZone " << cellSetName_ << endl; Info<< indent
<< "- selecting cells using cellZone " << cellSetName_ << endl;
label zoneID = mesh_.cellZones().findZoneID(cellSetName_); label zoneID = mesh_.cellZones().findZoneID(cellSetName_);
if (zoneID == -1) if (zoneID == -1)
@ -168,7 +170,7 @@ void Foam::fv::option::setCellSet()
{ {
if (active_ && master_) if (active_ && master_)
{ {
IInfo<< "- selecting inter region mapping" << endl; Info<< indent << "- selecting inter region mapping" << endl;
const fvMesh& nbrMesh = const fvMesh& nbrMesh =
mesh_.time().lookupObject<fvMesh>(nbrRegionName_); mesh_.time().lookupObject<fvMesh>(nbrRegionName_);
@ -213,7 +215,7 @@ void Foam::fv::option::setCellSet()
} }
case smAll: case smAll:
{ {
IInfo<< "- selecting all cells" << endl; Info<< indent << "- selecting all cells" << endl;
cells_ = identity(mesh_.nCells()); cells_ = identity(mesh_.nCells());
break; break;
@ -238,7 +240,8 @@ void Foam::fv::option::setCellSet()
} }
reduce(V_, sumOp<scalar>()); reduce(V_, sumOp<scalar>());
IInfo<< "- selected " << returnReduce(cells_.size(), sumOp<label>()) Info<< indent
<< "- selected " << returnReduce(cells_.size(), sumOp<label>())
<< " cell(s) with volume " << V_ << nl << endl; << " cell(s) with volume " << V_ << nl << endl;
} }
} }
@ -277,12 +280,12 @@ Foam::fv::option::option
if (dict_.readIfPresent("timeStart", timeStart_)) if (dict_.readIfPresent("timeStart", timeStart_))
{ {
dict_.lookup("duration") >> duration_; dict_.lookup("duration") >> duration_;
IInfo<< "- applying source at time " << timeStart_ Info<< indent << "- applying source at time " << timeStart_
<< " for duration " << duration_ << endl; << " for duration " << duration_ << endl;
} }
else else
{ {
IInfo<< "- applying source for all time" << endl; Info<< indent << "- applying source for all time" << endl;
} }
setSelection(dict_); setSelection(dict_);
@ -304,7 +307,8 @@ Foam::autoPtr<Foam::fv::option> Foam::fv::option::New
{ {
word modelType(coeffs.lookup("type")); word modelType(coeffs.lookup("type"));
IInfo<< "Selecting finite volume options model type " << modelType << endl; Info<< indent
<< "Selecting finite volume options model type " << modelType << endl;
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(modelType); dictionaryConstructorTablePtr_->find(modelType);

9
src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
View file

@ -250,7 +250,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights
if (nFace) if (nFace)
{ {
IInfo<< "AMI: Patch " << patchName Info<< indent
<< "AMI: Patch " << patchName
<< " sum(weights) min/max/average = " << " sum(weights) min/max/average = "
<< gMin(wghtSum) << ", " << gMin(wghtSum) << ", "
<< gMax(wghtSum) << ", " << gMax(wghtSum) << ", "
@ -260,7 +261,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights
if (nLow) if (nLow)
{ {
IInfo<< "AMI: Patch " << patchName Info<< indent
<< "AMI: Patch " << patchName
<< " identified " << nLow << " identified " << nLow
<< " faces with weights less than " << lowWeightTol << " faces with weights less than " << lowWeightTol
<< endl; << endl;
@ -803,7 +805,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
label srcTotalSize = returnReduce(srcPatch.size(), sumOp<label>()); label srcTotalSize = returnReduce(srcPatch.size(), sumOp<label>());
label tgtTotalSize = returnReduce(tgtPatch.size(), sumOp<label>()); label tgtTotalSize = returnReduce(tgtPatch.size(), sumOp<label>());
IInfo<< "AMI: Creating addressing and weights between " Info<< indent
<< "AMI: Creating addressing and weights between "
<< srcTotalSize << " source faces and " << srcTotalSize << " source faces and "
<< tgtTotalSize << " target faces" << tgtTotalSize << " target faces"
<< endl; << endl;