From 153e0c690b8bb1c2798b4d296264c721bded672d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 16 May 2013 20:28:47 +0100
Subject: [PATCH] ENH: GAMGAgglomeration: better printing

---
 .../GAMGAgglomeration/GAMGAgglomeration.C     | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index a53a5fe9ab..0b950fd433 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -79,8 +79,9 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
                 << nl;
 
             Info<< setw(40) << "nCells"
+                << setw(24) << "nFaces/nCells"
                 << setw(24) << "nInterfaces"
-                << setw(24) << "Ratio" << nl
+                << setw(24) << "nIntFaces/nCells" << nl
                 << setw(8) << "Level"
                 << setw(8) << "nProcs"
                 << "        "
@@ -89,6 +90,9 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
                 << "        "
                 << setw(8) << "avg"
                 << setw(8) << "max"
+                << "        "
+                << setw(8) << "avg"
+                << setw(8) << "max"
                 << "            " << setw(4) << "avg"
                 << "    " << setw(4) << "max"
                 << nl
@@ -108,6 +112,7 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
             {
                 label nProcs = 0;
                 label nCells = 0;
+                scalar faceCellRatio = 0;
                 label nInterfaces = 0;
                 label nIntFaces = 0;
                 scalar ratio = 0.0;
@@ -118,6 +123,8 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
 
                     const lduMesh& fineMesh = meshLevel(levelI);
                     nCells = fineMesh.lduAddr().size();
+                    faceCellRatio =
+                        scalar(fineMesh.lduAddr().lowerAddr().size())/nCells;
 
                     const lduInterfacePtrsList interfaces =
                         fineMesh.interfaces();
@@ -137,6 +144,11 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
                 label maxNCells = returnReduce(nCells, maxOp<label>());
                 label totNCells = returnReduce(nCells, sumOp<label>());
 
+                scalar maxFaceCellRatio =
+                    returnReduce(faceCellRatio, maxOp<scalar>());
+                scalar totFaceCellRatio =
+                    returnReduce(faceCellRatio, sumOp<scalar>());
+
                 label maxNInt = returnReduce(nInterfaces, maxOp<label>());
                 label totNInt = returnReduce(nInterfaces, sumOp<label>());
 
@@ -145,9 +157,15 @@ void Foam::GAMGAgglomeration::compactLevels(const label nCreatedLevels)
 
                 Info<< setw(8) << levelI
                     << setw(8) << totNprocs
+
                     << setw(16) << totNCells/totNprocs
                     << setw(8) << maxNCells
-                    << setw(16) << totNInt/totNprocs
+
+                    << "        "
+                    << setw(8) << setprecision(4) << totFaceCellRatio/totNprocs
+                    << setw(8) << setprecision(4) << maxFaceCellRatio
+                    << "        "
+                    << setw(8) << totNInt/totNprocs
                     << setw(8) << maxNInt
                     << "        "
                     << setw(8) << setprecision(4) << totRatio/totNprocs