From c6beff51b9edbc7bb0afda003e7f634914927d26 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 13 Jun 2018 15:26:59 +0200
Subject: [PATCH] STYLE: adjust AMI information (issue #860)
- use "min:xxx" for consistency with other outputs
- adjust decompositionInformation as well
---
bin/tools/foamLog.db | 6 +++---
.../cyclicACMIPolyPatch/cyclicACMIPolyPatch.C | 2 +-
.../cyclicPeriodicAMIPolyPatch.C | 12 ++++++------
.../decompose/decompose/decompositionInformation.C | 7 ++++---
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/bin/tools/foamLog.db b/bin/tools/foamLog.db
index f97c8f27b3..61909c092a 100644
--- a/bin/tools/foamLog.db
+++ b/bin/tools/foamLog.db
@@ -63,6 +63,6 @@ alpha1Min/Min\(alpha1\) =/Min(alpha1) =
alpha1Max/Max\(alpha1\) =/Max(alpha1) =
# AMI
-AMIMin/AMI: Patch source sum/min =
-AMIMax/AMI: Patch source sum/max =
-AMIAvg/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/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPolyPatch/cyclicACMIPolyPatch.C
index 242f83097f..98b7a2ca2d 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 = 1 max = 1 average = 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 032315e09f..34c7680aaa 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicPeriodicAMI/cyclicPeriodicAMIPolyPatch/cyclicPeriodicAMIPolyPatch.C
@@ -561,15 +561,15 @@ void Foam::cyclicPeriodicAMIPolyPatch::resetAMI
Info<< indent
<< "AMI: Patch " << name()
<< " sum(weights)"
- << " min = " << gMin(srcWghtSum)
- << " max = " << gMax(srcWghtSum)
- << " average = " << gAverage(srcWghtSum) << nl;
+ << " min:" << gMin(srcWghtSum)
+ << " max:" << gMax(srcWghtSum)
+ << " average:" << gAverage(srcWghtSum) << nl;
Info<< indent
<< "AMI: Patch " << neighbPatch().name()
<< " sum(weights)"
- << " min = " << gMin(tgtWghtSum)
- << " max = " << gMax(tgtWghtSum)
- << " average = " << gAverage(tgtWghtSum) << nl;
+ << " min:" << gMin(tgtWghtSum)
+ << " max:" << gMax(tgtWghtSum)
+ << " average:" << gAverage(tgtWghtSum) << nl;
}
}
}
diff --git a/src/parallel/decompose/decompose/decompositionInformation.C b/src/parallel/decompose/decompose/decompositionInformation.C
index 08f80d2cad..28a52235f1 100644
--- a/src/parallel/decompose/decompose/decompositionInformation.C
+++ b/src/parallel/decompose/decompose/decompositionInformation.C
@@ -217,11 +217,11 @@ void Foam::decompositionInformation::printAll(Ostream& os) const
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
-
Foam::Ostream& Foam::decompositionInformation::stats::print(Ostream& os) const
{
- os << "max/median/min: "
- << this->max << " / " << this->median << " / " << this->min;
+ os << "min:" << this->min
+ << " max:" << this->max
+ << " median:" << this->median;
if (this->median)
{
@@ -233,4 +233,5 @@ Foam::Ostream& Foam::decompositionInformation::stats::print(Ostream& os) const
return os;
}
+
// ************************************************************************* //
--
GitLab