From c94b3e01ebbf70b0c5646643fddc7aba6229dfc5 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Fri, 8 Jun 2018 13:43:40 +0200 Subject: [PATCH] ENH: adjust AMI information for better log processing (issue #860) - now report as "min = XX max = YY average = ZZ" instead of as "min/max/average = XX, YY, ZZ" this makes it easier to parse any particular value (eg, with foamLog) --- bin/tools/foamLog.db | 4 +++- .../AMIInterpolation/AMIInterpolation.C | 8 ++++---- .../cyclicACMIPolyPatch/cyclicACMIPolyPatch.C | 2 +- .../cyclicPeriodicAMIPolyPatch.C | 20 +++++++++---------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/bin/tools/foamLog.db b/bin/tools/foamLog.db index ed9f55c5ab..f97c8f27b3 100644 --- a/bin/tools/foamLog.db +++ b/bin/tools/foamLog.db @@ -63,4 +63,6 @@ alpha1Min/Min\(alpha1\) =/Min(alpha1) = alpha1Max/Max\(alpha1\) =/Max(alpha1) = # AMI -AMIMin/AMI: Patch source sum/average = +AMIMin/AMI: Patch source sum/min = +AMIMax/AMI: Patch source sum/max = +AMIAvg/AMI: Patch source sum/average = diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C index ae79db7a64..c7634f2f05 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C @@ -223,10 +223,10 @@ void Foam::AMIInterpolation<SourcePatch, TargetPatch>::normaliseWeights { Info<< indent << "AMI: Patch " << patchName - << " sum(weights) min/max/average = " - << gMin(wghtSum) << ", " - << gMax(wghtSum) << ", " - << gAverage(wghtSum) << endl; + << " sum(weights)" + << " min = " << gMin(wghtSum) + << " max = " << gMax(wghtSum) + << " average = " << gAverage(wghtSum) << nl; const label nLow = returnReduce(nLowWeight, sumOp<label>()); diff --git a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C index 4fbd6e39c9..242f83097f 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C +++ b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C @@ -98,7 +98,7 @@ void Foam::cyclicACMIPolyPatch::resetAMI const_cast<AMIPatchToPatchInterpolation&>(this->AMI()); // Output some stats. AMIInterpolation will have already output the - // average weights ("sum(weights) min/max/average = 1, 1, 1") + // average weights ("sum(weights) min = 1 max = 1 average = 1") { const scalarField& wghtsSum = AMI.srcWeightsSum(); diff --git a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C index 6e4206e650..032315e09f 100644 --- a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C +++ b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C @@ -547,12 +547,12 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI if (nFace) { - scalarField srcWghtSum(size(), 0); + scalarField srcWghtSum(size(), Zero); forAll(srcWghtSum, faceI) { srcWghtSum[faceI] = sum(AMIPtr_->srcWeights()[faceI]); } - scalarField tgtWghtSum(neighbPatch().size(), 0); + scalarField tgtWghtSum(neighbPatch().size(), Zero); forAll(tgtWghtSum, faceI) { tgtWghtSum[faceI] = sum(AMIPtr_->tgtWeights()[faceI]); @@ -560,16 +560,16 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI Info<< indent << "AMI: Patch " << name() - << " sum(weights) min/max/average = " - << gMin(srcWghtSum) << ", " - << gMax(srcWghtSum) << ", " - << gAverage(srcWghtSum) << endl; + << " sum(weights)" + << " min = " << gMin(srcWghtSum) + << " max = " << gMax(srcWghtSum) + << " average = " << gAverage(srcWghtSum) << nl; Info<< indent << "AMI: Patch " << neighbPatch().name() - << " sum(weights) min/max/average = " - << gMin(tgtWghtSum) << ", " - << gMax(tgtWghtSum) << ", " - << gAverage(tgtWghtSum) << endl; + << " sum(weights)" + << " min = " << gMin(tgtWghtSum) + << " max = " << gMax(tgtWghtSum) + << " average = " << gAverage(tgtWghtSum) << nl; } } } -- GitLab