From 813b6936961165e007a8c9ed03a9dac67102be31 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 13 May 2014 10:34:11 +0100
Subject: [PATCH] Remove confusing IInfo macro the benefit of which is
insufficient Simply use the indent manipulator
---
src/OpenFOAM/db/error/messageStream.H | 7 ------
src/fvOptions/fvOptions/fvOption.C | 22 +++++++++++--------
.../AMIInterpolation/AMIInterpolation.C | 9 +++++---
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index 68032d406fe..01575f22664 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -282,13 +282,6 @@ extern messageStream Info;
::Foam::Pout<< "["<< __FILE__ << ":" << __LINE__ << "] " \
<< #var " = " << var << ::Foam::endl
-/**
- * \def IInfo
- * Indented Info
-*/
-#define IInfo \
- ::Foam::Info<< indent
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvOptions/fvOptions/fvOption.C b/src/fvOptions/fvOptions/fvOption.C
index 011b8e6e9f4..3387bdece0f 100644
--- a/src/fvOptions/fvOptions/fvOption.C
+++ b/src/fvOptions/fvOptions/fvOption.C
@@ -113,7 +113,7 @@ void Foam::fv::option::setCellSet()
{
case smPoints:
{
- IInfo<< "- selecting cells using points" << endl;
+ Info<< indent << "- selecting cells using points" << endl;
labelHashSet selectedCells;
@@ -141,7 +141,8 @@ void Foam::fv::option::setCellSet()
}
case smCellSet:
{
- IInfo<< "- selecting cells using cellSet " << cellSetName_ << endl;
+ Info<< indent
+ << "- selecting cells using cellSet " << cellSetName_ << endl;
cellSet selectedCells(mesh_, cellSetName_);
cells_ = selectedCells.toc();
@@ -150,7 +151,8 @@ void Foam::fv::option::setCellSet()
}
case smCellZone:
{
- IInfo<< "- selecting cells using cellZone " << cellSetName_ << endl;
+ Info<< indent
+ << "- selecting cells using cellZone " << cellSetName_ << endl;
label zoneID = mesh_.cellZones().findZoneID(cellSetName_);
if (zoneID == -1)
@@ -168,7 +170,7 @@ void Foam::fv::option::setCellSet()
{
if (active_ && master_)
{
- IInfo<< "- selecting inter region mapping" << endl;
+ Info<< indent << "- selecting inter region mapping" << endl;
const fvMesh& nbrMesh =
mesh_.time().lookupObject<fvMesh>(nbrRegionName_);
@@ -213,7 +215,7 @@ void Foam::fv::option::setCellSet()
}
case smAll:
{
- IInfo<< "- selecting all cells" << endl;
+ Info<< indent << "- selecting all cells" << endl;
cells_ = identity(mesh_.nCells());
break;
@@ -238,7 +240,8 @@ void Foam::fv::option::setCellSet()
}
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;
}
}
@@ -277,12 +280,12 @@ Foam::fv::option::option
if (dict_.readIfPresent("timeStart", timeStart_))
{
dict_.lookup("duration") >> duration_;
- IInfo<< "- applying source at time " << timeStart_
+ Info<< indent << "- applying source at time " << timeStart_
<< " for duration " << duration_ << endl;
}
else
{
- IInfo<< "- applying source for all time" << endl;
+ Info<< indent << "- applying source for all time" << endl;
}
setSelection(dict_);
@@ -304,7 +307,8 @@ Foam::autoPtr<Foam::fv::option> Foam::fv::option::New
{
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 =
dictionaryConstructorTablePtr_->find(modelType);
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
index cd586639f2b..2440c1f8428 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C
@@ -250,7 +250,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights
if (nFace)
{
- IInfo<< "AMI: Patch " << patchName
+ Info<< indent
+ << "AMI: Patch " << patchName
<< " sum(weights) min/max/average = "
<< gMin(wghtSum) << ", "
<< gMax(wghtSum) << ", "
@@ -260,7 +261,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights
if (nLow)
{
- IInfo<< "AMI: Patch " << patchName
+ Info<< indent
+ << "AMI: Patch " << patchName
<< " identified " << nLow
<< " faces with weights less than " << lowWeightTol
<< endl;
@@ -803,7 +805,8 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::update
label srcTotalSize = returnReduce(srcPatch.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 "
<< tgtTotalSize << " target faces"
<< endl;
--
GitLab