Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,116 @@ Description
 #include "meshTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+void checkConnectedAgglomeration
+(
+    const lduMesh& mesh,
+    const labelUList& restrict,
+    const label nCoarse
+)
+{
+    if (mesh.lduAddr().size() != restrict.size())
+    {
+        FatalErrorIn
+        (
+            "checkConnectedAgglomeration(const lduMesh&, const labelList&)"
+        )   << "nCells:" << mesh.lduAddr().size()
+            << " agglom:" << restrict.size()
+            << abort(FatalError);
+    }
+
+    // Seed (master) for every region
+    labelList regionToMaster(nCoarse, -1);
+    labelList master(mesh.lduAddr().size(), -1);
+    forAll(restrict, cellI)
+    {
+        label region = restrict[cellI];
+        if (regionToMaster[region] == -1)
+        {
+            // Set cell to be master for region
+            //Pout<< "For region " << region
+            //    << " allocating local master " << cellI
+            //    << endl;
+            regionToMaster[region] = cellI;
+            master[cellI] = cellI;
+        }
+    }
+
+    // Now loop and transport master through region
+    const labelUList& lower = mesh.lduAddr().lowerAddr();
+    const labelUList& upper = mesh.lduAddr().upperAddr();
+
+    while (true)
+    {
+        label nChanged = 0;
+
+        forAll(lower, faceI)
+        {
+            label own = lower[faceI];
+            label nei = upper[faceI];
+
+            if (restrict[own] == restrict[nei])
+            {
+                // Region-internal face
+
+                if (master[own] != -1)
+                {
+                    if (master[nei] == -1)
+                    {
+                        master[nei] = master[own];
+                        nChanged++;
+                    }
+                    else if (master[nei] != master[own])
+                    {
+                        FatalErrorIn("checkConnectedAgglomeration(..)")
+                            << "problem" << abort(FatalError);
+                    }
+                }
+                else if (master[nei] != -1)
+                {
+                    master[own] = master[nei];
+                    nChanged++;
+                }
+            }
+        }
+
+        reduce(nChanged, sumOp<label>());
+
+        if (nChanged == 0)
+        {
+            break;
+        }
+    }
+
+    // Check that master is set for all cells
+    boolList singleRegion(nCoarse, true);
+    label nSet = nCoarse;
+    forAll(master, cellI)
+    {
+        if (master[cellI] == -1)
+        {
+            label region = restrict[cellI];
+            if (singleRegion[region] == true)
+            {
+                singleRegion[region] = false;
+                nSet--;
+            }
+        }
+    }
+
+    label totalNCoarse = returnReduce(nCoarse, sumOp<label>());
+    label totalNVisited = returnReduce(nSet, sumOp<label>());
+
+    if (totalNVisited < totalNCoarse)
+    {
+        WarningIn("checkConnectedAgglomeration(..)")
+            << "out of " << totalNCoarse
+            << " agglomerated cells have " << totalNCoarse-totalNVisited
+            << " cells that are not a single connected region" << endl;
+    }
+}
+
+
 // Main program:
 
 int main(int argc, char *argv[])
@@ -117,6 +227,14 @@ int main(int argc, char *argv[])
             << "    agglomerated size : "
             << returnReduce(coarseSize, sumOp<label>()) << endl;
 
+        checkConnectedAgglomeration
+        (
+            agglom.meshLevel(level),
+            addr,
+            coarseSize
+        );
+
+
         forAll(addr, fineI)
         {
             const labelList& cellLabels = coarseToCell[fineI];

applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C

@@ -222,14 +222,6 @@ int main(int argc, char *argv[])
     }
 
     Info<< "Writing surface to " << outFileName << " ..." << endl;
-
-//    meshedSurface
-//    (
-//        xferMove(newPoints),
-//        xferCopy(surf1.localFaces()),
-//        xferCopy(surf1.surfZones())
-//    ).write(outFileName);
-
     surf1.write(outFileName);
 
     Info<< "End\n" << endl;