From 9498ec97a92db36931ddf045bde75ee22ae82688 Mon Sep 17 00:00:00 2001
From: Sergio Ferraris <sergio@alex.opencfd.co.uk>
Date: Mon, 2 Dec 2013 12:56:23 +0000
Subject: [PATCH 1/2] BUG: Correcting smoothing of view factor matrix in
 viewFactor.C     Initialize faceAgglom list to identity when a patch is not
 agglomerated in faceAgglomerate.C     Restrict agglomeration through edges
 with more than two faces attached in pairPatchAgglomeration.C

---
 .../faceAgglomerate/faceAgglomerate.C         | 10 ++++++
 .../pairPatchAgglomeration.C                  | 33 ++++++++++++++-----
 .../radiationModel/viewFactor/viewFactor.C    |  2 +-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
index ee9339d0f9..be2310aabe 100644
--- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
+++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C
@@ -109,6 +109,16 @@ int main(int argc, char *argv[])
         }
     }
 
+
+    // - All patches which are not agglomarated are identity for finalAgglom
+    forAll(boundary, patchId)
+    {
+        if (finalAgglom[patchId].size() == 0)
+        {
+            finalAgglom[patchId] = identity(boundary[patchId].size());
+        }
+    }
+
     // Sync agglomeration across coupled patches
     labelList nbrAgglom(mesh.nFaces() - mesh.nInternalFaces(), -1);
 
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index 9467906f15..e322bcc541 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -83,11 +83,19 @@ void Foam::pairPatchAgglomeration::setBasedEdgeWeights()
                     facePairWeight_[edgeCommon] = -1.0;
                 }
             }
-            else if (eFaces.size() == 3)
+            else
             {
-                facePairWeight_.insert(edge(eFaces[1], eFaces[0]), -1.0);
-                facePairWeight_.insert(edge(eFaces[2], eFaces[0]), -1.0);
-                facePairWeight_.insert(edge(eFaces[1], eFaces[2]), -1.0);
+                forAll(eFaces, j)
+                {
+                    for (label k = j+1; k<eFaces.size(); k++)
+                    {
+                        facePairWeight_.insert
+                        (
+                            edge(eFaces[j], eFaces[k]),
+                            -1.0
+                        );
+                    }
+                }
             }
         }
     }
@@ -154,11 +162,20 @@ void Foam::pairPatchAgglomeration::setEdgeWeights
                     facePairWeight_[edgeCommon] = -1.0;
                 }
             }
-            else if (eFaces.size() == 3)
+            else
             {
-                facePairWeight_.insert(edge(eFaces[1], eFaces[0]), -1.0);
-                facePairWeight_.insert(edge(eFaces[2], eFaces[0]), -1.0);
-                facePairWeight_.insert(edge(eFaces[1], eFaces[2]), -1.0);
+                // Set edge as barrier by setting weight to -1
+                forAll(eFaces, j)
+                {
+                    for (label k = j+1; k<eFaces.size(); k++)
+                    {
+                        facePairWeight_.insert
+                        (
+                            edge(eFaces[j], eFaces[k]),
+                            -1.0
+                        );
+                    }
+                }
             }
         }
     }
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C b/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
index 5513957962..3d7f88724d 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
@@ -200,7 +200,7 @@ void Foam::radiation::viewFactor::initialise()
                 {
                     sumF += Fmatrix_()[i][j];
                 }
-                scalar delta = 1.0 - sumF;
+                scalar delta = sumF - 1.0;
                 for (label j=0; j<totalNCoarseFaces_; j++)
                 {
                     Fmatrix_()[i][j] *= (1.0 - delta/(sumF + 0.001));

From fbffbdb18562bd154fa0ec7b540838aeed08b156 Mon Sep 17 00:00:00 2001
From: Sergio Ferraris <sergio@alex.opencfd.co.uk>
Date: Mon, 2 Dec 2013 12:57:38 +0000
Subject: [PATCH 2/2] ENH: Adding soot field in 0 folder

---
 .../fireFoam/les/smallPoolFire2D/0/soot       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot

diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
new file mode 100644
index 0000000000..427d4f2d00
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/soot
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      soot;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    ".*"
+    {
+        type            calculate;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //