From 2d6d2b7376e643e96448796a67c8383fa2febe68 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 2 Nov 2012 11:53:33 +0000
Subject: [PATCH 01/81] STYLE: autoHexMesh: renamed variables

---
 .../autoHexMeshDriver/autoSnapDriver.H        | 12 ++--
 .../autoHexMeshDriver/autoSnapDriverFeature.C | 70 ++++++++++---------
 2 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index 7cf1e79f61..e4cea95be2 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -167,7 +167,7 @@ class autoSnapDriver
                 void correctAttraction
                 (
                     const DynamicList<point>& surfacePoints,
-                    const DynamicList<label>& surfaceCount,
+                    const DynamicList<label>& surfaceCounts,
                     const point& edgePt,
                     const vector& edgeNormal,   // normalised normal
                     const point& pt,
@@ -213,7 +213,7 @@ class autoSnapDriver
 
                     DynamicList<point>& surfacePoints,
                     DynamicList<vector>& surfaceNormals,
-                    DynamicList<label>& surfaceCount
+                    DynamicList<label>& surfaceCounts
                 ) const;
                 void binFeatureFaces
                 (
@@ -224,13 +224,13 @@ class autoSnapDriver
                     const scalarField& snapDist,
                     const label pointI,
 
-                    const List<List<point> >& pointFaceNormals,
+                    const List<List<point> >& pointFaceSurfNormals,
                     const List<List<point> >& pointFaceDisp,
                     const List<List<point> >& pointFaceCentres,
 
                     DynamicList<point>& surfacePoints,
                     DynamicList<vector>& surfaceNormals,
-                    DynamicList<label>& surfaceCount
+                    DynamicList<label>& surfaceCounts
                 ) const;
 
 
@@ -259,7 +259,7 @@ class autoSnapDriver
                     const indirectPrimitivePatch& pp,
                     const scalarField& snapDist,
 
-                    const List<List<point> >& pointFaceNormals,
+                    const List<List<point> >& pointFaceSurfNormals,
                     const List<List<point> >& pointFaceDisp,
                     const List<List<point> >& pointFaceCentres,
                     const labelListList& pointFacePatchID,
@@ -277,7 +277,7 @@ class autoSnapDriver
                     const indirectPrimitivePatch&,
                     const scalarField&,
 
-                    const List<List<point> >& pointFaceNormals,
+                    const List<List<point> >& pointFaceSurfNormals,
                     const List<List<point> >& pointFaceDisp,
                     const List<List<point> >& pointFaceCentres,
                     const labelListList& pointFacePatchID,
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index f32d9ce4bd..b9990cb078 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -690,7 +690,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
 void Foam::autoSnapDriver::correctAttraction
 (
     const DynamicList<point>& surfacePoints,
-    const DynamicList<label>& surfaceCount,
+    const DynamicList<label>& surfaceCounts,
     const point& edgePt,
     const vector& edgeNormal,       // normalised normal
     const point& pt,
@@ -702,7 +702,7 @@ void Foam::autoSnapDriver::correctAttraction
     scalar tang = ((pt-edgePt)&edgeNormal);
 
     labelList order;
-    Foam::sortedOrder(surfaceCount, order);
+    Foam::sortedOrder(surfaceCounts, order);
 
     if (order[0] < order[1])
     {
@@ -763,7 +763,7 @@ void Foam::autoSnapDriver::binFeatureFace
 
     DynamicList<point>& surfacePoints,
     DynamicList<vector>& surfaceNormals,
-    DynamicList<label>& surfaceCount
+    DynamicList<label>& surfaceCounts
 ) const
 {
     // What to do with very far attraction? For now just ignore the face
@@ -783,7 +783,7 @@ void Foam::autoSnapDriver::binFeatureFace
             )
             {
                 same = true;
-                surfaceCount[j]++;
+                surfaceCounts[j]++;
                 break;
             }
         }
@@ -796,7 +796,7 @@ void Foam::autoSnapDriver::binFeatureFace
             {
                 surfacePoints.append(pt);
                 surfaceNormals.append(faceSurfaceNormal);
-                surfaceCount.append(1);
+                surfaceCounts.append(1);
             }
             else if (surfacePoints.size() == 2)
             {
@@ -810,7 +810,7 @@ void Foam::autoSnapDriver::binFeatureFace
                     // Definitely makes a feature point
                     surfacePoints.append(pt);
                     surfaceNormals.append(faceSurfaceNormal);
-                    surfaceCount.append(1);
+                    surfaceCounts.append(1);
                 }
             }
             else if (surfacePoints.size() == 3)
@@ -834,7 +834,7 @@ void Foam::autoSnapDriver::binFeatureFace
                         // Different feature point
                         surfacePoints.append(pt);
                         surfaceNormals.append(faceSurfaceNormal);
-                        surfaceCount.append(1);
+                        surfaceCounts.append(1);
                     }
                 }
             }
@@ -860,15 +860,15 @@ void Foam::autoSnapDriver::binFeatureFaces
 
     DynamicList<point>& surfacePoints,
     DynamicList<vector>& surfaceNormals,
-    DynamicList<label>& surfaceCount
+    DynamicList<label>& surfaceCounts
 ) const
 {
-    const List<point>& pfNormals = pointFaceSurfNormals[pointI];
+    const List<point>& pfSurfNormals = pointFaceSurfNormals[pointI];
     const List<point>& pfDisp = pointFaceDisp[pointI];
     const List<point>& pfCentres = pointFaceCentres[pointI];
 
     // Collect all different directions
-    forAll(pfNormals, i)
+    forAll(pfSurfNormals, i)
     {
         binFeatureFace
         (
@@ -879,12 +879,12 @@ void Foam::autoSnapDriver::binFeatureFaces
             snapDist[pointI],
 
             pfCentres[i],
-            pfNormals[i],
+            pfSurfNormals[i],
             pfDisp[i],
 
             surfacePoints,
             surfaceNormals,
-            surfaceCount
+            surfaceCounts
         );
     }
 }
@@ -914,7 +914,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
     // Collect all different directions
     DynamicList<point> surfacePoints(4);
     DynamicList<vector> surfaceNormals(4);
-    DynamicList<label> surfaceCount(4);
+    DynamicList<label> surfaceCounts(4);
 
     binFeatureFaces
     (
@@ -931,7 +931,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 
         surfacePoints,
         surfaceNormals,
-        surfaceCount
+        surfaceCounts
     );
 
     const point& pt = pp.localPoints()[pointI];
@@ -966,11 +966,13 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
         vector d = r.refPoint()-pt;
         d -= (d&n)*n;
 
+        //- This does not help much but distorts a perfectly aligned mesh
+        //  so disabled for now.
         //// Correct for attraction to non-dominant face
         //correctAttraction
         //(
         //    surfacePoints,
-        //    surfaceCount,
+        //    surfaceCounts,
         //    r.refPoint(),
         //    n,                  // normalised normal
         //    pt,
@@ -1813,8 +1815,8 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
     }
 
     // Reverse: from pp point to nearest feature
-    vectorField allPatchAttraction(pp.nPoints(), vector::zero);
-    List<pointConstraint> allPatchConstraints(pp.nPoints());
+    vectorField rawPatchAttraction(pp.nPoints(), vector::zero);
+    List<pointConstraint> rawPatchConstraints(pp.nPoints());
 
     determineFeatures
     (
@@ -1837,15 +1839,15 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
         edgeAttractors,
         edgeConstraints,
         // pp point to nearest feature
-        allPatchAttraction,
-        allPatchConstraints
+        rawPatchAttraction,
+        rawPatchConstraints
     );
 
 
 
     // Baffle handling
     // ~~~~~~~~~~~~~~~
-    // Override pointAttractor, edgeAttractor, allPatchAttration etc. to
+    // Override pointAttractor, edgeAttractor, rawPatchAttration etc. to
     // implement 'baffle' handling.
     // Baffle: the mesh pp point originates from a loose standing
     // baffle.
@@ -1983,8 +1985,8 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
                     featI,
                     edgeAttractors,
                     edgeConstraints,
-                    allPatchAttraction,
-                    allPatchConstraints
+                    rawPatchAttraction,
+                    rawPatchConstraints
                 );
 
                 if (!nearInfo.hit())
@@ -2033,8 +2035,8 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
                             vector::zero;
 
                         // Store for later use
-                        allPatchAttraction[pointI] = featPt-pt;
-                        allPatchConstraints[pointI] =
+                        rawPatchAttraction[pointI] = featPt-pt;
+                        rawPatchConstraints[pointI] =
                             pointConstraints[featI][featPointI];
 
                         if (oldPointI != -1)
@@ -2053,8 +2055,8 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
                                 edgeFeatI,
                                 edgeAttractors,
                                 edgeConstraints,
-                                allPatchAttraction,
-                                allPatchConstraints
+                                rawPatchAttraction,
+                                rawPatchConstraints
                             );
                         }
                     }
@@ -2084,8 +2086,8 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
                         featI,
                         edgeAttractors,
                         edgeConstraints,
-                        allPatchAttraction,
-                        allPatchConstraints
+                        rawPatchAttraction,
+                        rawPatchConstraints
                     );
                 }
             }
@@ -2296,11 +2298,11 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
                 if
                 (
                     patchConstraints[pointI].first() <= 1
-                 && allPatchConstraints[pointI].first() > 1
+                 && rawPatchConstraints[pointI].first() > 1
                 )
                 {
-                    patchAttraction[pointI] = allPatchAttraction[pointI];
-                    patchConstraints[pointI] = allPatchConstraints[pointI];
+                    patchAttraction[pointI] = rawPatchAttraction[pointI];
+                    patchConstraints[pointI] = rawPatchConstraints[pointI];
 
                     if (multiPatchStr.valid())
                     {
@@ -2434,7 +2436,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
     // Snap edges to feature edges
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Walk existing edges and snap remaining ones (that are marked as
-    // feature edges in allPatchConstraints)
+    // feature edges in rawPatchConstraints)
 
     stringFeatureEdges
     (
@@ -2444,8 +2446,8 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
         pp,
         snapDist,
 
-        allPatchAttraction,
-        allPatchConstraints,
+        rawPatchAttraction,
+        rawPatchConstraints,
 
         patchAttraction,
         patchConstraints

From f68965855285883db5680221b46550a6137c7f25 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 2 Nov 2012 12:33:30 +0000
Subject: [PATCH 02/81] ENH: iglooWithFridges: make 1 aspect ratio

---
 .../constant/polyMesh/blockMeshDict           |  2 +-
 .../iglooWithFridges/system/snappyHexMeshDict | 34 +------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
index 707a53ea74..57de714b2f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/blockMeshDict
@@ -31,7 +31,7 @@ vertices
 
 blocks
 (
-    hex (0 1 2 3 4 5 6 7) (20 20 20) simpleGrading (1 1 1)
+    hex (0 1 2 3 4 5 6 7) (20 20 10) simpleGrading (1 1 1)
 );
 
 edges
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index 8297dae5af..788a479390 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -42,38 +42,6 @@ geometry
         max (1 1 1);
     }
 
-    fridgeFreezer
-    {
-        type searchableSurfaceCollection;
-
-        mergeSubRegions true;
-
-        freezer
-        {
-            surface box1;
-            scale (1 1 1);
-            transform
-            {
-                type    cartesian;
-                origin  (0 0 0);
-                e1      (1 0 0);
-                e3      (0 0 1);
-            }
-        }
-        fridge
-        {
-            surface box1;
-            scale (1 1 1.1);
-            transform
-            {
-                type    cartesian;
-                origin  (0 0 1);
-                e1      (1 0 0);
-                e3      (0 0 1);
-            }
-        }
-    }
-
     twoFridgeFreezers
     {
         type searchableSurfaceCollection;
@@ -150,7 +118,7 @@ castellatedMeshControls
     (
         {
             file "fridgeA.eMesh";
-            level 3;
+            levels ((0.01 3));
         }
     );
 

From 455ddcee8624eb6ef71adfb13f4af5e86a6e1d1f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 2 Nov 2012 16:27:23 +0000
Subject: [PATCH 03/81] ENH: filter tutorial: replace setsToZones with topoSet

---
 .../reactingParcelFoam/filter/Allrun          |  3 --
 .../filter/system/topoSetDict                 | 54 +++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
index b7428e064f..b82b7aad36 100755
--- a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun
@@ -13,9 +13,6 @@ runApplication blockMesh
 #setSet -batch system/sets.setSet > log.setSet1 2>&1
 runApplication topoSet
 
-# convert sets to zones
-setsToZones -noFlipMap > log.setsToZones 2>&1
-
 # create the first cyclic - lhs of porous zone
 # Note that we don't know what value to give these patches-out-of-nothing so
 # - use binary writing to avoid 'nan'
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
index fd7ee0e747..e77e55346f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict
@@ -28,6 +28,17 @@ actions
             box (1.5 -10 -10) (2 10 10);
         }
     }
+    {
+        name    filter;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set filter;
+        }
+    }
+
 
     {
         name    leftFluid;
@@ -39,6 +50,16 @@ actions
             box (-10 -10 -10) (1.5 10 10);
         }
     }
+    {
+        name    leftFluid;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set leftFluid;
+        }
+    }
     {
         name    rightFluid;
         type    cellSet;
@@ -49,6 +70,16 @@ actions
             box (2 -1 -1) (10 10 10);
         }
     }
+    {
+        name    rightFluid;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        sourceInfo
+        {
+            set rightFluid;
+        }
+    }
 
 
     // cycLeft
@@ -74,6 +105,17 @@ actions
             option  all;
         }
     }
+    // Create faceZone from cycLeft
+    {
+        name    cycLeft;
+        type    faceZoneSet;
+        action  new;
+        source  setToFaceZone;
+        sourceInfo
+        {
+            faceSet cycLeft;    // name of faceSet
+        }
+    }
 
     // cycRight
     {
@@ -98,6 +140,18 @@ actions
             option  all;
         }
     }
+    // Create faceZone from cycRight
+    {
+        name    cycRight;
+        type    faceZoneSet;
+        action  new;
+        source  setToFaceZone;
+        sourceInfo
+        {
+            faceSet cycRight;   // name of faceSet
+        }
+    }
+
 );
 
 // ************************************************************************* //

From 8dff9544f45053ac02aeabe59746b8ce1e388df9 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Tue, 6 Nov 2012 12:47:46 +0000
Subject: [PATCH 04/81] COMP: labelIOField.C missing from OpenFOAM/Make/files

---
 src/OpenFOAM/Make/files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 2fb7c7dfe2..d1061458e8 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -526,7 +526,7 @@ $(Fields)/symmTensorField/symmTensorField.C
 $(Fields)/tensorField/tensorField.C
 $(Fields)/complexFields/complexFields.C
 
-$(Fields)/labelField/labelIOField.
+$(Fields)/labelField/labelIOField.C
 $(Fields)/labelField/labelFieldIOField.C
 $(Fields)/scalarField/scalarIOField.C
 $(Fields)/scalarField/scalarFieldIOField.C

From 7d2db6738301b172024e1ce6165b78aa7b61bf37 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 7 Nov 2012 09:00:11 +0000
Subject: [PATCH 05/81] ENH: motorBike: enable feature snapping. add
 patchSummary

---
 .../simpleFoam/motorBike/Allrun               |  2 ++
 .../motorBike/system/snappyHexMeshDict        | 33 ++++++++++++++-----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index 714dba48dc..d3466dcfab 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -6,6 +6,7 @@ cd ${0%/*} || exit 1    # run from this directory
 
 # copy motorbike surface from resources folder
 cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+runApplication surfaceFeatureExtract
 
 runApplication blockMesh
 
@@ -19,6 +20,7 @@ runParallel snappyHexMesh 6 -overwrite
 ls -d processor* | xargs -i rm -rf ./{}/0 $1
 ls -d processor* | xargs -i cp -r 0.org ./{}/0 $1
 
+runParallel patchSummary 6
 runParallel potentialFoam 6 -noFunctionObjects -writep
 runParallel `getApplication` 6
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 68819f01c4..517ef75b9c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -90,10 +90,10 @@ castellatedMeshControls
     // This is a featureEdgeMesh, read from constant/triSurface for now.
     features
     (
-        //{
-        //    file "someLine.eMesh";
-        //    level 2;
-        //}
+        {
+            file "motorBike.eMesh";
+            level 0;
+        }
     );
 
 
@@ -189,10 +189,21 @@ snapControls
     //  before upon reaching a correct mesh.
     nRelaxIter 5;
 
-    //- Highly experimental and wip: number of feature edge snapping
-    //  iterations. Leave out altogether to disable.
-    //  Do not use here since mesh resolution too low and baffles present
-    //nFeatureSnapIter 10;
+    // Feature snapping
+
+        //- Number of feature edge snapping iterations.
+        //  Leave out altogether to disable.
+        nFeatureSnapIter 10;
+
+        //- Detect (geometric only) features by sampling the surface
+        //  (default=false).
+        implicitFeatureSnap false;
+
+        //- Use castellatedMeshControls::features (default = true)
+        explicitFeatureSnap true;
+
+        //- Detect points on multiple surfaces (only for explicitFeatureSnap)
+        multiRegionFeatureSnap true;
 }
 
 
@@ -239,7 +250,11 @@ addLayersControls
 
     //- When not to extrude surface. 0 is flat surface, 90 is when two faces
     //  make straight angle.
-    featureAngle 30;
+    featureAngle 60;
+
+    //- At non-patched sides allow mesh to slip if extrusion direction makes
+    //  angle larger than slipFeatureAngle.
+    slipFeatureAngle 30;
 
     //- Maximum number of snapping relaxation iterations. Should stop
     //  before upon reaching a correct mesh.

From 2a686dc44c2bf7a3d29a4cc070b60c89765a942a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 8 Nov 2012 12:00:40 +0000
Subject: [PATCH 06/81] ENH: channel395: run in parallel. Tests
 processorCyclic.

---
 .../pimpleFoam/channel395/Allrun              |  10 +-
 .../channel395/constant/polyMesh/boundary     |   8 ++
 .../channel395/system/decomposeParDict        | 135 ++++++++++++++++++
 3 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict

diff --git a/tutorials/incompressible/pimpleFoam/channel395/Allrun b/tutorials/incompressible/pimpleFoam/channel395/Allrun
index 61c1b54530..7f75af44c2 100755
--- a/tutorials/incompressible/pimpleFoam/channel395/Allrun
+++ b/tutorials/incompressible/pimpleFoam/channel395/Allrun
@@ -8,7 +8,15 @@ cd ${0%/*} || exit 1    # run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-runApplication $application
+
+#- Run serial
+#runApplication $application
+
+#- Run parallel
+runApplication decomposePar -cellDist
+runParallel $application 5
+runApplication reconstructPar
+
 runApplication postChannel
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/channel395/constant/polyMesh/boundary
index 655c5c0b54..12dc93fdc2 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/polyMesh/boundary
@@ -32,6 +32,7 @@ FoamFile
     sides1_half0
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          1000;
         startFace       177700;
         matchTolerance  0.0001;
@@ -40,6 +41,7 @@ FoamFile
     sides1_half1
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          1000;
         startFace       178700;
         matchTolerance  0.0001;
@@ -48,6 +50,7 @@ FoamFile
     sides2_half0
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          1000;
         startFace       179700;
         matchTolerance  0.0001;
@@ -56,6 +59,7 @@ FoamFile
     sides2_half1
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          1000;
         startFace       180700;
         matchTolerance  0.0001;
@@ -64,6 +68,7 @@ FoamFile
     inout1_half0
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          750;
         startFace       181700;
         matchTolerance  0.0001;
@@ -72,6 +77,7 @@ FoamFile
     inout1_half1
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          750;
         startFace       182450;
         matchTolerance  0.0001;
@@ -80,6 +86,7 @@ FoamFile
     inout2_half0
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          750;
         startFace       183200;
         matchTolerance  0.0001;
@@ -88,6 +95,7 @@ FoamFile
     inout2_half1
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          750;
         startFace       183950;
         matchTolerance  0.0001;
diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
new file mode 100644
index 0000000000..9f0365f2de
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/channel395/system/decomposeParDict
@@ -0,0 +1,135 @@
+/*--------------------------------*- 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       dictionary;
+    note        "mesh decomposition control dictionary";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  5;
+
+//- Keep owner and neighbour on same processor for faces in zones:
+// preserveFaceZones (heater solid1 solid3);
+
+//- Keep owner and neighbour on same processor for faces in patches:
+//  (makes sense only for cyclic patches)
+//preservePatches (cyclic_half0 cyclic_half1);
+
+//- Keep all of faceSet on a single processor. This puts all cells
+//  connected with a point, edge or face on the same processor.
+//  (just having face connected cells might not guarantee a balanced
+//  decomposition)
+// The processor can be -1 (the decompositionMethod chooses the processor
+// for a good load balance) or explicitly provided (upsets balance).
+//singleProcessorFaceSets ((f0 -1));
+
+
+//- Use the volScalarField named here as a weight for each cell in the
+//  decomposition.  For example, use a particle population field to decompose
+//  for a balanced number of particles in a lagrangian simulation.
+// weightField dsmcRhoNMean;
+
+method          scotch;
+//method          hierarchical;
+// method          simple;
+// method          metis;
+// method          manual;
+// method          multiLevel;
+// method          structured;  // does 2D decomposition of structured mesh
+
+multiLevelCoeffs
+{
+    // Decomposition methods to apply in turn. This is like hierarchical but
+    // fully general - every method can be used at every level.
+
+    level0
+    {
+        numberOfSubdomains  64;
+        //method simple;
+        //simpleCoeffs
+        //{
+        //    n           (2 1 1);
+        //    delta       0.001;
+        //}
+        method scotch;
+    }
+    level1
+    {
+        numberOfSubdomains  4;
+        method scotch;
+    }
+}
+
+// Desired output
+
+simpleCoeffs
+{
+    n           (2 1 1);
+    delta       0.001;
+}
+
+hierarchicalCoeffs
+{
+    n           (1 2 1);
+    delta       0.001;
+    order       xyz;
+}
+
+metisCoeffs
+{
+ /*
+    processorWeights
+    (
+        1
+        1
+        1
+        1
+    );
+  */
+}
+
+scotchCoeffs
+{
+    //processorWeights
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+    //writeGraph  true;
+    //strategy "b";
+}
+
+manualCoeffs
+{
+    dataFile    "decompositionData";
+}
+
+structuredCoeffs
+{
+    // Patches to do 2D decomposition on. Structured mesh only; cells have
+    // to be in 'columns' on top of patches.
+    patches     (bottomPatch);
+}
+
+//// Is the case distributed? Note: command-line argument -roots takes
+//// precedence
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+// ************************************************************************* //

From b6d5020fb55197ecc1af845c8e27b9d9edc48fff Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 8 Nov 2012 12:02:10 +0000
Subject: [PATCH 07/81] ENH: CleanFunctions: remove cellDist file (from
 decomposePar -cellDist)

---
 bin/tools/CleanFunctions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 758627a29a..8a6301a545 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -101,7 +101,7 @@ cleanCase()
     rm -rf constant/tetDualMesh > /dev/null 2>&1
 
     rm -rf VTK > /dev/null 2>&1
-    rm -f 0/cellLevel 0/pointLevel
+    rm -f 0/cellLevel 0/pointLevel 0/cellDist constant/cellDecomposition
 
     if [ -e constant/polyMesh/blockMeshDict.m4 ]
     then

From 7f903b7239184210aee2fcc1828bfd87f14894e5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 9 Nov 2012 16:42:44 +0000
Subject: [PATCH 08/81] ENH: triSurfaceMesh: access to tolerance

---
 src/meshTools/searchableSurface/triSurfaceMesh.C | 6 ++++++
 src/meshTools/searchableSurface/triSurfaceMesh.H | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 86fcd5889b..2508cdb919 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -625,6 +625,12 @@ Foam::triSurfaceMesh::edgeTree() const
 }
 
 
+Foam::scalar Foam::triSurfaceMesh::tolerance() const
+{
+    return tolerance_;
+}
+
+
 const Foam::wordList& Foam::triSurfaceMesh::regions() const
 {
     if (regions_.empty())
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.H b/src/meshTools/searchableSurface/triSurfaceMesh.H
index a1d0378487..aa462e2554 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,6 +182,7 @@ public:
         //- Demand driven contruction of octree for boundary edges
         const indexedOctree<treeDataEdge>& edgeTree() const;
 
+        scalar tolerance() const;
 
         // searchableSurface implementation
 

From 37b873b051d1a28759cbf20586f52039d58aa2db Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 9 Nov 2012 16:43:21 +0000
Subject: [PATCH 09/81] ENH: Sliced: option to slice non-processor coupled
 patchFields

---
 .../SlicedGeometricField.C                    | 27 +++++++++++++---
 .../SlicedGeometricField.H                    |  8 +++--
 src/finiteVolume/fvMesh/fvMeshGeometry.C      | 31 +++----------------
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index 43d14a5740..1ea9ae6e11 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SlicedGeometricField.H"
+#include "processorFvPatch.H"
 
 // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * * //
 
@@ -40,7 +41,8 @@ slicedBoundaryField
 (
     const Mesh& mesh,
     const Field<Type>& completeField,
-    const bool preserveCouples
+    const bool preserveCouples,
+    const bool preserveProcessorOnly
 )
 {
     tmp<FieldField<PatchField, Type> > tbf
@@ -52,7 +54,15 @@ slicedBoundaryField
 
     forAll(mesh.boundary(), patchi)
     {
-        if (preserveCouples && mesh.boundary()[patchi].coupled())
+        if
+        (
+            preserveCouples
+         && mesh.boundary()[patchi].coupled()
+         && (
+               !preserveProcessorOnly
+            || isA<processorFvPatch>(mesh.boundary()[patchi])
+            )
+        )
         {
             // For coupled patched construct the correct patch field type
             bf.set
@@ -243,7 +253,8 @@ SlicedGeometricField
     const dimensionSet& ds,
     const Field<Type>& completeIField,
     const Field<Type>& completeBField,
-    const bool preserveCouples
+    const bool preserveCouples,
+    const bool preserveProcessorOnly
 )
 :
     GeometricField<Type, PatchField, GeoMesh>
@@ -252,7 +263,13 @@ SlicedGeometricField
         mesh,
         ds,
         Field<Type>(),
-        slicedBoundaryField(mesh, completeBField, preserveCouples)
+        slicedBoundaryField
+        (
+            mesh,
+            completeBField,
+            preserveCouples,
+            preserveProcessorOnly
+        )
     )
 {
     // Set the internalField to the slice of the complete field
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index e04690e042..dd23712e67 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,8 @@ private:
         (
             const Mesh& mesh,
             const Field<Type>& completeField,
-            const bool preserveCouples
+            const bool preserveCouples,
+            const bool preserveProcessorOnly = false
         );
 
         //- Slice the given field and a create a PtrList of SlicedPatchField
@@ -133,7 +134,8 @@ public:
             const dimensionSet&,
             const Field<Type>& completeIField,
             const Field<Type>& completeBField,
-            const bool preserveCouples=true
+            const bool preserveCouples=true,
+            const bool preserveProcessorOnly = false
         );
 
         //- Construct from GeometricField. Reuses full internal and
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 0a06ef7364..5abdb45d11 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -133,6 +133,8 @@ void fvMesh::makeC() const
             << abort(FatalError);
     }
 
+    // Construct as slices. Only preserve processor (not e.g. cyclic)
+
     CPtr_ = new slicedVolVectorField
     (
         IOobject
@@ -148,33 +150,10 @@ void fvMesh::makeC() const
         *this,
         dimLength,
         cellCentres(),
-        faceCentres()
+        faceCentres(),
+        true,               //preserveCouples
+        true                //preserveProcOnly
     );
-
-
-    // Need to correct for cyclics transformation since absolute quantity.
-    // Ok on processor patches since hold opposite cell centre (no
-    // transformation)
-    slicedVolVectorField& C = *CPtr_;
-
-    forAll(C.boundaryField(), patchi)
-    {
-        if
-        (
-            isA<cyclicFvPatchVectorField>(C.boundaryField()[patchi])
-         || isA<cyclicAMIFvPatchVectorField>(C.boundaryField()[patchi])
-        )
-        {
-            // Note: cyclic is not slice but proper field
-            C.boundaryField()[patchi] == static_cast<const vectorField&>
-            (
-                static_cast<const List<vector>&>
-                (
-                    boundary_[patchi].patchSlice(faceCentres())
-                )
-            );
-        }
-    }
 }
 
 

From 711a0e99cfdd92fa6b28e128d6c8444eb33f051d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 10:38:23 +0000
Subject: [PATCH 10/81] ENH: Added film coverage field, alpha, to
 kinematicSingleLayer film model

---
 .../kinematicSingleLayer.C                    | 25 ++++++++++++++++++-
 .../kinematicSingleLayer.H                    | 11 +++++++-
 .../kinematicSingleLayerI.H                   |  8 +++++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 86f5b34b63..050c27d3af 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -197,6 +197,12 @@ tmp<volScalarField> kinematicSingleLayer::pp()
 }
 
 
+void kinematicSingleLayer::correctAlpha()
+{
+    alpha_ == pos(delta_ - dimensionedScalar("SMALL", dimless, SMALL));
+}
+
+
 void kinematicSingleLayer::updateSubmodels()
 {
     if (debug)
@@ -503,6 +509,19 @@ kinematicSingleLayer::kinematicSingleLayer
         ),
         regionMesh()
     ),
+    alpha_
+    (
+        IOobject
+        (
+            "alpha",
+            time().timeName(),
+            regionMesh(),
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        regionMesh(),
+        dimensionedScalar("zero", dimless, 0.0)
+    ),
     U_
     (
         IOobject
@@ -838,6 +857,8 @@ void kinematicSingleLayer::evolveRegion()
         Info<< "kinematicSingleLayer::evolveRegion()" << endl;
     }
 
+    correctAlpha();
+
     updateSubmodels();
 
     // Solve continuity for deltaRho_
@@ -1032,7 +1053,9 @@ void kinematicSingleLayer::info() const
         << indent << "min/max(mag(U))    = " << min(mag(U_)).value() << ", "
         << max(mag(U_)).value() << nl
         << indent << "min/max(delta)     = " << min(delta_).value() << ", "
-        << max(delta_).value() << nl;
+        << max(delta_).value() << nl
+        << indent << "coverage           = "
+        << gSum(alpha_.internalField()*magSf())/gSum(magSf()) <<  nl;
 
     injection_.info(Info);
 }
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
index b084f885d4..796866330c 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,6 +113,9 @@ protected:
             //- Film thickness / [m]
             volScalarField delta_;
 
+            //- Film coverage indicator, 1 = covered, 0 = uncovered / []
+            volScalarField alpha_;
+
             //- Velocity - mean / [m/s]
             volVectorField U_;
 
@@ -227,6 +230,9 @@ protected:
         // Implicit pressure source coefficient
         virtual tmp<volScalarField> pp();
 
+        //- Correct film coverage field
+        virtual void correctAlpha();
+
         //- Update the film sub-models
         virtual void updateSubmodels();
 
@@ -323,6 +329,9 @@ public:
             //- Return const access to the film thickness / [m]
             inline const volScalarField& delta() const;
 
+            //- Return the film coverage, 1 = covered, 0 = uncovered / []
+            inline const volScalarField& alpha() const;
+
             //- Return the film velocity [m/s]
             virtual const volVectorField& U() const;
 
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
index e717acc430..89eb8b6145 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,6 +79,12 @@ inline const volScalarField& kinematicSingleLayer::delta() const
 }
 
 
+inline const volScalarField& kinematicSingleLayer::alpha() const
+{
+    return alpha_;
+}
+
+
 inline volVectorField& kinematicSingleLayer::USpPrimary()
 {
     return USpPrimary_;

From f75d998b10572e06dde60d1ab7a63f5dd3964706 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 10:45:11 +0000
Subject: [PATCH 11/81] ENH: Added film coverage calculation to
 thermoSingleLayer film model

---
 .../thermoSingleLayer/thermoSingleLayer.C     | 40 +++++++++++++++++++
 .../thermoSingleLayer/thermoSingleLayer.H     | 21 +++++++++-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 1cb392eb6a..758abe807b 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -227,6 +227,33 @@ void thermoSingleLayer::transferPrimaryRegionSourceFields()
 }
 
 
+void thermoSingleLayer::correctAlpha()
+{
+    if (hydrophilic_)
+    {
+        const scalar hydrophilicDry = hydrophilicDryScale_*deltaWet_;
+        const scalar hydrophilicWet = hydrophilicWetScale_*deltaWet_;
+
+        forAll(alpha_, i)
+        {
+            if ((alpha_[i] < 0.5) && (delta_[i] > hydrophilicDry))
+            {
+                alpha_[i] = 1.0;
+            }
+            else if ((alpha_[i] > 0.5) && (delta_[i] < hydrophilicWet))
+            {
+                alpha_[i] = 0.0;
+            }
+        }
+    }
+    else
+    {
+        alpha_ ==
+            pos(delta_ - dimensionedScalar("deltaWet", dimLength, deltaWet_));
+    }
+}
+
+
 void thermoSingleLayer::updateSubmodels()
 {
     if (debug)
@@ -426,6 +453,11 @@ thermoSingleLayer::thermoSingleLayer
         zeroGradientFvPatchScalarField::typeName
     ),
 
+    deltaWet_(readScalar(coeffs_.lookup("deltaWet"))),
+    hydrophilic_(readBool(coeffs_.lookup("hydrophilic"))),
+    hydrophilicDryScale_(0.0),
+    hydrophilicWetScale_(0.0),
+
     hsSp_
     (
         IOobject
@@ -510,6 +542,12 @@ thermoSingleLayer::thermoSingleLayer
         }
     }
 
+    if (hydrophilic_)
+    {
+        coeffs_.lookup("hydrophilicDryScale") >> hydrophilicDryScale_;
+        coeffs_.lookup("hydrophilicWetScale") >> hydrophilicWetScale_;
+    }
+
     if (readFields)
     {
         transferPrimaryRegionThermoFields();
@@ -584,6 +622,8 @@ void thermoSingleLayer::evolveRegion()
         Info<< "thermoSingleLayer::evolveRegion()" << endl;
     }
 
+    correctAlpha();
+
     updateSubmodels();
 
     // Solve continuity for deltaRho_
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index 6814e25a3e..bce30b4483 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,6 +123,22 @@ protected:
                 volScalarField primaryEnergyPCTrans_;
 
 
+        //- Threshold film thickness beyond which the film is considered 'wet'
+        scalar deltaWet_;
+
+
+        // Hyprophilic/phobic properties
+
+            //- Activation flag
+            bool hydrophilic_;
+
+            //- Length scale applied to deltaWet_ for dry faces, typically 0.5
+            scalar hydrophilicDryScale_;
+
+            //- Length scale applied to deltaWet_ for wet faces, typically 0.001
+            scalar hydrophilicWetScale_;
+
+
         // Source term fields
 
             // Film region - registered to the film region mesh
@@ -190,6 +206,9 @@ protected:
         //- Transfer source fields from the primary region to the film region
         virtual void transferPrimaryRegionSourceFields();
 
+        //- Correct film coverage field
+        virtual void correctAlpha();
+
         //- Update the film sub-models
         virtual void updateSubmodels();
 

From fdcb0f5d0aee1c923a0c57d1f7d2f30ec36922ba Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 10:46:24 +0000
Subject: [PATCH 12/81] STYLE: Corrected doxygen comment tags

---
 .../kinematicSingleLayer/kinematicSingleLayer.H               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
index 796866330c..079999d0cd 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
@@ -224,10 +224,10 @@ protected:
         //- Transfer source fields from the primary region to the film region
         virtual void transferPrimaryRegionSourceFields();
 
-        // Explicit pressure source contribution
+        //- Explicit pressure source contribution
         virtual tmp<volScalarField> pu();
 
-        // Implicit pressure source coefficient
+        //- Implicit pressure source coefficient
         virtual tmp<volScalarField> pp();
 
         //- Correct film coverage field

From d1a0319972a1e3f33ca033e9c149b6de48225a22 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 10:47:49 +0000
Subject: [PATCH 13/81] ENH: Updated film netMass() calculation

---
 .../kinematicSingleLayer/kinematicSingleLayerI.H               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
index 89eb8b6145..6a77b614bc 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
@@ -179,7 +179,8 @@ inline tmp<volScalarField> kinematicSingleLayer::netMass() const
 {
     dimensionedScalar d0("SMALL", dimLength, ROOTVSMALL);
     return
-        fvc::surfaceSum(phi_/(fvc::interpolate(delta_) + d0))*time().deltaT()
+        fvc::surfaceSum(pos(phi_)*phi_/(fvc::interpolate(delta_) + d0))
+       *time().deltaT()
       + rho_*delta_*magSf();
 }
 

From 6b427e64a18654f39bebc28a528f77c2d5f44b69 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 10:49:50 +0000
Subject: [PATCH 14/81] ENH: Apply quadratic profilke when setting upper film
 surface velocity

---
 .../kinematicSingleLayer/kinematicSingleLayer.C               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 050c27d3af..a9094d55c1 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -282,8 +282,8 @@ void kinematicSingleLayer::updateSurfaceVelocities()
     Uw_ -= nHat()*(Uw_ & nHat());
     Uw_.correctBoundaryConditions();
 
-    // TODO: apply quadratic profile to determine surface velocity
-    Us_ = U_;
+    // apply quadratic profile to surface velocity
+    Us_ = 2.0*U_;
     Us_.correctBoundaryConditions();
 }
 

From 156d515b43015b0cc09ba3d33630b39246a553ee Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 10:50:59 +0000
Subject: [PATCH 15/81] ENH: Added call to base class preEvolveRegion

---
 .../kinematicSingleLayer/kinematicSingleLayer.C                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index a9094d55c1..28a6acdbaa 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -836,6 +836,8 @@ void kinematicSingleLayer::preEvolveRegion()
         Info<< "kinematicSingleLayer::preEvolveRegion()" << endl;
     }
 
+    surfaceFilmModel::preEvolveRegion();
+
     transferPrimaryRegionThermoFields();
 
     correctThermoFields();

From 85f1ba27523d3bc12385f0c00d7292505fa1ef12 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 10:53:48 +0000
Subject: [PATCH 16/81] ENH: Added dummy access to alpha for noFilm film model

---
 .../surfaceFilmModels/noFilm/noFilm.C           | 17 +++++++++++++----
 .../surfaceFilmModels/noFilm/noFilm.H           |  9 ++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
index 1c267307ec..82f3d0afc9 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,10 +102,10 @@ const volScalarField& noFilm::delta() const
 }
 
 
-const volScalarField& noFilm::sigma() const
+const volScalarField& noFilm::alpha() const
 {
-    FatalErrorIn("const volScalarField& noFilm::sigma() const")
-        << "sigma field not available for " << type() << abort(FatalError);
+    FatalErrorIn("const volScalarField& noFilm::alpha() const")
+        << "alpha field not available for " << type() << abort(FatalError);
 
     return volScalarField::null();
 }
@@ -192,6 +192,15 @@ const volScalarField& noFilm::kappa() const
 }
 
 
+const volScalarField& noFilm::sigma() const
+{
+    FatalErrorIn("const volScalarField& noFilm::sigma() const")
+        << "sigma field not available for " << type() << abort(FatalError);
+
+    return volScalarField::null();
+}
+
+
 tmp<volScalarField> noFilm::primaryMassTrans() const
 {
     return tmp<volScalarField>
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
index 76501a4fd8..17915f7788 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,8 +115,8 @@ public:
             //- Return the film thickness [m]
             virtual const volScalarField& delta() const;
 
-            //- Return const access to the surface tension / [m/s2]
-            inline const volScalarField& sigma() const;
+            //- Return the film coverage, 1 = covered, 0 = uncovered / []
+            virtual const volScalarField& alpha() const;
 
             //- Return the film velocity [m/s]
             virtual const volVectorField& U() const;
@@ -145,6 +145,9 @@ public:
             //- Return the film thermal conductivity [W/m/K]
             virtual const volScalarField& kappa() const;
 
+            //- Return const access to the surface tension / [m/s2]
+            inline const volScalarField& sigma() const;
+
 
             // Transfer fields - to the primary region
 

From f47adb9a0fbc070651bdb3e82c93f2b43e22d782 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 10:56:16 +0000
Subject: [PATCH 17/81] ENH: Enforce consistent treatment for film energy
 source with mass term

---
 .../surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 758abe807b..9f0c18c0cc 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -317,7 +317,8 @@ void thermoSingleLayer::solveEnergy()
       - hsSp_
       + q(hs_)
       + radiation_->Shs()
-      - fvm::SuSp(rhoSp_, hs_)
+//      - fvm::SuSp(rhoSp_, hs_)
+      - rhoSp_*hs_
     );
 
     correctThermoFields();

From f036f5a761a72d8f0fccdf6b49466cab5ea64414 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 11:00:03 +0000
Subject: [PATCH 18/81] ENH: Added optional temperature limiting to thermo film
 model

---
 .../thermoSingleLayer/thermoSingleLayer.C          | 14 +++++++++++++-
 .../thermoSingleLayer/thermoSingleLayer.H          |  9 +++++++++
 .../thermoSingleLayer/thermoSingleLayerI.H         |  9 +++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 9f0c18c0cc..417274da8e 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -514,8 +514,20 @@ thermoSingleLayer::thermoSingleLayer
         heatTransferModel::New(*this, coeffs().subDict("lowerSurfaceModels"))
     ),
     phaseChange_(phaseChangeModel::New(*this, coeffs())),
-    radiation_(filmRadiationModel::New(*this, coeffs()))
+    radiation_(filmRadiationModel::New(*this, coeffs())),
+    Tmin_(-VGREAT),
+    Tmax_(VGREAT)
 {
+    if (coeffs().readIfPresent("Tmin", Tmin_))
+    {
+        Info<< "    limiting minimum temperature to " << Tmin_ << endl;
+    }
+
+    if (coeffs().readIfPresent("Tmax", Tmax_))
+    {
+        Info<< "    limiting maximum temperature to " << Tmax_ << endl;
+    }
+
     if (thermo_.hasMultiComponentCarrier())
     {
         YPrimary_.setSize(thermo_.carrier().species().size());
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index bce30b4483..c67a6ef6b5 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -166,6 +166,15 @@ protected:
             PtrList<volScalarField> YPrimary_;
 
 
+        // Limits
+
+            //- Minimum temperature limit (optional)
+            scalar Tmin_;
+
+            //- Maximum temperature limit (optional)
+            scalar Tmax_;
+
+
         // Sub-models
 
             //- Heat transfer coefficient bewteen film surface and primary
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
index 73dc08496b..c8ba48f984 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ inline tmp<volScalarField> thermoSingleLayer::T
     const volScalarField& hs
 ) const
 {
-    return tmp<volScalarField>
+    tmp<volScalarField> tT
     (
         new volScalarField
         (
@@ -104,6 +104,11 @@ inline tmp<volScalarField> thermoSingleLayer::T
             zeroGradientFvPatchScalarField::typeName
         )
     );
+
+    tT().min(Tmax_);
+    tT().max(Tmin_);
+
+    return tT;
 }
 
 

From e8e95a38cb985dec3527157f9739cf2de9f1bbf5 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 11:24:06 +0000
Subject: [PATCH 19/81] ENH: Added on-the-fly heat flux calculations to
 thermoFilm

---
 .../thermoSingleLayer/thermoSingleLayer.H     |  9 ++++++++
 .../thermoSingleLayer/thermoSingleLayerI.H    | 21 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index c67a6ef6b5..ae0dc780c9 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -370,6 +370,15 @@ public:
             inline const filmRadiationModel& radiation() const;
 
 
+        // Derived fields (calculated on-the-fly)
+
+            //- Return the convective heat energy from film to wall
+            inline tmp<scalarField> Qconvw(const label patchI) const;
+
+            //- Return the convective heat energy from primary region to film
+            inline tmp<scalarField> Qconvp(const label patchI) const;
+
+
         // Evolution
 
             //- Pre-evolve film hook
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
index c8ba48f984..659a315f49 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "thermoSingleLayer.H"
+#include "heatTransferModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -160,6 +161,26 @@ inline const filmRadiationModel& thermoSingleLayer::radiation() const
 }
 
 
+inline tmp<scalarField> thermoSingleLayer::Qconvw(const label patchI) const
+{
+    const scalarField htc(htcw_->h()().boundaryField()[patchI]);
+    const scalarField& Tp = T_.boundaryField()[patchI];
+    const scalarField& Twp = Tw_.boundaryField()[patchI];
+
+    return htc*(Tp - Twp);
+}
+
+
+inline tmp<scalarField> thermoSingleLayer::Qconvp(const label patchI) const
+{
+    const scalarField htc(htcs_->h()().boundaryField()[patchI]);
+    const scalarField& Tp = T_.boundaryField()[patchI];
+    const scalarField& Tpp = TPrimary_.boundaryField()[patchI];
+
+    return htc*(Tp - Tpp);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace surfaceFilmModels

From fe3751981942aa111a9ec6b68008d0d9988bb847 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 11:30:00 +0000
Subject: [PATCH 20/81] ENH: Updated film contact angle force to make use of
 alpha field

---
 .../contactAngleForce/contactAngleForce.C     | 31 +++++++------------
 .../contactAngleForce/contactAngleForce.H     |  5 +--
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
index 5f31601474..2ceff1429f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,6 @@ contactAngleForce::contactAngleForce
 )
 :
     force(typeName, owner, dict),
-    deltaWet_(readScalar(coeffs_.lookup("deltaWet"))),
     Ccf_(readScalar(coeffs_.lookup("Ccf"))),
     rndGen_(label(0), -1),
     distribution_
@@ -82,7 +81,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
         (
             IOobject
             (
-                "contactForce",
+                typeName + ".contactForce",
                 owner_.time().timeName(),
                 owner_.regionMesh(),
                 IOobject::NO_READ,
@@ -100,17 +99,11 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
 
     const scalarField& magSf = owner_.magSf();
 
-    const volScalarField& delta = owner_.delta();
+    const volScalarField& alpha = owner_.alpha();
     const volScalarField& sigma = owner_.sigma();
 
-    volScalarField alpha
-    (
-        "alpha",
-        pos(delta - dimensionedScalar("deltaWet", dimLength, deltaWet_))
-    );
     volVectorField gradAlpha(fvc::grad(alpha));
 
-
     scalarField nHits(owner_.regionMesh().nCells(), 0.0);
 
     forAll(nbr, faceI)
@@ -119,19 +112,17 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
         const label cellN = nbr[faceI];
 
         label cellI = -1;
-        if ((delta[cellO] > deltaWet_) && (delta[cellN] < deltaWet_))
+        if ((alpha[cellO] > 0.5) && (alpha[cellN] < 0.5))
         {
             cellI = cellO;
         }
-        else if ((delta[cellO] < deltaWet_) && (delta[cellN] > deltaWet_))
+        else if ((alpha[cellO] < 0.5) && (alpha[cellN] > 0.5))
         {
             cellI = cellN;
         }
 
         if (cellI != -1)
         {
-//            const scalar dx = Foam::sqrt(magSf[cellI]);
-            // bit of a cheat, but ok for regular meshes
             const scalar dx = owner_.regionMesh().deltaCoeffs()[faceI];
             const vector n =
                 gradAlpha[cellI]/(mag(gradAlpha[cellI]) + ROOTVSMALL);
@@ -141,17 +132,17 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
         }
     }
 
-    forAll(delta.boundaryField(), patchI)
+    forAll(alpha.boundaryField(), patchI)
     {
-        const fvPatchField<scalar>& df = delta.boundaryField()[patchI];
-        const scalarField& dx = df.patch().deltaCoeffs();
-        const labelUList& faceCells = df.patch().faceCells();
+        const fvPatchField<scalar>& alphaf = alpha.boundaryField()[patchI];
+        const scalarField& dx = alphaf.patch().deltaCoeffs();
+        const labelUList& faceCells = alphaf.patch().faceCells();
 
-        forAll(df, faceI)
+        forAll(alphaf, faceI)
         {
             label cellO = faceCells[faceI];
 
-            if ((delta[cellO] > deltaWet_) && (df[faceI] < deltaWet_))
+            if ((alpha[cellO] > 0.5) && (alphaf[faceI] < 0.5))
             {
                 const vector n =
                     gradAlpha[cellO]/(mag(gradAlpha[cellO]) + ROOTVSMALL);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H
index 2ed08e02ee..8a6dc7a8b3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,9 +60,6 @@ private:
 
     // Private Data
 
-        //- Threshold film thickness beyon which the film is 'wet'
-        scalar deltaWet_;
-
         //- Coefficient applied to the contact angle force
         scalar Ccf_;
 

From dfb41f426b43487d403e0c67fc50d0e3bdde38e6 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 11:32:34 +0000
Subject: [PATCH 21/81] ENH: Added pure virtual call to alpha in
 surfaceFilmModel

---
 .../surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
index 32c71b3fed..2aa4423196 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,6 +186,9 @@ public:
             //- Return the film thickness [m]
             virtual const volScalarField& delta() const = 0;
 
+            //- Return the film coverage, 1 = covered, 0 = uncovered / []
+            virtual const volScalarField& alpha() const = 0;
+
             //- Return the film velocity [m/s]
             virtual const volVectorField& U() const = 0;
 

From 01eee4dc42db2debc2218f2df3c5551e72d55fb1 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 11:34:23 +0000
Subject: [PATCH 22/81] ENH: Corrected initialisation order

---
 .../thermoSingleLayer/thermoSingleLayer.H       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index ae0dc780c9..696728e7f9 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -166,15 +166,6 @@ protected:
             PtrList<volScalarField> YPrimary_;
 
 
-        // Limits
-
-            //- Minimum temperature limit (optional)
-            scalar Tmin_;
-
-            //- Maximum temperature limit (optional)
-            scalar Tmax_;
-
-
         // Sub-models
 
             //- Heat transfer coefficient bewteen film surface and primary
@@ -191,6 +182,14 @@ protected:
             autoPtr<filmRadiationModel> radiation_;
 
 
+        // Limits
+
+            //- Minimum temperature limit (optional)
+            scalar Tmin_;
+
+            //- Maximum temperature limit (optional)
+            scalar Tmax_;
+
 
     // Protected member functions
 

From a3cb7bd6a838a6c73c968883a2ad7a86f078b377 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 11:37:15 +0000
Subject: [PATCH 23/81] ENH: Updated upper limit for wall shear

---
 .../kinematic/force/surfaceShearForce/surfaceShearForce.C     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
index c5419d2909..2c0a94f9f8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ tmp<fvVectorMatrix> surfaceShearForce::correct(volVectorField& U)
     // linear coeffs to apply to velocity
     const volScalarField& Cs = tCs();
     volScalarField Cw("Cw", mu/(0.3333*(delta + d0)));
-    Cw.min(1.0e+06);
+    Cw.min(5000.0);
 
     return
     (

From f1a2be143270efe7e1c94027b93a889165bcf5a9 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 11:40:30 +0000
Subject: [PATCH 24/81] ENH: Simplified film phase change model for boiling

---
 .../standardPhaseChange/standardPhaseChange.C     | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index 552bd0dda4..e632712ff4 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,14 +113,10 @@ void standardPhaseChange::correctModel
     const scalarField& YInf = film.YPrimary()[vapId];
     const scalarField& pInf = film.pPrimary();
     const scalarField& T = film.T();
-    const scalarField& Tw = film.Tw();
     const scalarField& rho = film.rho();
-    const scalarField& TInf = film.TPrimary();
     const scalarField& rhoInf = film.rhoPrimary();
     const scalarField& muInf = film.muPrimary();
     const scalarField& magSf = film.magSf();
-    const scalarField hInf(film.htcs().h());
-    const scalarField hFilm(film.htcw().h());
     const vectorField dU(film.UPrimary() - film.Us());
     const scalarField limMass
     (
@@ -147,15 +143,10 @@ void standardPhaseChange::correctModel
             if (pSat >= 0.95*pc)
             {
                 // boiling
-                const scalar qDotInf = hInf[cellI]*(TInf[cellI] - T[cellI]);
-                const scalar qDotFilm = hFilm[cellI]*(T[cellI] - Tw[cellI]);
-
                 const scalar Cp = liq.Cp(pc, Tloc);
-                const scalar Tcorr = max(0.0, T[cellI] - Tb_);
+                const scalar Tcorr = max(0.0, T[cellI] - Tb);
                 const scalar qCorr = limMass[cellI]*Cp*(Tcorr);
-                dMass[cellI] =
-                    dt*magSf[cellI]/hVap*(qDotInf + qDotFilm)
-                  + qCorr/hVap;
+                dMass[cellI] = qCorr/hVap;
             }
             else
             {

From ba717a55103ae8e5d61c5651362f4f8bc8fea74b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 11:43:48 +0000
Subject: [PATCH 25/81] ENH: Calculate film boiling temperature instead of
 reading from user input

---
 .../standardPhaseChange/standardPhaseChange.C               | 6 ++++--
 .../standardPhaseChange/standardPhaseChange.H               | 5 +----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index e632712ff4..4a08755ee3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
@@ -77,7 +77,6 @@ standardPhaseChange::standardPhaseChange
 )
 :
     phaseChangeModel(typeName, owner, dict),
-    Tb_(readScalar(coeffs_.lookup("Tb"))),
     deltaMin_(readScalar(coeffs_.lookup("deltaMin"))),
     L_(readScalar(coeffs_.lookup("L"))),
     TbFactor_(coeffs_.lookupOrDefault<scalar>("TbFactor", 1.1))
@@ -130,8 +129,11 @@ void standardPhaseChange::correctModel
             // cell pressure [Pa]
             const scalar pc = pInf[cellI];
 
+            // calculate the boiling temperature
+            const scalar Tb = liq.pvInvert(pc);
+
             // local temperature - impose lower limit of 200 K for stability
-            const scalar Tloc = min(TbFactor_*Tb_, max(200.0, T[cellI]));
+            const scalar Tloc = min(TbFactor_*Tb, max(200.0, T[cellI]));
 
             // saturation pressure [Pa]
             const scalar pSat = liq.pv(pc, Tloc);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
index 1fff3384ff..ee1b21d6d0 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,9 +69,6 @@ protected:
 
     // Protected data
 
-        //- Boiling temperature / [K]
-        const scalar Tb_;
-
         //- Minimum film height for model to be active
         const scalar deltaMin_;
 

From abfcafc8470a1d9c5d5e06b72490b8f15a4b0736 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 12:03:03 +0000
Subject: [PATCH 26/81] ENH: Use alpha in film standard radiation model instead
 of re-calculating wet/dry

---
 .../standardRadiation/standardRadiation.C                  | 7 +++----
 .../standardRadiation/standardRadiation.H                  | 6 ------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index be5460757f..1ff3274716 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -85,8 +85,6 @@ standardRadiation::standardRadiation
         dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
         zeroGradientFvPatchScalarField::typeName
     ),
-    delta_(owner.delta()),
-    deltaMin_(readScalar(coeffs_.lookup("deltaMin"))),
     beta_(readScalar(coeffs_.lookup("beta"))),
     kappaBar_(readScalar(coeffs_.lookup("kappaBar")))
 {}
@@ -129,9 +127,10 @@ tmp<volScalarField> standardRadiation::Shs()
 
     scalarField& Shs = tShs();
     const scalarField& QinP = QinPrimary_.internalField();
-    const scalarField& delta = delta_.internalField();
+    const scalarField& delta = owner_.delta().internalField();
+    const scalarField& alpha = owner_.alpha().internalField();
 
-    Shs = beta_*(QinP*pos(delta - deltaMin_))*(1.0 - exp(-kappaBar_*delta));
+    Shs = beta_*QinP*alpha*(1.0 - exp(-kappaBar_*delta));
 
     // Update net Qr on local region
     QrNet_.internalField() = QinP - Shs;
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
index 9b96fb60fe..799bb6c649 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
@@ -65,15 +65,9 @@ private:
         //- Remaining radiative flux after removing local contribution
         volScalarField QrNet_;
 
-        //- Reference to the film thickness field / [m]
-        const volScalarField& delta_;
-
 
         // Model coefficients
 
-            //- Minimum thickness to apply radiation model
-            scalar deltaMin_;
-
             //- Beta coefficient
             scalar beta_;
 

From b7dc134a9dc3e20e2596a529b029abc1f166e8eb Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 12:06:20 +0000
Subject: [PATCH 27/81] ENH: Added new constant film radiation model

---
 src/regionModels/surfaceFilmModels/Make/files |   1 +
 .../constantRadiation/constantRadiation.C     | 146 ++++++++++++++++++
 .../constantRadiation/constantRadiation.H     | 130 ++++++++++++++++
 3 files changed, 277 insertions(+)
 create mode 100644 src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
 create mode 100644 src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H

diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/regionModels/surfaceFilmModels/Make/files
index 12f80a7ce7..8bda6f6aae 100644
--- a/src/regionModels/surfaceFilmModels/Make/files
+++ b/src/regionModels/surfaceFilmModels/Make/files
@@ -38,6 +38,7 @@ $(THERMOMODELS)/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveH
 $(THERMOMODELS)/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
 $(THERMOMODELS)/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
 $(THERMOMODELS)/filmRadiationModel/noRadiation/noRadiation.C
+$(THERMOMODELS)/filmRadiationModel/constantRadiation/constantRadiation.C
 $(THERMOMODELS)/filmRadiationModel/standardRadiation/standardRadiation.C
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
new file mode 100644
index 0000000000..ac0358f141
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "constantRadiation.H"
+#include "volFields.H"
+#include "zeroGradientFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace regionModels
+{
+namespace surfaceFilmModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(constantRadiation, 0);
+
+addToRunTimeSelectionTable
+(
+    filmRadiationModel,
+    constantRadiation,
+    dictionary
+);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+constantRadiation::constantRadiation
+(
+    const surfaceFilmModel& owner,
+    const dictionary& dict
+)
+:
+    filmRadiationModel(typeName, owner, dict),
+    QrConst_
+    (
+        IOobject
+        (
+            typeName + "::QrConst",
+            owner.time().timeName(),
+            owner.regionMesh(),
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        owner.regionMesh()
+    ),
+    mask_
+    (
+        IOobject
+        (
+            typeName + "::mask",
+            owner.time().timeName(),
+            owner.regionMesh(),
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        owner.regionMesh(),
+        dimensionedScalar("one", dimless, 1.0),
+        zeroGradientFvPatchScalarField::typeName
+    ),
+    timeStart_(readScalar(coeffs_.lookup("timeStart"))),
+    duration_(readScalar(coeffs_.lookup("duration")))
+{
+    mask_ = pos(mask_);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+constantRadiation::~constantRadiation()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void constantRadiation::correct()
+{}
+
+
+tmp<volScalarField> constantRadiation::Shs()
+{
+    tmp<volScalarField> tShs
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                typeName + "::Shs",
+                owner().time().timeName(),
+                owner().regionMesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            owner().regionMesh(),
+            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
+            zeroGradientFvPatchScalarField::typeName
+        )
+    );
+
+    const scalar time = owner().time().value();
+
+    if ((time >= timeStart_) && (time <= timeStart_ + duration_))
+    {
+        scalarField& Shs = tShs();
+        const scalarField& Qr = QrConst_.internalField();
+        const scalarField& alpha = owner_.alpha().internalField();
+
+        Shs = mask_*Qr*alpha;
+    }
+
+    return tShs;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
new file mode 100644
index 0000000000..06e6fe676b
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::constantRadiation
+
+Description
+    Film constant radiation model.  The constant radiative flux is specified
+    by the user, and operated over a time interval defined by a start time and
+    duration.  In addition, a mask can be applied to shield the film from the
+    radiation.
+
+SourceFiles
+    constantRadiation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef constantRadiation_H
+#define constantRadiation_H
+
+#include "filmRadiationModel.H"
+#include "volFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace regionModels
+{
+namespace surfaceFilmModels
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class constantRadiation Declaration
+\*---------------------------------------------------------------------------*/
+
+class constantRadiation
+:
+    public filmRadiationModel
+{
+private:
+
+    // Private data
+
+        //- Constant radiative flux [kg/s3]
+        volScalarField QrConst_;
+
+        //- Radiation mask
+        volScalarField mask_;
+
+        //- Time start [s]
+        const scalar timeStart_;
+
+        //- Duration [s]
+        const scalar duration_;
+
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        constantRadiation(const constantRadiation&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const constantRadiation&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("constantRadiation");
+
+
+    // Constructors
+
+        //- Construct from surface film model and dictionary
+        constantRadiation
+        (
+            const surfaceFilmModel& owner,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~constantRadiation();
+
+
+    // Member Functions
+
+        // Evolution
+
+            //- Correct
+            virtual void correct();
+
+            //- Return the radiation sensible enthalpy source
+            //  Also updates QrNet
+            virtual tmp<volScalarField> Shs();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 85cbb0e1b909c9b907ba8acca1127ebc153c9fe7 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 12:08:57 +0000
Subject: [PATCH 28/81] ENH: Added new primary film radiation model

---
 src/regionModels/surfaceFilmModels/Make/files |   1 +
 .../primaryRadiation/primaryRadiation.C       | 128 ++++++++++++++++++
 .../primaryRadiation/primaryRadiation.H       | 119 ++++++++++++++++
 3 files changed, 248 insertions(+)
 create mode 100644 src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
 create mode 100644 src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H

diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/regionModels/surfaceFilmModels/Make/files
index 8bda6f6aae..06b8f2d414 100644
--- a/src/regionModels/surfaceFilmModels/Make/files
+++ b/src/regionModels/surfaceFilmModels/Make/files
@@ -39,6 +39,7 @@ $(THERMOMODELS)/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
 $(THERMOMODELS)/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
 $(THERMOMODELS)/filmRadiationModel/noRadiation/noRadiation.C
 $(THERMOMODELS)/filmRadiationModel/constantRadiation/constantRadiation.C
+$(THERMOMODELS)/filmRadiationModel/primaryRadiation/primaryRadiation.C
 $(THERMOMODELS)/filmRadiationModel/standardRadiation/standardRadiation.C
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
new file mode 100644
index 0000000000..2fdccf63f7
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "primaryRadiation.H"
+#include "volFields.H"
+#include "zeroGradientFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace regionModels
+{
+namespace surfaceFilmModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(primaryRadiation, 0);
+
+addToRunTimeSelectionTable
+(
+    filmRadiationModel,
+    primaryRadiation,
+    dictionary
+);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+primaryRadiation::primaryRadiation
+(
+    const surfaceFilmModel& owner,
+    const dictionary& dict
+)
+:
+    filmRadiationModel(typeName, owner, dict),
+    QinPrimary_
+    (
+        IOobject
+        (
+            "Qin", // same name as Qin on primary region to enable mapping
+            owner.time().timeName(),
+            owner.regionMesh(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        owner.regionMesh(),
+        dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
+        owner.mappedPushedFieldPatchTypes<scalar>()
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+primaryRadiation::~primaryRadiation()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void primaryRadiation::correct()
+{
+    // Transfer Qin from primary region
+    QinPrimary_.correctBoundaryConditions();
+}
+
+
+tmp<volScalarField> primaryRadiation::Shs()
+{
+    tmp<volScalarField> tShs
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                typeName + "::Shs",
+                owner().time().timeName(),
+                owner().regionMesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            owner().regionMesh(),
+            dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
+            zeroGradientFvPatchScalarField::typeName
+        )
+    );
+
+    scalarField& Shs = tShs();
+    const scalarField& QinP = QinPrimary_.internalField();
+    const scalarField& alpha = owner_.alpha().internalField();
+
+    Shs = QinP*alpha;
+
+    return tShs;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
new file mode 100644
index 0000000000..a8904cb1e2
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::primaryRadiation
+
+Description
+    Radiation model whereby the radiative heat flux is mapped from the primary
+    region
+
+SourceFiles
+    primaryRadiation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef primaryRadiation_H
+#define primaryRadiation_H
+
+#include "filmRadiationModel.H"
+#include "volFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace regionModels
+{
+namespace surfaceFilmModels
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class primaryRadiation Declaration
+\*---------------------------------------------------------------------------*/
+
+class primaryRadiation
+:
+    public filmRadiationModel
+{
+private:
+
+    // Private data
+
+        //- Incident radiative flux mapped from  the primary region / [kg/s3]
+        volScalarField QinPrimary_;
+
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        primaryRadiation(const primaryRadiation&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const primaryRadiation&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("primaryRadiation");
+
+
+    // Constructors
+
+        //- Construct from surface film model and dictionary
+        primaryRadiation
+        (
+            const surfaceFilmModel& owner,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~primaryRadiation();
+
+
+    // Member Functions
+
+        // Evolution
+
+            //- Correct
+            virtual void correct();
+
+            //- Return the radiation sensible enthalpy source
+            //  Also updates QrNet
+            virtual tmp<volScalarField> Shs();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace surfaceFilmModels
+} // End namespace regionModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 7e28c1a784a1c303fe73fa3dfd4534a6204bfe9b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 12:18:04 +0000
Subject: [PATCH 29/81] BUG: Corrected ESigmaSec in thermo cloud film model

---
 .../ThermoSurfaceFilm/ThermoSurfaceFilm.C                 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 4eee7d990c..3e1a29e988 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -398,13 +398,15 @@ void Foam::ThermoSurfaceFilm<CloudType>::splashInteraction
     // surface energy of secondary parcels [J]
     scalar ESigmaSec = 0;
 
-    // sample splash distribution to detrmine secondary parcel diameters
+    // sample splash distribution to determine secondary parcel diameters
     scalarList dNew(parcelsPerSplash_);
+    scalarList npNew(parcelsPerSplash_);
     forAll(dNew, i)
     {
         const scalar y = rndGen_.sample01<scalar>();
         dNew[i] = -dBarSplash*log(exp(-dMin/dBarSplash) - y*K);
-        ESigmaSec += sigma*p.areaS(dNew[i]);
+        npNew[i] = mRatio*np*pow3(d)/pow3(dNew[i])/parcelsPerSplash_;
+        ESigmaSec += npNew[i]*sigma*p.areaS(dNew[i]);
     }
 
     // incident kinetic energy [J]
@@ -459,7 +461,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::splashInteraction
         // perturb new parcels towards the owner cell centre
         pPtr->position() += 0.5*rndGen_.sample01<scalar>()*(posC - posCf);
 
-        pPtr->nParticle() = mRatio*np*pow3(d)/pow3(dNew[i])/parcelsPerSplash_;
+        pPtr->nParticle() = npNew[i];
 
         pPtr->d() = dNew[i];
 

From 9961dcbf85e30a1435f88058204e4fd9b1edc647 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 12:40:55 +0000
Subject: [PATCH 30/81] BUG: offset should have dimensions of length

---
 .../kinematicSingleLayer/kinematicSingleLayer.C                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 28a6acdbaa..48277b261d 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -199,7 +199,7 @@ tmp<volScalarField> kinematicSingleLayer::pp()
 
 void kinematicSingleLayer::correctAlpha()
 {
-    alpha_ == pos(delta_ - dimensionedScalar("SMALL", dimless, SMALL));
+    alpha_ == pos(delta_ - dimensionedScalar("SMALL", dimLength, SMALL));
 }
 
 

From 9f128ec497bdd17a5576ef02b2f3505cd1aa0ce4 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 12:52:03 +0000
Subject: [PATCH 31/81] ENH: Default film outer correctors to 1

---
 .../kinematicSingleLayer/kinematicSingleLayer.C                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 48277b261d..b52b25b5a9 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -445,7 +445,7 @@ kinematicSingleLayer::kinematicSingleLayer
     surfaceFilmModel(modelType, mesh, g),
 
     momentumPredictor_(solution().subDict("PISO").lookup("momentumPredictor")),
-    nOuterCorr_(readLabel(solution().subDict("PISO").lookup("nOuterCorr"))),
+    nOuterCorr_(solution().subDict("PISO").lookupOrDefault("nOuterCorr", 1)),
     nCorr_(readLabel(solution().subDict("PISO").lookup("nCorr"))),
     nNonOrthCorr_
     (

From 3657f608a902294f4105928eec8a4bbe10fef703 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 12:53:01 +0000
Subject: [PATCH 32/81] ENH: Film tutorial updates

---
 .../cylinder/constant/surfaceFilmProperties                   | 3 +++
 .../cylinder/system/wallFilmRegion/fvSolution                 | 3 +--
 .../hotBoxes/constant/surfaceFilmProperties                   | 4 +++-
 .../hotBoxes/system/wallFilmRegion.org/fvSolution             | 3 +--
 .../rivuletPanel/constant/surfaceFilmProperties               | 1 -
 .../rivuletPanel/system/wallFilmRegion/fvSolution             | 3 +--
 .../splashPanel/constant/surfaceFilmProperties                | 3 +++
 .../splashPanel/system/wallFilmRegion/fvSolution              | 3 +--
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
index 98c728fdec..e327a82959 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
@@ -26,6 +26,9 @@ thermoSingleLayerCoeffs
     thermoModel singleComponent;
     liquid      H2O;
 
+    deltaWet    1e-4;
+    hydrophilic no;
+
     forces
     (
         surfaceShear
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
index 381a5c4f27..eedbd097d3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
@@ -37,8 +37,7 @@ solvers
 PISO
 {
     momentumPredictor true;
-    nOuterCorr      1;
-    nCorr           2;
+    nCorr           1;
     nNonOrthCorr    0;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
index 6984dcbb1e..96e33c1d68 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
@@ -28,6 +28,9 @@ thermoSingleLayerCoeffs
 
     liquid      H2O;
 
+    deltaWet    1e-4;
+    hydrophilic no;
+
     radiationModel  none;
 
     upperSurfaceModels
@@ -65,7 +68,6 @@ thermoSingleLayerCoeffs
 
     contactAngleCoeffs
     {
-        deltaWet        1e-4;
         Ccf             0.085;
         contactAngleDistribution
         {
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
index cfae8b06ce..9385e6ec40 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/fvSolution
@@ -39,8 +39,7 @@ solvers
 PISO
 {
     momentumPredictor true;
-    nOuterCorr      1;
-    nCorr           2;
+    nCorr           1;
     nNonOrthCorr    0;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
index d9a68e059d..8440f3f479 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -43,7 +43,6 @@ kinematicSingleLayerCoeffs
 
     contactAngleCoeffs
     {
-        deltaWet        1e-4;
         Ccf             1;
         contactAngleDistribution
         {
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
index 645d42a456..86cdc388bf 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
@@ -37,8 +37,7 @@ solvers
 PISO
 {
     momentumPredictor  true;
-    nOuterCorr      1;
-    nCorr           2;
+    nCorr           1;
     nNonOrthCorr    0;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
index 30a2dd79f3..8335fadfc2 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
@@ -27,6 +27,9 @@ thermoSingleLayerCoeffs
 
     liquid      H2O;
 
+    deltaWet    1e-4;
+    hydrophilic no;
+
     forces
     (
         surfaceShear
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
index 381a5c4f27..eedbd097d3 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
@@ -37,8 +37,7 @@ solvers
 PISO
 {
     momentumPredictor true;
-    nOuterCorr      1;
-    nCorr           2;
+    nCorr           1;
     nNonOrthCorr    0;
 }
 

From 270cd8268239250abc3ca1971d988faaf21dbb16 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 13:00:19 +0000
Subject: [PATCH 33/81] ENH: Added change missed during commit 9f128ec

---
 .../kinematicSingleLayer/kinematicSingleLayer.C                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index b52b25b5a9..87d56add7f 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -61,7 +61,7 @@ bool kinematicSingleLayer::read()
     {
         const dictionary& solution = this->solution().subDict("PISO");
         solution.lookup("momentumPredictor") >> momentumPredictor_;
-        solution.lookup("nOuterCorr") >> nOuterCorr_;
+        solution.readIfPresent("nOuterCorr", nOuterCorr_);
         solution.lookup("nCorr") >> nCorr_;
         solution.lookup("nNonOrthCorr") >> nNonOrthCorr_;
 

From 8be4e49c308bb10a424b32c95217fc62bd94a87d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 14:05:03 +0000
Subject: [PATCH 34/81] ENH: Updated film corrector loops

---
 .../kinematicSingleLayer/kinematicSingleLayer.C                 | 2 +-
 .../surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 87d56add7f..941da7e848 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -869,7 +869,7 @@ void kinematicSingleLayer::evolveRegion()
     // Implicit pressure source coefficient - constant
     tmp<volScalarField> tpp(this->pp());
 
-    for (int oCorr=0; oCorr<nOuterCorr_; oCorr++)
+    for (int oCorr=1; oCorr<=nOuterCorr_; oCorr++)
     {
         // Explicit pressure source contribution - varies with delta_
         tmp<volScalarField> tpu(this->pu());
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 417274da8e..21953ae94c 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -642,7 +642,7 @@ void thermoSingleLayer::evolveRegion()
     // Solve continuity for deltaRho_
     solveContinuity();
 
-    for (int oCorr=0; oCorr<nOuterCorr_; oCorr++)
+    for (int oCorr=1; oCorr<=nOuterCorr_; oCorr++)
     {
         // Explicit pressure source contribution
         tmp<volScalarField> tpu(this->pu());

From e8073d864ee02e51ba6618ff3666de83d6df0407 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 14:08:12 +0000
Subject: [PATCH 35/81] ENH: Updated base film sub-model

---
 src/regionModels/surfaceFilmModels/submodels/subModelBase.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/subModelBase.C b/src/regionModels/surfaceFilmModels/submodels/subModelBase.C
index 469b62e855..b2283172b3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/subModelBase.C
+++ b/src/regionModels/surfaceFilmModels/submodels/subModelBase.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ subModelBase::subModelBase
 )
 :
     owner_(owner),
-    coeffs_(dict.subDict(type + "Coeffs"))
+    coeffs_(dict.subOrEmptyDict(type + "Coeffs"))
 {}
 
 

From e0f75db2340f3f1a6c99d8adf8548ac0c9df6632 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 14:16:59 +0000
Subject: [PATCH 36/81] ENH: Added new film BCs based on Nusselt theory

---
 src/regionModels/surfaceFilmModels/Make/files |   2 +
 ...linedFilmNusseltHeightFvPatchScalarField.C | 213 ++++++++++++++++++
 ...linedFilmNusseltHeightFvPatchScalarField.H | 155 +++++++++++++
 ...lmNusseltInletVelocityFvPatchVectorField.C | 210 +++++++++++++++++
 ...lmNusseltInletVelocityFvPatchVectorField.H | 158 +++++++++++++
 5 files changed, 738 insertions(+)
 create mode 100644 src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
 create mode 100644 src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
 create mode 100644 src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
 create mode 100644 src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H

diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/regionModels/surfaceFilmModels/Make/files
index 06b8f2d414..1151e2f7fd 100644
--- a/src/regionModels/surfaceFilmModels/Make/files
+++ b/src/regionModels/surfaceFilmModels/Make/files
@@ -46,6 +46,8 @@ $(THERMOMODELS)/filmRadiationModel/standardRadiation/standardRadiation.C
 /* Boundary conditions */
 PATCHFIELDS=derivedFvPatchFields
 $(PATCHFIELDS)/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
+$(PATCHFIELDS)/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+$(PATCHFIELDS)/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
 
 /* Wall functions for primary region */
 WALLFUNCS=$(PATCHFIELDS)/wallFunctions
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
new file mode 100644
index 0000000000..b36832a1d3
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "inclinedFilmNusseltHeightFvPatchScalarField.H"
+#include "volFields.H"
+#include "kinematicSingleLayer.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::inclinedFilmNusseltHeightFvPatchScalarField::
+inclinedFilmNusseltHeightFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    GammaMean_(),
+    a_(),
+    omega_()
+{}
+
+
+Foam::inclinedFilmNusseltHeightFvPatchScalarField::
+inclinedFilmNusseltHeightFvPatchScalarField
+(
+    const inclinedFilmNusseltHeightFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    GammaMean_(ptf.GammaMean_().clone().ptr()),
+    a_(ptf.a_().clone().ptr()),
+    omega_(ptf.omega_().clone().ptr())
+{}
+
+
+Foam::inclinedFilmNusseltHeightFvPatchScalarField::
+inclinedFilmNusseltHeightFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    GammaMean_(DataEntry<scalar>::New("GammaMean", dict)),
+    a_(DataEntry<scalar>::New("a", dict)),
+    omega_(DataEntry<scalar>::New("omega", dict))
+{
+    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+}
+
+
+Foam::inclinedFilmNusseltHeightFvPatchScalarField::
+inclinedFilmNusseltHeightFvPatchScalarField
+(
+    const inclinedFilmNusseltHeightFvPatchScalarField& wmfrhpsf
+)
+:
+    fixedValueFvPatchScalarField(wmfrhpsf),
+    GammaMean_(wmfrhpsf.GammaMean_().clone().ptr()),
+    a_(wmfrhpsf.a_().clone().ptr()),
+    omega_(wmfrhpsf.omega_().clone().ptr())
+{}
+
+
+Foam::inclinedFilmNusseltHeightFvPatchScalarField::
+inclinedFilmNusseltHeightFvPatchScalarField
+(
+    const inclinedFilmNusseltHeightFvPatchScalarField& wmfrhpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(wmfrhpsf, iF),
+    GammaMean_(wmfrhpsf.GammaMean_().clone().ptr()),
+    a_(wmfrhpsf.a_().clone().ptr()),
+    omega_(wmfrhpsf.omega_().clone().ptr())
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const label patchI = patch().index();
+
+    const scalar t = db().time().timeOutputValue();
+
+    // retrieve the film region from the database
+
+    const regionModels::regionModel& region =
+        db().lookupObject<regionModels::regionModel>("surfaceFilmProperties");
+
+    const regionModels::surfaceFilmModels::kinematicSingleLayer& film =
+        dynamic_cast
+        <
+            const regionModels::surfaceFilmModels::kinematicSingleLayer&
+        >(region);
+
+    // calculate the vector tangential to the patch
+
+    const vectorField n(patch().nf());
+
+    const volVectorField& nHat = film.nHat();
+
+    const vectorField nHatp(nHat.boundaryField()[patchI].patchInternalField());
+
+    vectorField nTan(nHatp ^ n);
+    nTan /= mag(nTan) + ROOTVSMALL;
+
+    // calculate distance in patch tangential direction
+
+    const vectorField& Cf = patch().Cf();
+    scalarField d(nTan & Cf);
+
+    // calculate the wavy film height
+
+    const scalar GMean = GammaMean_->value(t);
+    const scalar a = a_->value(t);
+    const scalar omega = omega_->value(t);
+
+    const scalarField G(GMean + a*sin(omega*constant::mathematical::twoPi*d));
+
+    const volScalarField& mu = film.mu();
+    const scalarField mup(mu.boundaryField()[patchI].patchInternalField());
+
+    const volScalarField& rho = film.rho();
+    const scalarField rhop(rho.boundaryField()[patchI].patchInternalField());
+
+    const scalarField Re(max(G, 0.0)/mup);
+
+    // TODO: currently re-evaluating the entire gTan field to return this patch
+    const scalarField gTan(film.gTan()().boundaryField()[patchI] & n);
+
+    if (max(mag(gTan)) < SMALL)
+    {
+        WarningIn
+        (
+            "void Foam::inclinedFilmNusseltHeightFvPatchScalarField::"
+            "updateCoeffs()"
+        )
+            << "Tangential gravity component is zero.  This boundary condition "
+            << "is designed to operate on patches inclined with respect to "
+            << "gravity"
+            << endl;
+    }
+
+    operator==
+    (
+        pow(3.0*sqr(mup/rhop)/(gTan + ROOTVSMALL), 0.333)*pow(Re, 0.333)
+    );
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void Foam::inclinedFilmNusseltHeightFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fixedValueFvPatchScalarField::write(os);
+    GammaMean_->writeData(os);
+    a_->writeData(os);
+    omega_->writeData(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        inclinedFilmNusseltHeightFvPatchScalarField
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
new file mode 100644
index 0000000000..cb9f999237
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::inclinedFilmNusseltHeightFvPatchScalarField
+
+Description
+    Film height boundary condition for inclined films that imposes a
+    sinusoidal perturbation on top of a mean flow rate, where the height is
+    calculated using the Nusselt solution.
+
+SourceFiles
+    inclinedFilmNusseltHeightFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef inclinedFilmNusseltHeightFvPatchScalarField_H
+#define inclinedFilmNusseltHeightFvPatchScalarField_H
+
+#include "fvPatchFields.H"
+#include "fixedValueFvPatchFields.H"
+#include "DataEntry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+         Class inclinedFilmNusseltHeightFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class inclinedFilmNusseltHeightFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Mean mass flow rate per unit length [kg/s/m]
+        autoPtr<DataEntry<scalar> > GammaMean_;
+
+        //- Perturbation amplitude [m]
+        autoPtr<DataEntry<scalar> > a_;
+
+        //- Perturbation frequency [rad/s/m]
+        autoPtr<DataEntry<scalar> > omega_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("inclinedFilmNusseltHeight");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        inclinedFilmNusseltHeightFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        inclinedFilmNusseltHeightFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given 
+        // inclinedFilmNusseltHeightFvPatchScalarField onto a new patch
+        inclinedFilmNusseltHeightFvPatchScalarField
+        (
+            const inclinedFilmNusseltHeightFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        inclinedFilmNusseltHeightFvPatchScalarField
+        (
+            const inclinedFilmNusseltHeightFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new inclinedFilmNusseltHeightFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        inclinedFilmNusseltHeightFvPatchScalarField
+        (
+            const inclinedFilmNusseltHeightFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new inclinedFilmNusseltHeightFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..7f21d9a2e4
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "inclinedFilmNusseltInletVelocityFvPatchVectorField.H"
+#include "volFields.H"
+#include "kinematicSingleLayer.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::
+inclinedFilmNusseltInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchVectorField(p, iF),
+    GammaMean_(),
+    a_(),
+    omega_()
+{}
+
+
+Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::
+inclinedFilmNusseltInletVelocityFvPatchVectorField
+(
+    const inclinedFilmNusseltInletVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchVectorField(ptf, p, iF, mapper),
+    GammaMean_(ptf.GammaMean_().clone().ptr()),
+    a_(ptf.a_().clone().ptr()),
+    omega_(ptf.omega_().clone().ptr())
+{}
+
+
+Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::
+inclinedFilmNusseltInletVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchVectorField(p, iF),
+    GammaMean_(DataEntry<scalar>::New("GammaMean", dict)),
+    a_(DataEntry<scalar>::New("a", dict)),
+    omega_(DataEntry<scalar>::New("omega", dict))
+{
+    fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
+}
+
+
+Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::
+inclinedFilmNusseltInletVelocityFvPatchVectorField
+(
+    const inclinedFilmNusseltInletVelocityFvPatchVectorField& fmfrpvf
+)
+:
+    fixedValueFvPatchVectorField(fmfrpvf),
+    GammaMean_(fmfrpvf.GammaMean_().clone().ptr()),
+    a_(fmfrpvf.a_().clone().ptr()),
+    omega_(fmfrpvf.omega_().clone().ptr())
+{}
+
+
+Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::
+inclinedFilmNusseltInletVelocityFvPatchVectorField
+(
+    const inclinedFilmNusseltInletVelocityFvPatchVectorField& fmfrpvf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchVectorField(fmfrpvf, iF),
+    GammaMean_(fmfrpvf.GammaMean_().clone().ptr()),
+    a_(fmfrpvf.a_().clone().ptr()),
+    omega_(fmfrpvf.omega_().clone().ptr())
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const label patchI = patch().index();
+
+    const scalar t = db().time().timeOutputValue();
+
+    // retrieve the film region from the database
+
+    const regionModels::regionModel& region =
+        db().lookupObject<regionModels::regionModel>("surfaceFilmProperties");
+
+    const regionModels::surfaceFilmModels::kinematicSingleLayer& film =
+        dynamic_cast
+        <
+            const regionModels::surfaceFilmModels::kinematicSingleLayer&
+        >(region);
+
+    // calculate the vector tangential to the patch
+
+    const vectorField n(patch().nf());
+
+    const volVectorField& nHat = film.nHat();
+
+    const vectorField nHatp(nHat.boundaryField()[patchI].patchInternalField());
+
+    vectorField nTan(nHatp ^ n);
+    nTan /= mag(nTan) + ROOTVSMALL;
+
+    // calculate distance in patch tangential direction
+
+    const vectorField& Cf = patch().Cf();
+    scalarField d(nTan & Cf);
+
+    // calculate the wavy film height
+
+    const scalar GMean = GammaMean_->value(t);
+    const scalar a = a_->value(t);
+    const scalar omega = omega_->value(t);
+
+    const scalarField G(GMean + a*sin(omega*constant::mathematical::twoPi*d));
+
+    const volScalarField& mu = film.mu();
+    const scalarField mup(mu.boundaryField()[patchI].patchInternalField());
+
+    const volScalarField& rho = film.rho();
+    const scalarField rhop(rho.boundaryField()[patchI].patchInternalField());
+
+    const scalarField Re(max(G, 0.0)/mup);
+
+    // TODO: currently re-evaluating the entire gTan field to return this patch
+    const scalarField gTan(film.gTan()().boundaryField()[patchI] & n);
+
+    if (max(mag(gTan)) < SMALL)
+    {
+        WarningIn
+        (
+            "void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::"
+            "updateCoeffs()"
+        )
+            << "Tangential gravity component is zero.  This boundary condition "
+            << "is designed to operate on patches inclined with respect to "
+            << "gravity"
+            << endl;
+    }
+
+    operator==(n*pow(gTan*mup/(3.0*rhop), 0.333)*pow(Re, 0.666));
+
+    fixedValueFvPatchVectorField::updateCoeffs();
+}
+
+
+void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchVectorField::write(os);
+    GammaMean_->writeData(os);
+    a_->writeData(os);
+    omega_->writeData(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchVectorField,
+        inclinedFilmNusseltInletVelocityFvPatchVectorField
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..211ea77561
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField
+
+Description
+    Film velocity boundary condition for inclined films that imposes a
+    sinusoidal perturbation on top of a mean flow rate, where the velocity is
+    calculated using the Nusselt solution.
+
+SourceFiles
+    inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef inclinedFilmNusseltInletVelocityFvPatchVectorField_H
+#define inclinedFilmNusseltInletVelocityFvPatchVectorField_H
+
+#include "fvPatchFields.H"
+#include "fixedValueFvPatchFields.H"
+#include "DataEntry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+     Class inclinedFilmNusseltInletVelocityFvPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class inclinedFilmNusseltInletVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Mean mass flow rate per unit length [kg/s/m]
+        autoPtr<DataEntry<scalar> > GammaMean_;
+
+        //- Perturbation amplitude [m]
+        autoPtr<DataEntry<scalar> > a_;
+
+        //- Perturbation frequency [rad/s/m]
+        autoPtr<DataEntry<scalar> > omega_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("inclinedFilmNusseltInletVelocity");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        inclinedFilmNusseltInletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        inclinedFilmNusseltInletVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        // inclinedFilmNusseltInletVelocityFvPatchVectorField onto a new patch
+        inclinedFilmNusseltInletVelocityFvPatchVectorField
+        (
+            const inclinedFilmNusseltInletVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        inclinedFilmNusseltInletVelocityFvPatchVectorField
+        (
+            const inclinedFilmNusseltInletVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new inclinedFilmNusseltInletVelocityFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        inclinedFilmNusseltInletVelocityFvPatchVectorField
+        (
+            const inclinedFilmNusseltInletVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new inclinedFilmNusseltInletVelocityFvPatchVectorField
+                (
+                    *this, iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 1ea0c7b08708f13186f2d93fe0a9de840f4da0bb Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 14:24:26 +0000
Subject: [PATCH 37/81] ENH: Added post-evolve hook to film models

---
 .../regionModel/regionModel/regionModel.C     | 37 +++++++++++--------
 .../regionModel/regionModel/regionModel.H     |  7 +++-
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 98e152c3f1..3ab10f4e86 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -315,18 +315,6 @@ Foam::regionModels::regionModel::~regionModel()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::regionModels::regionModel::preEvolveRegion()
-{
-    // do nothing
-}
-
-
-void Foam::regionModels::regionModel::evolveRegion()
-{
-    // do nothing
-}
-
-
 void Foam::regionModels::regionModel::evolve()
 {
     if (active_)
@@ -334,15 +322,14 @@ void Foam::regionModels::regionModel::evolve()
         Info<< "\nEvolving " << modelName_ << " for region "
             << regionMesh().name() << endl;
 
-        // Update any input information
         //read();
 
-        // Pre-evolve
         preEvolveRegion();
 
-        // Increment the region equations up to the new time level
         evolveRegion();
 
+        postEvolveRegion();
+
         // Provide some feedback
         if (infoOutput_)
         {
@@ -354,6 +341,24 @@ void Foam::regionModels::regionModel::evolve()
 }
 
 
+void Foam::regionModels::regionModel::preEvolveRegion()
+{
+    // do nothing
+}
+
+
+void Foam::regionModels::regionModel::evolveRegion()
+{
+    // do nothing
+}
+
+
+void Foam::regionModels::regionModel::postEvolveRegion()
+{
+    // do nothing
+}
+
+
 void Foam::regionModels::regionModel::info() const
 {
     // do nothing
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H
index 6fbad3d372..7b2b2bef28 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/regionModels/regionModel/regionModel/regionModel.H
@@ -256,14 +256,17 @@ public:
 
         // Evolution
 
+            //- Main driver routing to evolve the region - calls other evolves
+            virtual void evolve();
+
             //- Pre-evolve region
             virtual void preEvolveRegion();
 
             //- Evolve the region
             virtual void evolveRegion();
 
-            //- Evolve the region
-            virtual void evolve();
+            //- Post-evolve region
+            virtual void postEvolveRegion();
 
 
         // I-O

From 0aa2c600bb99a3ebe29887e913ef9475e8bac36e Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 14:32:01 +0000
Subject: [PATCH 38/81] ENH: Created new film function objects

---
 src/regionModels/regionModel/Make/files       |   4 +
 .../regionModel/regionModel/regionModel.C     |  15 +-
 .../regionModel/regionModel/regionModel.H     |   8 +-
 .../regionModelFunctionObject.C               | 106 ++++++++++++
 .../regionModelFunctionObject.H               | 157 ++++++++++++++++++
 .../regionModelFunctionObjectList.C           | 124 ++++++++++++++
 .../regionModelFunctionObjectList.H           | 133 +++++++++++++++
 .../regionModelFunctionObjectListI.H          |  47 ++++++
 .../regionModelFunctionObjectNew.C            |  66 ++++++++
 9 files changed, 650 insertions(+), 10 deletions(-)
 create mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C
 create mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H
 create mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C
 create mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H
 create mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H
 create mode 100644 src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C

diff --git a/src/regionModels/regionModel/Make/files b/src/regionModels/regionModel/Make/files
index ab18530890..11002e0a29 100644
--- a/src/regionModels/regionModel/Make/files
+++ b/src/regionModels/regionModel/Make/files
@@ -8,4 +8,8 @@ derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.
 
 regionProperties/regionProperties.C
 
+regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C
+regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
+regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C
+
 LIB = $(FOAM_LIBBIN)/libregionModels
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 3ab10f4e86..da1ab6e953 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -214,7 +214,8 @@ Foam::regionModels::regionModel::regionModel(const fvMesh& mesh)
     coeffs_(dictionary::null),
     primaryPatchIDs_(),
     intCoupledPatchIDs_(),
-    regionName_("none")
+    regionName_("none"),
+    functions_(*this)
 {}
 
 
@@ -246,7 +247,8 @@ Foam::regionModels::regionModel::regionModel
     coeffs_(subOrEmptyDict(modelName + "Coeffs")),
     primaryPatchIDs_(),
     intCoupledPatchIDs_(),
-    regionName_(lookup("regionName"))
+    regionName_(lookup("regionName")),
+    functions_(*this, subOrEmptyDict("functions"))
 {
     if (active_)
     {
@@ -274,7 +276,7 @@ Foam::regionModels::regionModel::regionModel
     (
         IOobject
         (
-            regionType,
+            regionType + "Properties",
             mesh.time().constant(),
             mesh,
             IOobject::NO_READ,
@@ -292,7 +294,8 @@ Foam::regionModels::regionModel::regionModel
     coeffs_(dict.subOrEmptyDict(modelName + "Coeffs")),
     primaryPatchIDs_(),
     intCoupledPatchIDs_(),
-    regionName_(dict.lookup("regionName"))
+    regionName_(dict.lookup("regionName")),
+    functions_(*this, subOrEmptyDict("functions"))
 {
     if (active_)
     {
@@ -343,7 +346,7 @@ void Foam::regionModels::regionModel::evolve()
 
 void Foam::regionModels::regionModel::preEvolveRegion()
 {
-    // do nothing
+    functions_.preEvolveRegion();
 }
 
 
@@ -355,7 +358,7 @@ void Foam::regionModels::regionModel::evolveRegion()
 
 void Foam::regionModels::regionModel::postEvolveRegion()
 {
-    // do nothing
+    functions_.postEvolveRegion();
 }
 
 
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H
index 7b2b2bef28..0b02fd1a58 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/regionModels/regionModel/regionModel/regionModel.H
@@ -41,16 +41,13 @@ SourceFiles
 #include "labelList.H"
 #include "volFields.H"
 #include "mappedPatchBase.H"
+#include "regionModelFunctionObjectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of classes
-//class fvMesh;
-//class Time;
-
 namespace regionModels
 {
 
@@ -121,6 +118,9 @@ protected:
         //- Region name
         word regionName_;
 
+        //- Region model function objects
+        regionModelFunctionObjectList functions_;
+
 
     // Protected member functions
 
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C
new file mode 100644
index 0000000000..182258b637
--- /dev/null
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionModelFunctionObject.H"
+#include "regionModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace regionModels
+{
+    defineTypeNameAndDebug(regionModelFunctionObject, 0);
+    defineRunTimeSelectionTable(regionModelFunctionObject, dictionary);
+}
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject
+(
+    regionModel& owner
+)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    modelType_("modelType")
+{}
+
+
+Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject
+(
+    const dictionary& dict,
+    regionModel& owner,
+    const word& type
+)
+:
+    dict_(dict),
+    owner_(owner),
+    modelType_(type)
+{}
+
+
+Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject
+(
+    const regionModelFunctionObject& rmfo
+)
+:
+    dict_(rmfo.dict_),
+    owner_(rmfo.owner_),
+    modelType_(rmfo.modelType_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::regionModels::regionModelFunctionObject::~regionModelFunctionObject()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::regionModels::regionModelFunctionObject::preEvolveRegion()
+{
+    // do nothing
+}
+
+
+void Foam::regionModels::regionModelFunctionObject::postEvolveRegion()
+{
+    if (owner_.regionMesh().time().outputTime())
+    {
+        write();
+    }
+}
+
+
+void Foam::regionModels::regionModelFunctionObject::write() const
+{
+    // do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H
new file mode 100644
index 0000000000..77e56b14d1
--- /dev/null
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionModelFunctionObject
+
+Description
+    Region model function object base class
+
+SourceFiles
+    regionModelFunctionObject.C
+    regionModelFunctionObjectNew.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionModelFunctionObject_H
+#define regionModelFunctionObject_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+namespace regionModels
+{
+
+class regionModel;
+
+/*---------------------------------------------------------------------------*\
+                  Class regionModelFunctionObject Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionModelFunctionObject
+{
+protected:
+
+    // Protected data
+
+        //- Dictionary
+        dictionary dict_;
+
+        //- Reference to the region model
+        regionModel& owner_;
+
+        //- Model type name
+        word modelType_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("regionModelFunctionObject");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        regionModelFunctionObject,
+        dictionary,
+        (
+            const dictionary& dict,
+            regionModel& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct null from owner
+        regionModelFunctionObject(regionModel& owner);
+
+        //- Construct from dictionary
+        regionModelFunctionObject
+        (
+            const dictionary& dict,
+            regionModel& owner,
+            const word& modelType
+        );
+
+        //- Construct copy
+        regionModelFunctionObject(const regionModelFunctionObject& ppm);
+
+        //- Construct and return a clone
+        virtual autoPtr<regionModelFunctionObject> clone() const
+        {
+            return autoPtr<regionModelFunctionObject>
+            (
+                new regionModelFunctionObject(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~regionModelFunctionObject();
+
+
+    //- Selector
+    static autoPtr<regionModelFunctionObject> New
+    (
+        const dictionary& dict,
+        regionModel& owner,
+        const word& modelType
+    );
+
+
+    // Member Functions
+
+        // Evaluation
+
+            //- Pre-evolve region hook
+            virtual void preEvolveRegion();
+
+            //- Post-evolve region hook
+            virtual void postEvolveRegion();
+
+    // I-O
+
+        //- write
+        virtual void write() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace regionModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C
new file mode 100644
index 0000000000..366ec496ba
--- /dev/null
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionModelFunctionObjectList.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList
+(
+    regionModel& owner
+)
+:
+    PtrList<regionModelFunctionObject>(),
+    owner_(owner),
+    dict_(dictionary::null)
+{}
+
+
+Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList
+(
+    regionModel& owner,
+    const dictionary& dict,
+    const bool readFields
+)
+:
+    PtrList<regionModelFunctionObject>(),
+    owner_(owner),
+    dict_(dict)
+{
+    if (readFields)
+    {
+        wordList modelNames(dict.toc());
+
+        Info<< "    Selecting region model functions" << endl;
+
+        if (modelNames.size() > 0)
+        {
+            this->setSize(modelNames.size());
+
+            forAll(modelNames, i)
+            {
+                const word& modelName = modelNames[i];
+
+                this->set
+                (
+                    i,
+                    regionModelFunctionObject::New
+                    (
+                        dict,
+                        owner,
+                        modelName
+                    )
+                );
+            }
+        }
+        else
+        {
+            Info<< "    none" << endl;
+        }
+    }
+}
+
+
+Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList
+(
+    const regionModelFunctionObjectList& cfol
+)
+:
+    PtrList<regionModelFunctionObject>(cfol),
+    owner_(cfol.owner_),
+    dict_(cfol.dict_)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+Foam::regionModels::regionModelFunctionObjectList::
+~regionModelFunctionObjectList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::regionModels::regionModelFunctionObjectList::preEvolveRegion()
+{
+    forAll(*this, i)
+    {
+        this->operator[](i).preEvolveRegion();
+    }
+}
+
+
+void Foam::regionModels::regionModelFunctionObjectList::postEvolveRegion()
+{
+    forAll(*this, i)
+    {
+        this->operator[](i).postEvolveRegion();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H
new file mode 100644
index 0000000000..22488f18c8
--- /dev/null
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::regionModelFunctionObjectList
+
+Description
+    List of cloud function objects
+
+SourceFiles
+    regionModelFunctionObjectListI.H
+    regionModelFunctionObjectList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionModelFunctionObjectList_H
+#define regionModelFunctionObjectList_H
+
+#include "PtrList.H"
+#include "regionModelFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace regionModels
+{
+
+class regionModel;
+
+/*---------------------------------------------------------------------------*\
+                Class regionModelFunctionObjectList Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionModelFunctionObjectList
+:
+    public PtrList<regionModelFunctionObject>
+{
+protected:
+
+    // Protected Data
+
+        //- Reference to the owner region model
+        regionModel& owner_;
+
+        //- Dictionary
+        const dictionary dict_;
+
+
+public:
+
+    // Constructors
+
+        //- Null constructor
+        regionModelFunctionObjectList(regionModel& owner);
+
+        //- Construct from mesh
+        regionModelFunctionObjectList
+        (
+            regionModel& owner,
+            const dictionary& dict,
+            const bool readFields = true
+        );
+
+        //- Construct copy
+        regionModelFunctionObjectList
+        (
+            const regionModelFunctionObjectList& rmfol
+        );
+
+
+    //- Destructor
+    virtual ~regionModelFunctionObjectList();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to the cloud owner
+            inline const regionModel& owner() const;
+
+            //- Return refernce to the cloud owner
+            inline regionModel& owner();
+
+            //- Return the forces dictionary
+            inline const dictionary& dict() const;
+
+
+        // Evaluation
+
+            //- Pre-evolve hook
+            virtual void preEvolveRegion();
+
+            //- Post-evolve hook
+            virtual void postEvolveRegion();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace regionModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "regionModelFunctionObjectListI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H
new file mode 100644
index 0000000000..a0a90d0f67
--- /dev/null
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+inline const Foam::regionModels::regionModel&
+Foam::regionModels::regionModelFunctionObjectList::owner() const
+{
+    return owner_;
+}
+
+
+inline Foam::regionModels::regionModel&
+Foam::regionModels::regionModelFunctionObjectList::owner()
+{
+    return owner_;
+}
+
+
+inline const Foam::dictionary&
+Foam::regionModels::regionModelFunctionObjectList::dict() const
+{
+    return dict_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
new file mode 100644
index 0000000000..08e451fab2
--- /dev/null
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionModelFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::regionModels::regionModelFunctionObject>
+Foam::regionModels::regionModelFunctionObject::New
+(
+    const dictionary& dict,
+    regionModel& owner,
+    const word& modelName
+)
+{
+    const word modelType = dict.subDict(modelName).lookup("type");
+
+    Info<< "        " << modelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "regionModelFunctionObject::New"
+            "("
+                "const dictionary&, "
+                "regionModel&, "
+                "const word&"
+            ")"
+        )   << "Unknown region model function type "
+            << modelType << nl << nl
+            << "Valid region model function types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<regionModelFunctionObject>(cstrIter()(dict.subDict(modelName), owner));
+}
+
+
+// ************************************************************************* //

From 0582d7e611246f06e7f8cbfecd04c65d64e56ae4 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 14:42:57 +0000
Subject: [PATCH 39/81] ENH: Added film functions to map between regions using
 AMI functionality

---
 .../regionModel/regionModel/regionModel.C     |  60 +++++++
 .../regionModel/regionModel/regionModel.H     |  40 +++++
 .../regionModel/regionModelTemplates.C        | 158 ++++++++++++++++++
 3 files changed, 258 insertions(+)

diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index da1ab6e953..227af0adb4 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -190,6 +190,66 @@ bool Foam::regionModels::regionModel::read(const dictionary& dict)
 }
 
 
+Foam::label Foam::regionModels::regionModel::nbrCoupledPatchID
+(
+    const regionModel& nbrRegion,
+    const label regionPatchI
+) const
+{
+    label nbrPatchI = -1;
+
+    // region
+    const fvMesh& nbrRegionMesh = nbrRegion.regionMesh();
+
+    // boundary mesh
+    const polyBoundaryMesh& nbrPbm = nbrRegionMesh.boundaryMesh();
+
+    const mappedPatchBase& mpb =
+        refCast<const mappedPatchBase>
+        (
+            regionMesh().boundaryMesh()[regionPatchI]
+        );
+
+    // sample patch name on the primary region
+    const word& primaryPatchName = mpb.samplePatch();
+
+    // find patch on nbr region that has the same sample patch name
+    forAll(nbrRegion.intCoupledPatchIDs(), j)
+    {
+        const label nbrRegionPatchI = nbrRegion.intCoupledPatchIDs()[j];
+
+        const mappedPatchBase& mpb =
+            refCast<const mappedPatchBase>(nbrPbm[nbrRegionPatchI]);
+
+        if (mpb.samplePatch() == primaryPatchName)
+        {
+            nbrPatchI = nbrRegionPatchI;
+            break;
+        }
+    }
+
+    if (nbrPatchI == -1)
+    {
+        const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI];
+
+        FatalErrorIn
+        (
+            "Foam::tmp<Foam::Field<Type> > "
+            "Foam::regionModels::regionModel::nbrCoupledPatchID"
+            "("
+                "const regionModel& , "
+                "const label"
+            ") const"
+        )
+            << "Unable to find patch pair for local patch "
+            << p.name() << " and region " << nbrRegion.name()
+            << abort(FatalError);
+    }
+
+    return nbrPatchI;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::regionModels::regionModel::regionModel(const fvMesh& mesh)
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H
index 0b02fd1a58..9f2ec23e67 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/regionModels/regionModel/regionModel/regionModel.H
@@ -219,6 +219,46 @@ public:
 
         // Helper
 
+            //- Return the coupled patch ID paired with coupled patch
+            //  regionPatchI
+            label nbrCoupledPatchID
+            (
+                const regionModel& nbrRegion,
+                const label regionPatchI
+            ) const;
+
+            //- Map patch field from another region model to local patch
+            template<class Type>
+            tmp<Foam::Field<Type> > mapRegionPatchField
+            (
+                const regionModel& nbrRegion,
+                const label regionPatchI,
+                const label nbrPatchI,
+                const Field<Type>& nbrField,
+                const bool flip = false
+            ) const;
+
+            //- Map patch field from another region model to local patch
+            template<class Type>
+            tmp<Field<Type> > mapRegionPatchField
+            (
+                const word& regionModelName,
+                const word& fieldName,
+                const label regionPatchI,
+                const bool flip = false
+            ) const;
+
+            //- Map patch internal field from another region model to local
+            //  patch
+            template<class Type>
+            tmp<Field<Type> > mapRegionPatchInternalField
+            (
+                const word& regionModelName,
+                const word& fieldName,
+                const label regionPatchI,
+                const bool flip = false
+            ) const;
+
             //- Convert a local region field to the primary region
             template<class Type>
             void toPrimary
diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
index b78772de01..4e98b2e2fb 100644
--- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C
+++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
@@ -23,6 +23,164 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+template<class Type>
+Foam::tmp<Foam::Field<Type> >
+Foam::regionModels::regionModel::mapRegionPatchField
+(
+    const regionModel& nbrRegion,
+    const label regionPatchI,
+    const label nbrPatchI,
+    const Field<Type>& nbrField,
+    const bool flip
+) const
+{
+    const fvMesh& nbrRegionMesh = nbrRegion.regionMesh();
+
+    const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI];
+
+    const polyPatch& nbrP = nbrRegionMesh.boundaryMesh()[nbrPatchI];
+
+    int oldTag = UPstream::msgType();
+    UPstream::msgType() = oldTag + 1;
+
+    AMIPatchToPatchInterpolation ami(p, nbrP, faceAreaIntersect::tmMesh, flip);
+
+    tmp<Field<Type> > tresult(ami.interpolateToSource(nbrField));
+
+    UPstream::msgType() = oldTag;
+
+    return tresult;
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type> >
+Foam::regionModels::regionModel::mapRegionPatchField
+(
+    const word& regionModelName,
+    const word& fieldName,
+    const label regionPatchI,
+    const bool flip
+) const
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    const regionModel& nbrRegion =
+        this->primaryMesh_.lookupObject<regionModel>(regionModelName);
+
+    const fvMesh& nbrRegionMesh = nbrRegion.regionMesh();
+
+    const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI];
+
+    if (nbrRegionMesh.foundObject<fieldType>(fieldName))
+    {
+        const fieldType& nbrField =
+            nbrRegionMesh.lookupObject<fieldType>(fieldName);
+
+        const label nbrPatchI = nbrCoupledPatchID(nbrRegion, regionPatchI);
+
+        const polyPatch& nbrP = nbrRegionMesh.boundaryMesh()[nbrPatchI];
+
+        int oldTag = UPstream::msgType();
+        UPstream::msgType() = oldTag + 1;
+
+        AMIPatchToPatchInterpolation ami
+        (
+            p,
+            nbrP,
+            faceAreaIntersect::tmMesh,
+            flip
+        );
+
+        const Field<Type>& nbrFieldp = nbrField.boundaryField()[nbrPatchI];
+
+        tmp<Field<Type> > tresult(ami.interpolateToSource(nbrFieldp));
+
+        UPstream::msgType() = oldTag;
+
+        return tresult;
+    }
+    else
+    {
+        return
+            tmp<Field<Type> >
+            (
+                new Field<Type>
+                (
+                    p.size(),
+                    pTraits<Type>::zero
+                )
+            );
+    }
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type> >
+Foam::regionModels::regionModel::mapRegionPatchInternalField
+(
+    const word& regionModelName,
+    const word& fieldName,
+    const label regionPatchI,
+    const bool flip
+) const
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    const regionModel& nbrRegion =
+        this->primaryMesh_.lookupObject<regionModel>(regionModelName);
+
+    const fvMesh& nbrRegionMesh = nbrRegion.regionMesh();
+
+    const polyPatch& p = regionMesh().boundaryMesh()[regionPatchI];
+
+    if (nbrRegionMesh.foundObject<fieldType>(fieldName))
+    {
+        const fieldType& nbrField =
+            nbrRegionMesh.lookupObject<fieldType>(fieldName);
+
+        const label nbrPatchI = nbrCoupledPatchID(nbrRegion, regionPatchI);
+
+        const polyPatch& nbrP = nbrRegionMesh.boundaryMesh()[nbrPatchI];
+
+        int oldTag = UPstream::msgType();
+        UPstream::msgType() = oldTag + 1;
+
+        AMIPatchToPatchInterpolation ami
+        (
+            p,
+            nbrP,
+            faceAreaIntersect::tmMesh,
+            flip
+        );
+
+        const fvPatchField<Type>& nbrFieldp =
+            nbrField.boundaryField()[nbrPatchI];
+
+        tmp<Field<Type> > tresult
+        (
+            ami.interpolateToSource(nbrFieldp.patchInternalField())
+        );
+
+        UPstream::msgType() = oldTag;
+
+        return tresult;
+    }
+    else
+    {
+        return
+            tmp<Field<Type> >
+            (
+                new Field<Type>
+                (
+                    p.size(),
+                    pTraits<Type>::zero
+                )
+            );
+    }
+}
+
+
 template<class Type>
 void Foam::regionModels::regionModel::toPrimary
 (

From f4c7f38f0cf30f8b93032f4e255fa17e9a821f16 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 14:45:59 +0000
Subject: [PATCH 40/81] ENH: Do not shut-down pyrolysis reactions in the
 presence of a liquid film

---
 .../reactingOneDim/reactingOneDim.C           | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index 5c36e4ad53..21d2c5c0ec 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -684,36 +684,6 @@ void reactingOneDim::preEvolveRegion()
     {
         solidChemistry_->setCellReacting(cellI, true);
     }
-
-    // De-activate reactions if pyrolysis region coupled to (valid) film
-    if (filmCoupled_)
-    {
-        const volScalarField& filmDelta = filmDeltaPtr_();
-
-        forAll(intCoupledPatchIDs_, i)
-        {
-            const label patchI = intCoupledPatchIDs_[i];
-            const scalarField& filmDeltap = filmDelta.boundaryField()[patchI];
-
-            forAll(filmDeltap, faceI)
-            {
-                const scalar filmDelta0 = filmDeltap[faceI];
-                if (filmDelta0 > reactionDeltaMin_)
-                {
-                    const labelList& cells = boundaryFaceCells_[faceI];
-
-                    // TODO: only limit cell adjacent to film?
-                    //solidChemistry_->setCellNoReacting(cells[0])
-
-                    // Propagate flag through 1-D region
-                    forAll(cells, k)
-                    {
-                        solidChemistry_->setCellReacting(cells[k], false);
-                    }
-                }
-            }
-        }
-    }
 }
 
 

From fc7ae2b06fa792ba3832090b2af095a303be2e21 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 14:49:51 +0000
Subject: [PATCH 41/81] ENH: Updated radiation handling in pyrolysis regions

---
 .../reactingOneDim/reactingOneDim.C           | 115 ------------------
 .../reactingOneDim/reactingOneDim.H           |  21 +---
 .../reactingOneDim/reactingOneDimI.H          |   9 +-
 3 files changed, 2 insertions(+), 143 deletions(-)

diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
index 21d2c5c0ec..3588060c72 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
@@ -90,58 +90,6 @@ bool reactingOneDim::read(const dictionary& dict)
 }
 
 
-void reactingOneDim::updateQr()
-{
-    // Retrieve field from coupled region using mapped boundary conditions
-    QrCoupled_.correctBoundaryConditions();
-
-    // Update local Qr from coupled Qr field
-    Qr_ == dimensionedScalar("zero", Qr_.dimensions(), 0.0);
-    forAll(intCoupledPatchIDs_, i)
-    {
-        const label patchI = intCoupledPatchIDs_[i];
-
-        scalarField& Qrp = Qr_.boundaryField()[patchI];
-
-        // Qr is negative going out the solid
-        // If the surface is emitting the radiative flux is set to zero
-        Qrp = max(Qrp, scalar(0.0));
-    }
-
-    const volScalarField kappaRad_(kappaRad());
-
-    // Propagate Qr through 1-D regions
-    label totalFaceId = 0;
-    forAll(intCoupledPatchIDs_, i)
-    {
-        const label patchI = intCoupledPatchIDs_[i];
-
-        const scalarField& Qrp = Qr_.boundaryField()[patchI];
-        const vectorField& Cf = regionMesh().Cf().boundaryField()[patchI];
-
-        forAll(Qrp, faceI)
-        {
-            const scalar Qr0 = Qrp[faceI];
-            point Cf0 = Cf[faceI];
-            const labelList& cells = boundaryFaceCells_[totalFaceId];
-            scalar kappaInt = 0.0;
-            forAll(cells, k)
-            {
-                const label cellI = cells[k];
-                const point& Cf1 = regionMesh().cellCentres()[cellI];
-                const scalar delta = mag(Cf1 - Cf0);
-                kappaInt += kappaRad_[cellI]*delta;
-                Qr_[cellI] = Qr0*exp(-kappaInt);
-                Cf0 = Cf1;
-            }
-            totalFaceId ++;
-        }
-    }
-
-    Qr_.correctBoundaryConditions();
-}
-
-
 void reactingOneDim::updatePhiGas()
 {
     phiHsGas_ ==  dimensionedScalar("zero", phiHsGas_.dimensions(), 0.0);
@@ -198,8 +146,6 @@ void reactingOneDim::updatePhiGas()
 
 void reactingOneDim::updateFields()
 {
-    updateQr();
-
     updatePhiGas();
 }
 
@@ -305,8 +251,6 @@ void reactingOneDim::solveEnergy()
 
     tmp<volScalarField> alpha(solidThermo_.alpha());
 
-    const surfaceScalarField phiQr(fvc::interpolate(Qr_)*nMagSf());
-
     const surfaceScalarField phiGas(fvc::interpolate(phiHsGas_));
 
     fvScalarMatrix hEqn
@@ -315,7 +259,6 @@ void reactingOneDim::solveEnergy()
       - fvm::laplacian(alpha, h_)
      ==
         chemistrySh_
-      + fvc::div(phiQr)
       + fvc::div(phiGas)
     );
 
@@ -380,7 +323,6 @@ reactingOneDim::reactingOneDim(const word& modelType, const fvMesh& mesh)
     ),
     Ys_(solidThermo_.composition().Y()),
     h_(solidThermo_.he()),
-    primaryRadFluxName_(coeffs().lookupOrDefault<word>("radFluxName", "Qr")),
     nNonOrthCorr_(-1),
     maxDiff_(10),
     minimumDelta_(1e-4),
@@ -427,34 +369,6 @@ reactingOneDim::reactingOneDim(const word& modelType, const fvMesh& mesh)
         dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0)
     ),
 
-    QrCoupled_
-    (
-        IOobject
-        (
-            primaryRadFluxName_,
-            time().timeName(),
-            regionMesh(),
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        regionMesh()
-    ),
-
-    Qr_
-    (
-        IOobject
-        (
-            "QrPyr",
-            time().timeName(),
-            regionMesh(),
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        regionMesh(),
-        dimensionedScalar("zero", dimEnergy/dimArea/dimTime, 0.0),
-        zeroGradientFvPatchVectorField::typeName
-    ),
-
     lostSolidMass_(dimensionedScalar("zero", dimMass, 0.0)),
     addedGasMass_(dimensionedScalar("zero", dimMass, 0.0)),
     totalGasMassFlux_(0.0),
@@ -492,7 +406,6 @@ reactingOneDim::reactingOneDim
     ),
     Ys_(solidThermo_.composition().Y()),
     h_(solidThermo_.he()),
-    primaryRadFluxName_(dict.lookupOrDefault<word>("radFluxName", "Qr")),
     nNonOrthCorr_(-1),
     maxDiff_(10),
     minimumDelta_(1e-4),
@@ -539,34 +452,6 @@ reactingOneDim::reactingOneDim
         dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0)
     ),
 
-    QrCoupled_
-    (
-        IOobject
-        (
-            primaryRadFluxName_,
-            time().timeName(),
-            regionMesh(),
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        regionMesh()
-    ),
-
-    Qr_
-    (
-        IOobject
-        (
-            "QrPyr",
-            time().timeName(),
-            regionMesh(),
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        regionMesh(),
-        dimensionedScalar("zero", dimEnergy/dimArea/dimTime, 0.0),
-        zeroGradientFvPatchVectorField::typeName
-    ),
-
     lostSolidMass_(dimensionedScalar("zero", dimMass, 0.0)),
     addedGasMass_(dimensionedScalar("zero", dimMass, 0.0)),
     totalGasMassFlux_(0.0),
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
index 76cf66a60f..104e56c34e 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,16 +125,6 @@ protected:
             volScalarField chemistrySh_;
 
 
-        // Source term fields
-
-            //- Coupled region radiative heat flux [W/m2]
-            //  Requires user to input mapping info for coupled patches
-            volScalarField QrCoupled_;
-
-            //- In depth radiative heat flux [W/m2]
-            volScalarField Qr_;
-
-
         // Checks
 
             //- Cumulative lost mass of the condensed phase [kg]
@@ -164,9 +154,6 @@ protected:
         //- Update/move mesh based on change in mass
         void updateMesh(const scalarField& mass0);
 
-        //- Update radiative flux in pyrolysis region
-        void updateQr();
-
         //- Update enthalpy flux for pyrolysis gases
         void updatePhiGas();
 
@@ -259,12 +246,6 @@ public:
             virtual scalar solidRegionDiffNo() const;
 
 
-        // Source fields (read/write access)
-
-            //- In depth radiative heat flux
-            inline const volScalarField& Qr() const;
-
-
        // Evolution
 
             //- Pre-evolve region
diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDimI.H b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDimI.H
index eec1e7fa0a..375c378080 100644
--- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDimI.H
+++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDimI.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,11 +34,4 @@ Foam::regionModels::pyrolysisModels::reactingOneDim::nNonOrthCorr() const
 }
 
 
-inline const Foam::volScalarField&
-Foam::regionModels::pyrolysisModels::reactingOneDim::Qr() const
-{
-    return Qr_;
-}
-
-
 // ************************************************************************* //

From 8557ff0492d55f4af6b001bde529baca5f021c35 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 15:00:24 +0000
Subject: [PATCH 42/81] BUG: Corrected film/primary region shear force
 calculation

---
 .../surfaceShearForce/surfaceShearForce.C     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
index 2c0a94f9f8..a2c910c412 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
@@ -80,11 +80,11 @@ tmp<fvVectorMatrix> surfaceShearForce::correct(volVectorField& U)
     tmp<volScalarField> tCs;
 
     typedef compressible::turbulenceModel turbModel;
-    if (film.primaryMesh().foundObject<turbModel>("turbulenceProperties"))
+    if (film.primaryMesh().foundObject<turbModel>("turbulenceModel"))
     {
         // local reference to turbulence model
         const turbModel& turb =
-            film.primaryMesh().lookupObject<turbModel>("turbulenceProperties");
+            film.primaryMesh().lookupObject<turbModel>("turbulenceModel");
 
         // calculate and store the stress on the primary region
         const volSymmTensorField primaryReff(turb.devRhoReff());
@@ -117,13 +117,23 @@ tmp<fvVectorMatrix> surfaceShearForce::correct(volVectorField& U)
         Reff.correctBoundaryConditions();
 
         dimensionedScalar U0("SMALL", U.dimensions(), SMALL);
-        tCs = Cf_*mag(-film.nHat() & Reff)/(mag(Up - U) + U0);
+        volVectorField UHat("UHat", (Up - U)/(mag(Up - U) + U0));
+
+        // shear stress tangential to the film
+        volVectorField tauTan
+        (
+            "tauTan",
+            UHat & (Reff + film.nHat()*(-film.nHat() & Reff))
+        );
+
+        // note: Cf_ 'should' be 1 in this case
+        tCs = Cf_*mag(tauTan)/(mag(Up - U) + U0);
     }
     else
     {
         // laminar case - employ simple coeff-based model
-        const volScalarField& rho = film.rho();
-        tCs = Cf_*rho*mag(Up - U);
+        const volScalarField& rhop = film.rhoPrimary();
+        tCs = Cf_*rhop*mag(Up - U);
     }
 
     dimensionedScalar d0("SMALL", delta.dimensions(), SMALL);

From fe18dc7e7f31908bb5ba61e60dac2d66858edc39 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Nov 2012 15:09:26 +0000
Subject: [PATCH 43/81] ENH: Updated film<>pyrolysis coupled BCs to make use of
 film alpha field

---
 ...ysisTemperatureCoupledFvPatchScalarField.C | 38 +++++-------------
 ...ysisTemperatureCoupledFvPatchScalarField.H | 13 +------
 ...rolysisVelocityCoupledFvPatchVectorField.C | 39 ++++++-------------
 ...rolysisVelocityCoupledFvPatchVectorField.H | 13 +------
 4 files changed, 23 insertions(+), 80 deletions(-)

diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index b0f8d1629a..1ffe2ae82f 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,8 +40,7 @@ filmPyrolysisTemperatureCoupledFvPatchScalarField
 :
     fixedValueFvPatchScalarField(p, iF),
     phiName_("phi"),
-    rhoName_("rho"),
-    deltaWet_(1e-6)
+    rhoName_("rho")
 {}
 
 
@@ -56,8 +55,7 @@ filmPyrolysisTemperatureCoupledFvPatchScalarField
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
     phiName_(ptf.phiName_),
-    rhoName_(ptf.rhoName_),
-    deltaWet_(ptf.deltaWet_)
+    rhoName_(ptf.rhoName_)
 {}
 
 
@@ -71,8 +69,7 @@ filmPyrolysisTemperatureCoupledFvPatchScalarField
 :
     fixedValueFvPatchScalarField(p, iF),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    deltaWet_(dict.lookupOrDefault<scalar>("deltaWet", 1e-6))
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
 {
     fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
 }
@@ -86,8 +83,7 @@ filmPyrolysisTemperatureCoupledFvPatchScalarField
 :
     fixedValueFvPatchScalarField(fptpsf),
     phiName_(fptpsf.phiName_),
-    rhoName_(fptpsf.rhoName_),
-    deltaWet_(fptpsf.deltaWet_)
+    rhoName_(fptpsf.rhoName_)
 {}
 
 
@@ -100,8 +96,7 @@ filmPyrolysisTemperatureCoupledFvPatchScalarField
 :
     fixedValueFvPatchScalarField(fptpsf, iF),
     phiName_(fptpsf.phiName_),
-    rhoName_(fptpsf.rhoName_),
-    deltaWet_(fptpsf.deltaWet_)
+    rhoName_(fptpsf.rhoName_)
 {}
 
 
@@ -151,13 +146,12 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
 
     const label filmPatchI = filmModel.regionPatchID(patchI);
 
-    scalarField deltaFilm = filmModel.delta().boundaryField()[filmPatchI];
-    filmModel.toPrimary(filmPatchI, deltaFilm);
+    scalarField alphaFilm = filmModel.alpha().boundaryField()[filmPatchI];
+    filmModel.toPrimary(filmPatchI, alphaFilm);
 
     scalarField TFilm = filmModel.Ts().boundaryField()[filmPatchI];
     filmModel.toPrimary(filmPatchI, TFilm);
 
-
     // Retrieve pyrolysis model
     const pyrModelType& pyrModel =
         db().lookupObject<pyrModelType>("pyrolysisProperties");
@@ -168,19 +162,8 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
     pyrModel.toPrimary(pyrPatchI, TPyr);
 
 
-    forAll(deltaFilm, i)
-    {
-        if (deltaFilm[i] > deltaWet_)
-        {
-            // temperature set by film
-            Tp[i] = TFilm[i];
-        }
-        else
-        {
-            // temperature set by pyrolysis model
-            Tp[i] = TPyr[i];
-        }
-    }
+    // Evaluate temperature
+    Tp = alphaFilm*TFilm + (1.0 - alphaFilm)*TPyr;
 
     // Restore tag
     UPstream::msgType() = oldTag;
@@ -197,7 +180,6 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::write
     fvPatchScalarField::write(os);
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    os.writeKeyword("deltaWet") << deltaWet_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
 
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.H b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.H
index 503b023f95..bc4ace8abd 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.H
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.H
@@ -28,15 +28,7 @@ Description
     This boundary condition is designed to be used in conjunction with surface
     film and pyrolysis modelling.  It provides a temperature boundary condition
     for patches on the primary region based on whether the patch is seen to
-    be 'wet', specified by:
-
-        \f[
-            delta > delta_wet
-        \f]
-
-    where
-        \var delta     = film height [m]
-        \var delta_wet = film height above which the surface is considered wet
+    be 'wet', retrieved from the film alpha field.
 
     \li if the patch is wet, the temperature is set using the film temperature
     \li otherwise, it is set using pyrolysis temperature
@@ -84,9 +76,6 @@ class filmPyrolysisTemperatureCoupledFvPatchScalarField
         //- Name of density field
         word rhoName_;
 
-        //- Film height threshold beyond which it is considered 'wet' [m]
-        scalar deltaWet_;
-
 
 public:
 
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 29b3e34586..9210d30e57 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,8 +40,7 @@ filmPyrolysisVelocityCoupledFvPatchVectorField
 :
     fixedValueFvPatchVectorField(p, iF),
     phiName_("phi"),
-    rhoName_("rho"),
-    deltaWet_(1e-6)
+    rhoName_("rho")
 {}
 
 
@@ -56,8 +55,7 @@ filmPyrolysisVelocityCoupledFvPatchVectorField
 :
     fixedValueFvPatchVectorField(ptf, p, iF, mapper),
     phiName_(ptf.phiName_),
-    rhoName_(ptf.rhoName_),
-    deltaWet_(ptf.deltaWet_)
+    rhoName_(ptf.rhoName_)
 {}
 
 
@@ -71,8 +69,7 @@ filmPyrolysisVelocityCoupledFvPatchVectorField
 :
     fixedValueFvPatchVectorField(p, iF),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    deltaWet_(dict.lookupOrDefault<scalar>("deltaWet", 1e-6))
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
 {
     fvPatchVectorField::operator=(vectorField("value", dict, p.size()));
 }
@@ -86,8 +83,7 @@ filmPyrolysisVelocityCoupledFvPatchVectorField
 :
     fixedValueFvPatchVectorField(fpvpvf),
     phiName_(fpvpvf.phiName_),
-    rhoName_(fpvpvf.rhoName_),
-    deltaWet_(fpvpvf.deltaWet_)
+    rhoName_(fpvpvf.rhoName_)
 {}
 
 
@@ -100,8 +96,7 @@ filmPyrolysisVelocityCoupledFvPatchVectorField
 :
     fixedValueFvPatchVectorField(fpvpvf, iF),
     phiName_(fpvpvf.phiName_),
-    rhoName_(fpvpvf.rhoName_),
-    deltaWet_(fpvpvf.deltaWet_)
+    rhoName_(fpvpvf.rhoName_)
 {}
 
 
@@ -154,13 +149,12 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
 
     const label filmPatchI = filmModel.regionPatchID(patchI);
 
-    scalarField deltaFilm = filmModel.delta().boundaryField()[filmPatchI];
-    filmModel.toPrimary(filmPatchI, deltaFilm);
+    scalarField alphaFilm = filmModel.alpha().boundaryField()[filmPatchI];
+    filmModel.toPrimary(filmPatchI, alphaFilm);
 
     vectorField UFilm = filmModel.Us().boundaryField()[filmPatchI];
     filmModel.toPrimary(filmPatchI, UFilm);
 
-
     // Retrieve pyrolysis model
     const pyrModelType& pyrModel =
         db().objectRegistry::lookupObject<pyrModelType>
@@ -203,19 +197,9 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
     const scalarField UAvePyr(-phiPyr/patch().magSf());
     const vectorField& nf = patch().nf();
 
-    forAll(deltaFilm, i)
-    {
-        if (deltaFilm[i] > deltaWet_)
-        {
-            // velocity set by film
-            Up[i] = UFilm[i];
-        }
-        else
-        {
-            // velocity set by pyrolysis model
-            Up[i] = UAvePyr[i]*nf[i];
-        }
-    }
+
+    // Evaluate velocity
+    Up = alphaFilm*UFilm + (1.0 - alphaFilm)*UAvePyr*nf;
 
     // Restore tag
     UPstream::msgType() = oldTag;
@@ -232,7 +216,6 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::write
     fvPatchVectorField::write(os);
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    os.writeKeyword("deltaWet") << deltaWet_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
 
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.H b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.H
index c7c4c5d24b..b37157ddf0 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.H
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.H
@@ -28,15 +28,7 @@ Description
     This boundary condition is designed to be used in conjunction with surface
     film and pyrolysis modelling.  It provides a velocity boundary condition
     for patches on the primary region based on whether the patch is seen to
-    be 'wet', specified by:
-
-        \f[
-            delta > delta_wet
-        \f]
-
-    where
-        \var delta     = film height [m]
-        \var delta_wet = film height above which the surface is considered wet
+    be 'wet', retrieved from the film alpha field.
 
     \li if the patch is wet, the velocity is set using the film velocity
     \li otherwise, it is set using pyrolysis out-gassing velocity
@@ -84,9 +76,6 @@ class filmPyrolysisVelocityCoupledFvPatchVectorField
         //- Name of density field
         word rhoName_;
 
-        //- Film height threshold beyond which it is considered 'wet'
-        scalar deltaWet_;
-
 
 public:
 

From 6bd16e1eeff4fff77d1c5cc7e1b4f0e87e81448e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 13 Nov 2012 12:17:41 +0000
Subject: [PATCH 44/81] ENH: OBJstream: output triPointRef

---
 src/surfMesh/surfaceFormats/obj/OBJstream.C | 32 +++++++++++++++++++++
 src/surfMesh/surfaceFormats/obj/OBJstream.H |  6 +++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.C b/src/surfMesh/surfaceFormats/obj/OBJstream.C
index ca24b6b6aa..fcd446eaab 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJstream.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJstream.C
@@ -238,6 +238,38 @@ Foam::Ostream& Foam::OBJstream::write(const linePointRef& ln)
 }
 
 
+Foam::Ostream& Foam::OBJstream::write
+(
+    const triPointRef& f,
+    const bool lines
+)
+{
+    label start = nVertices_;
+    write(f.a());
+    write(f.b());
+    write(f.c());
+    if (lines)
+    {
+        write('l');
+        for (int i = 0; i < 3; i++)
+        {
+            write(' ') << start+1+i;
+        }
+        write(' ') << start+1 << '\n';
+    }
+    else
+    {
+        write('f');
+        for (int i = 0; i < 3; i++)
+        {
+            write(' ') << start+1+i;
+        }
+        write('\n');
+    }
+    return *this;
+}
+
+
 Foam::Ostream& Foam::OBJstream::write
 (
     const face& f,
diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.H b/src/surfMesh/surfaceFormats/obj/OBJstream.H
index 9e62cbdbeb..ec7e93d24e 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJstream.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJstream.H
@@ -39,13 +39,14 @@ SourceFiles
 #include "point.H"
 #include "edge.H"
 #include "face.H"
+#include "triPointRef.H"
+#include "linePointRef.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-
 /*---------------------------------------------------------------------------*\
                           Class OBJstream Declaration
 \*---------------------------------------------------------------------------*/
@@ -134,6 +135,9 @@ public:
             //- Write line
             Ostream& write(const linePointRef&);
 
+            //- Write triangle as points with lines or filled polygon
+            Ostream& write(const triPointRef&, const bool lines = true);
+
             //- Write face as points with lines or filled polygon
             Ostream& write
             (

From 434e2fafcdd045a8f558fc68475968063be0caf4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 13 Nov 2012 12:20:02 +0000
Subject: [PATCH 45/81] ENH: searchableSurfaces: add checking routines

---
 .../mesh/generation/cvMesh/Make/options       |   2 +
 .../cvMesh/conformalVoronoiMesh/Make/options  |   1 +
 .../utilities/mesh/generation/cvMesh/cvMesh.C |  32 +-
 .../cvMesh/cvMeshSurfaceSimplify/Make/options |   2 +
 .../generation/snappyHexMesh/Make/options     |   2 +
 .../generation/snappyHexMesh/snappyHexMesh.C  |  59 ++-
 src/fvMotionSolver/Make/options               |   1 +
 src/mesh/autoMesh/Make/options                |   1 +
 src/meshTools/Make/options                    |   3 +-
 .../searchableSurface/searchableSurfaces.C    | 494 +++++++++++++++++-
 .../searchableSurface/searchableSurfaces.H    |  56 +-
 11 files changed, 648 insertions(+), 5 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index 2255a9a271..2228fc2b12 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -17,6 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
@@ -29,5 +30,6 @@ EXE_LIBS = \
     -ldecompositionMethods \
     -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
     -ledgeMesh \
+    -lsampling \
     -ltriSurface \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
index 97e045f305..62649cf232 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
@@ -17,6 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I../vectorTools
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMesh.C b/applications/utilities/mesh/generation/cvMesh/cvMesh.C
index ecd7f102ba..f15ebea29a 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/cvMesh.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-2012 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,7 @@ Description
 
 #include "argList.H"
 #include "conformalVoronoiMesh.H"
+#include "vtkSetWriter.H"
 
 using namespace Foam;
 
@@ -48,6 +49,11 @@ int main(int argc, char *argv[])
         "noFilter",
         "Do not filter the mesh"
     );
+    Foam::argList::addBoolOption
+    (
+        "checkGeometry",
+        "check all surface geometry for quality"
+    );
 
     #include "setRootCase.H"
     #include "createTime.H"
@@ -55,6 +61,7 @@ int main(int argc, char *argv[])
     runTime.functionObjects().off();
 
     const bool noFilter = !args.optionFound("noFilter");
+    const bool checkGeometry = args.optionFound("checkGeometry");
 
     Info<< "Mesh filtering is " << (noFilter ? "on" : "off") << endl;
 
@@ -74,6 +81,29 @@ int main(int argc, char *argv[])
 
     conformalVoronoiMesh mesh(runTime, cvMeshDict);
 
+
+    if (checkGeometry)
+    {
+        const searchableSurfaces& allGeometry = mesh.allGeometry();
+
+        // Write some stats
+        allGeometry.writeStats(List<wordList>(0), Info);
+        // Check topology
+        allGeometry.checkTopology(true);
+        // Check geometry
+        allGeometry.checkGeometry
+        (
+            100.0,      // max size ratio
+            1e-9,       // intersection tolerance
+            autoPtr<writer<scalar> >(new vtkSetWriter<scalar>()),
+            0.01,       // min triangle quality
+            true
+        );
+
+        return 0;
+    }
+
+
     while (runTime.loop())
     {
         Info<< nl << "Time = " << runTime.timeName() << endl;
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
index c7c073ab17..35c90b1f48 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
@@ -9,6 +9,7 @@ EXE_INC = \
     -I$(FASTDUALOCTREE_SRC_PATH) \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
@@ -21,6 +22,7 @@ EXE_LIBS = \
     -lconformalVoronoiMesh \
     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
     -ledgeMesh \
+    -lsampling \
     -ltriSurface \
     -lmeshTools \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index b7fd6d3bd2..94ff17ee99 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
@@ -13,5 +14,6 @@ EXE_LIBS = \
     -ldecompositionMethods \
     -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
     -lmeshTools \
+    -lsampling \
     -ldynamicMesh \
     -lautoMesh
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 2372b144ec..6b63430918 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -46,7 +46,7 @@ Description
 #include "refinementParameters.H"
 #include "snapParameters.H"
 #include "layerParameters.H"
-
+#include "vtkSetWriter.H"
 
 using namespace Foam;
 
@@ -122,6 +122,12 @@ void writeMesh
 int main(int argc, char *argv[])
 {
 #   include "addOverwriteOption.H"
+    Foam::argList::addBoolOption
+    (
+        "checkGeometry",
+        "check all surface geometry for quality"
+    );
+
 #   include "setRootCase.H"
 #   include "createTime.H"
     runTime.functionObjects().off();
@@ -131,6 +137,7 @@ int main(int argc, char *argv[])
         << runTime.cpuTimeIncrement() << " s" << endl;
 
     const bool overwrite = args.optionFound("overwrite");
+    const bool checkGeometry = args.optionFound("checkGeometry");
 
     // Check patches and faceZones are synchronised
     mesh.boundaryMesh().checkParallelSync(true);
@@ -244,6 +251,56 @@ int main(int argc, char *argv[])
         << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
 
 
+    // Checking only?
+
+    if (checkGeometry)
+    {
+        // Extract patchInfo
+        List<wordList> patchTypes(allGeometry.size());
+
+        const PtrList<dictionary>& patchInfo = surfaces.patchInfo();
+        const labelList& surfaceGeometry = surfaces.surfaces();
+        forAll(surfaceGeometry, surfI)
+        {
+            label geomI = surfaceGeometry[surfI];
+            const wordList& regNames = allGeometry.regionNames()[geomI];
+
+            patchTypes[geomI].setSize(regNames.size());
+            forAll(regNames, regionI)
+            {
+                label globalRegionI = surfaces.globalRegion(surfI, regionI);
+
+                if (patchInfo.set(globalRegionI))
+                {
+                    patchTypes[geomI][regionI] =
+                        word(patchInfo[globalRegionI].lookup("type"));
+                }
+                else
+                {
+                    patchTypes[geomI][regionI] = wallPolyPatch::typeName;
+                }
+            }
+        }
+
+        // Write some stats
+        allGeometry.writeStats(patchTypes, Info);
+        // Check topology
+        allGeometry.checkTopology(true);
+        // Check geometry
+        allGeometry.checkGeometry
+        (
+            100.0,      // max size ratio
+            1e-9,       // intersection tolerance
+            autoPtr<writer<scalar> >(new vtkSetWriter<scalar>()),
+            0.01,       // min triangle quality
+            true
+        );
+
+        return 0;
+    }
+
+
+
     // Read refinement shells
     // ~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options
index 7c440dd78f..fa13513b50 100644
--- a/src/fvMotionSolver/Make/options
+++ b/src/fvMotionSolver/Make/options
@@ -3,6 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \
 
 LIB_LIBS = \
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options
index ca8cb9e2e4..0ee4f07bb0 100644
--- a/src/mesh/autoMesh/Make/options
+++ b/src/mesh/autoMesh/Make/options
@@ -4,6 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options
index 45765759c1..ac717c7516 100644
--- a/src/meshTools/Make/options
+++ b/src/meshTools/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/triSurface/lnInclude
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 LIB_LIBS = \
     -ltriSurface
diff --git a/src/meshTools/searchableSurface/searchableSurfaces.C b/src/meshTools/searchableSurface/searchableSurfaces.C
index c42133c29f..653d708e49 100644
--- a/src/meshTools/searchableSurface/searchableSurfaces.C
+++ b/src/meshTools/searchableSurface/searchableSurfaces.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,12 +27,42 @@ License
 #include "searchableSurfacesQueries.H"
 #include "ListOps.H"
 #include "Time.H"
+//#include "vtkSetWriter.H"
+#include "DynamicField.H"
+//#include "OBJstream.H"
+#include "PatchTools.H"
+#include "triSurfaceMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(Foam::searchableSurfaces, 0);
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+//- Is edge connected to triangle
+bool Foam::searchableSurfaces::connected
+(
+    const triSurface& s,
+    const label edgeI,
+    const pointIndexHit& hit
+)
+{
+    const triFace& localFace = s.localFaces()[hit.index()];
+    const edge& e = s.edges()[edgeI];
+
+    forAll(localFace, i)
+    {
+        if (e.otherVertex(localFace[i]) != -1)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct with length.
@@ -378,6 +408,468 @@ Foam::pointIndexHit Foam::searchableSurfaces::facesIntersection
     );
 }
 
+
+bool Foam::searchableSurfaces::checkClosed(const bool report) const
+{
+    if (report)
+    {
+        Info<< "Checking for closedness." << endl;
+    }
+
+    bool hasError = false;
+
+    forAll(*this, surfI)
+    {
+        if (!operator[](surfI).hasVolumeType())
+        {
+            hasError = true;
+
+            if (report)
+            {
+                Info<< "    " << names()[surfI]
+                    << " : not closed" << endl;
+            }
+
+            if (isA<triSurface>(operator[](surfI)))
+            {
+                const triSurface& s = dynamic_cast<const triSurface&>
+                (
+                    operator[](surfI)
+                );
+                const labelListList& edgeFaces = s.edgeFaces();
+
+                label nSingleEdges = 0;
+                forAll(edgeFaces, edgeI)
+                {
+                    if (edgeFaces[edgeI].size() == 1)
+                    {
+                        nSingleEdges++;
+                    }
+                }
+
+                label nMultEdges = 0;
+                forAll(edgeFaces, edgeI)
+                {
+                    if (edgeFaces[edgeI].size() > 2)
+                    {
+                        nMultEdges++;
+                    }
+                }
+
+                if (report && (nSingleEdges != 0 || nMultEdges != 0))
+                {
+                    Info<< "        connected to one face : "
+                        << nSingleEdges << nl
+                        << "        connected to >2 faces : "
+                        << nMultEdges << endl;
+                }
+            }
+        }
+    }
+
+    if (report)
+    {
+        Info<< endl;
+    }
+
+    return returnReduce(hasError, orOp<bool>());
+}
+
+
+bool Foam::searchableSurfaces::checkNormalOrientation(const bool report) const
+{
+    if (report)
+    {
+        Info<< "Checking for normal orientation." << endl;
+    }
+
+    bool hasError = false;
+
+    forAll(*this, surfI)
+    {
+        if (isA<triSurface>(operator[](surfI)))
+        {
+            const triSurface& s = dynamic_cast<const triSurface&>
+            (
+                operator[](surfI)
+            );
+
+            labelHashSet borderEdge(s.size()/1000);
+            PatchTools::checkOrientation(s, false, &borderEdge);
+            // Colour all faces into zones using borderEdge
+            labelList normalZone;
+            label nZones = PatchTools::markZones(s, borderEdge, normalZone);
+            if (nZones > 1)
+            {
+                hasError = true;
+
+                if (report)
+                {
+                    Info<< "    " << names()[surfI]
+                        << " : has multiple orientation zones ("
+                        << nZones << ")" << endl;
+                }
+            }
+        }
+    }
+
+    if (report)
+    {
+        Info<< endl;
+    }
+
+    return returnReduce(hasError, orOp<bool>());
+}
+
+
+bool Foam::searchableSurfaces::checkSizes
+(
+    const scalar maxRatio,
+    const bool report
+) const
+{
+    if (report)
+    {
+        Info<< "Checking for size." << endl;
+    }
+
+    bool hasError = false;
+
+    forAll(*this, i)
+    {
+        const boundBox& bb = operator[](i).bounds();
+
+        for (label j = i+1; j < size(); j++)
+        {
+            scalar ratio = bb.mag()/operator[](j).bounds().mag();
+
+            if (ratio > maxRatio || ratio < 1.0/maxRatio)
+            {
+                hasError = true;
+
+                if (report)
+                {
+                    Info<< "    " << names()[i]
+                        << " bounds differ from " << names()[j]
+                        << " by more than a factor 100:" << nl
+                        << "        bounding box : " << bb << nl
+                        << "        bounding box : " << operator[](j).bounds()
+                        << endl;
+                }
+                break;
+            }
+        }
+    }
+
+    if (report)
+    {
+        Info<< endl;
+    }
+
+    return returnReduce(hasError, orOp<bool>());
+}
+
+
+bool Foam::searchableSurfaces::checkIntersection
+(
+    const scalar tolerance,
+    const autoPtr<writer<scalar> >& setWriter,
+    const bool report
+) const
+{
+    if (report)
+    {
+        Info<< "Checking for intersection." << endl;
+    }
+
+    //cpuTime timer;
+
+    bool hasError = false;
+
+    forAll(*this, i)
+    {
+        if (isA<triSurfaceMesh>(operator[](i)))
+        {
+            const triSurfaceMesh& s0 = dynamic_cast<const triSurfaceMesh&>
+            (
+                operator[](i)
+            );
+            const edgeList& edges0 = s0.edges();
+            const pointField& localPoints0 = s0.localPoints();
+
+            // Collect all the edge vectors
+            pointField start(edges0.size());
+            pointField end(edges0.size());
+            forAll(edges0, edgeI)
+            {
+                const edge& e = edges0[edgeI];
+                start[edgeI] = localPoints0[e[0]];
+                end[edgeI] = localPoints0[e[1]];
+            }
+
+            // Test all other surfaces for intersection
+            forAll(*this, j)
+            {
+                List<pointIndexHit> hits;
+
+                if (i == j)
+                {
+                    // Slightly shorten the edges to prevent finding lots of
+                    // intersections. The fast triangle intersection routine
+                    // has problems with rays passing through a point of the
+                    // triangle.
+                    vectorField d
+                    (
+                        max(tolerance, 10*s0.tolerance())
+                       *(end-start)
+                    );
+                    start += d;
+                    end -= d;
+                }
+
+                operator[](j).findLineAny(start, end, hits);
+
+                label nHits = 0;
+                DynamicField<point> intersections(edges0.size()/100);
+                DynamicField<scalar> intersectionEdge(intersections.capacity());
+
+                forAll(hits, edgeI)
+                {
+                    if
+                    (
+                        hits[edgeI].hit()
+                     && (i != j || !connected(s0, edgeI, hits[edgeI]))
+                    )
+                    {
+                        intersections.append(hits[edgeI].hitPoint());
+                        intersectionEdge.append(1.0*edgeI);
+                        nHits++;
+                    }
+                }
+
+                if (nHits > 0)
+                {
+                    if (report)
+                    {
+                        Info<< "    " << names()[i]
+                            << " intersects " << names()[j]
+                            << " at " << nHits
+                            << " locations."
+                            << endl;
+
+                        //vtkSetWriter<scalar> setWriter;
+                        if (setWriter.valid())
+                        {
+                            scalarField dist(mag(intersections));
+                            coordSet track
+                            (
+                                names()[i] + '_' + names()[j],
+                                "xyz",
+                                intersections.xfer(),
+                                dist
+                            );
+                            wordList valueSetNames(1, "edgeIndex");
+                            List<const scalarField*> valueSets
+                            (
+                                1,
+                                &intersectionEdge
+                            );
+
+                            fileName fName
+                            (
+                                setWriter().getFileName(track, valueSetNames)
+                            );
+                            Info<< "    Writing intersection locations to "
+                                << fName << endl;
+                            OFstream os
+                            (
+                                s0.searchableSurface::time().path()
+                               /fName
+                            );
+                            setWriter().write
+                            (
+                                track,
+                                valueSetNames,
+                                valueSets,
+                                os
+                            );
+                        }
+                    }
+
+                    hasError = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    if (report)
+    {
+        Info<< endl;
+    }
+
+    return returnReduce(hasError, orOp<bool>());
+}
+
+
+bool Foam::searchableSurfaces::checkQuality
+(
+    const scalar minQuality,
+    const bool report
+) const
+{
+    if (report)
+    {
+        Info<< "Checking for triangle quality." << endl;
+    }
+
+    bool hasError = false;
+
+    forAll(*this, surfI)
+    {
+        if (isA<triSurface>(operator[](surfI)))
+        {
+            const triSurface& s = dynamic_cast<const triSurface&>
+            (
+                operator[](surfI)
+            );
+
+            label nBadTris = 0;
+            forAll(s, faceI)
+            {
+                const labelledTri& f = s[faceI];
+
+                scalar q = triPointRef
+                (
+                    s.points()[f[0]],
+                    s.points()[f[1]],
+                    s.points()[f[2]]
+                ).quality();
+
+                if (q < minQuality)
+                {
+                    nBadTris++;
+                }
+            }
+
+            if (nBadTris > 0)
+            {
+                hasError = true;
+
+                if (report)
+                {
+                    Info<< "    " << names()[surfI]
+                        << " : has " << nBadTris << " bad quality triangles "
+                        << " (quality < " << minQuality << ")" << endl;
+                }
+            }
+        }
+    }
+
+    if (report)
+    {
+        Info<< endl;
+    }
+
+    return returnReduce(hasError, orOp<bool>());
+
+}
+
+
+// Check all surfaces. Return number of failures.
+Foam::label Foam::searchableSurfaces::checkTopology
+(
+    const bool report
+) const
+{
+    label noFailedChecks = 0;
+
+    if (checkClosed(report))
+    {
+        noFailedChecks++;
+    }
+
+    if (checkNormalOrientation(report))
+    {
+        noFailedChecks++;
+    }
+    return noFailedChecks;
+}
+
+
+Foam::label Foam::searchableSurfaces::checkGeometry
+(
+    const scalar maxRatio,
+    const scalar tol,
+    const autoPtr<writer<scalar> >& setWriter,
+    const scalar minQuality,
+    const bool report
+) const
+{
+    label noFailedChecks = 0;
+
+    if (maxRatio > 0 && checkSizes(maxRatio, report))
+    {
+        noFailedChecks++;
+    }
+
+    if (checkIntersection(tol, setWriter, report))
+    {
+        noFailedChecks++;
+    }
+
+    if (checkQuality(minQuality, report))
+    {
+        noFailedChecks++;
+    }
+
+    return noFailedChecks;
+}
+
+
+void Foam::searchableSurfaces::writeStats
+(
+    const List<wordList>& patchTypes,
+    Ostream& os
+) const
+{
+    Info<< "Statistics." << endl;
+    forAll(*this, surfI)
+    {
+        Info<< "    " << names()[surfI] << ':' << endl;
+
+        const searchableSurface& s = operator[](surfI);
+
+        Info<< "        type      : " << s.type() << nl
+            << "        size      : " << s.globalSize() << nl;
+        if (isA<triSurfaceMesh>(s))
+        {
+            const triSurfaceMesh& ts = dynamic_cast<const triSurfaceMesh&>(s);
+            Info<< "        edges     : " << ts.nEdges() << nl
+                << "        points    : " << ts.points().size() << nl;
+        }
+        Info<< "        bounds    : " << s.bounds() << nl
+            << "        closed    : " << Switch(s.hasVolumeType()) << endl;
+
+        if (patchTypes.size() && patchTypes[surfI].size() >= 1)
+        {
+            wordList unique(HashSet<word>(patchTypes[surfI]).sortedToc());
+            Info<< "        patches   : ";
+            forAll(unique, i)
+            {
+                Info<< unique[i];
+                if (i < unique.size()-1)
+                {
+                    Info<< ',';
+                }
+            }
+            Info<< endl;
+        }
+    }
+    Info<< endl;
+}
+
+
 // * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
 
 const Foam::searchableSurface& Foam::searchableSurfaces::operator[]
diff --git a/src/meshTools/searchableSurface/searchableSurfaces.H b/src/meshTools/searchableSurface/searchableSurfaces.H
index cc319679d4..107e343ef3 100644
--- a/src/meshTools/searchableSurface/searchableSurfaces.H
+++ b/src/meshTools/searchableSurface/searchableSurfaces.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,6 +37,7 @@ SourceFiles
 
 #include "searchableSurface.H"
 #include "labelPair.H"
+#include "writer.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,6 +45,7 @@ namespace Foam
 {
 
 // Forward declaration of classes
+class triSurface;
 
 /*---------------------------------------------------------------------------*\
                            Class searchableSurfaces Declaration
@@ -70,6 +72,15 @@ class searchableSurfaces
 
     // Private Member Functions
 
+        //- Is edge on face
+        static bool connected
+        (
+            const triSurface& s,
+            const label edgeI,
+            const pointIndexHit& hit
+        );
+
+
         //- Disallow default bitwise copy construct
         searchableSurfaces(const searchableSurfaces&);
 
@@ -189,6 +200,49 @@ public:
             ) const;
 
 
+        // Checking
+
+            //- Are all surfaces closed and manifold
+            bool checkClosed(const bool report) const;
+
+            //- Are all (triangulated) surfaces consistent normal orientation
+            bool checkNormalOrientation(const bool report) const;
+
+            //- Are all bounding boxes of similar size
+            bool checkSizes(const scalar maxRatio, const bool report) const;
+
+            //- Do surfaces self-intersect or intersect others
+            bool checkIntersection
+            (
+                const scalar tol,
+                const autoPtr<writer<scalar> >&,
+                const bool report
+            ) const;
+
+            //- Check triangle quality
+            bool checkQuality
+            (
+                const scalar minQuality,
+                const bool report
+            ) const;
+
+            //- All topological checks. Return number of failed checks
+            label checkTopology(const bool report) const;
+
+            //- All geometric checks. Return number of failed checks
+            label checkGeometry
+            (
+                const scalar maxRatio,
+                const scalar tolerance,
+                const autoPtr<writer<scalar> >& setWriter,
+                const scalar minQuality,
+                const bool report
+            ) const;
+
+            //- Write some stats
+            void writeStats(const List<wordList>&, Ostream&) const;
+
+
     // Member Operators
 
         //- Return const and non-const reference to searchableSurface by index.

From 14da496a0e740bfe5063ec5c78dad2d156caa8b8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 13 Nov 2012 13:57:14 +0000
Subject: [PATCH 46/81] ENH: setsToZones: allow -time options

---
 .../mesh/manipulation/setsToZones/Make/options     |  3 ++-
 .../mesh/manipulation/setsToZones/setsToZones.C    | 14 ++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/setsToZones/Make/options b/applications/utilities/mesh/manipulation/setsToZones/Make/options
index 54c035b8f5..ec38e1cbdb 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/Make/options
+++ b/applications/utilities/mesh/manipulation/setsToZones/Make/options
@@ -2,4 +2,5 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lmeshTools
+    -lmeshTools \
+    -lsampling
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index 2f56bb5693..c3d3d6297a 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,6 +48,7 @@ Description
 #include "IFstream.H"
 #include "IOobjectList.H"
 #include "SortableList.H"
+#include "timeSelector.H"
 
 using namespace Foam;
 
@@ -57,6 +58,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    timeSelector::addOptions(true, false);
     argList::addNote
     (
         "add point/face/cell Zones from similar named point/face/cell Sets"
@@ -76,15 +78,7 @@ int main(int argc, char *argv[])
     const bool noFlipMap = args.optionFound("noFlipMap");
 
     // Get times list
-    instantList Times = runTime.times();
-
-    label startTime = Times.size()-1;
-    label endTime = Times.size();
-
-    // check -time and -latestTime options
-    #include "checkTimeOption.H"
-
-    runTime.setTime(Times[startTime], startTime);
+    (void)timeSelector::selectIfPresent(runTime, args);
 
     #include "createNamedPolyMesh.H"
 

From 4bdfee665d0ef92b042bad5a882be3d154bad366 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 13 Nov 2012 16:04:41 +0000
Subject: [PATCH 47/81] BUG: #680: star4ToFoam truncates boundaries

---
 src/conversion/meshReader/createPolyBoundary.C | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/conversion/meshReader/createPolyBoundary.C b/src/conversion/meshReader/createPolyBoundary.C
index e0c898156a..47fb2008f7 100644
--- a/src/conversion/meshReader/createPolyBoundary.C
+++ b/src/conversion/meshReader/createPolyBoundary.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -303,14 +303,12 @@ void Foam::meshReader::createPolyBoundary()
 
     Info<< "Added " << nMissingFaces << " unmatched faces" << endl;
 
+    // Add missing faces to last patch ('Default_Empty' etc.)
     if (nMissingFaces > 0)
     {
         patchSizes_.last() = nMissingFaces;
     }
-    else
-    {
-        patchStarts_.setSize(patchStarts_.size() - 1);
-    }
+
 
     // reset the size of the face list
     meshFaces_.setSize(nCreatedFaces);

From d0c0fb9da2ad9559306923539b23c75594b3ea42 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 14 Nov 2012 09:30:59 +0000
Subject: [PATCH 48/81] ENH: combinePatchFaces: have -meshQuality option

---
 .../advanced/combinePatchFaces/Make/options   |   1 +
 .../combinePatchFaces/combinePatchFaces.C     | 130 +++++-------------
 2 files changed, 35 insertions(+), 96 deletions(-)

diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
index 7d4e1304f0..4f26f666de 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
@@ -5,4 +5,5 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lmeshTools \
+    -lsampling \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index 877579fa5f..8c8be624f0 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,105 +53,19 @@ Description
 #include "polyMesh.H"
 #include "mapPolyMesh.H"
 #include "unitConversion.H"
+#include "motionSmoother.H"
 
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-// Same check as snapMesh
-void checkSnapMesh
-(
-    const Time& runTime,
-    const polyMesh& mesh,
-    labelHashSet& wrongFaces
-)
-{
-    IOdictionary snapDict
-    (
-        IOobject
-        (
-            "snapMeshDict",
-            runTime.system(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-
-    // Max nonorthogonality allowed
-    scalar maxNonOrtho(readScalar(snapDict.lookup("maxNonOrtho")));
-    // Max concaveness allowed.
-    scalar maxConcave(readScalar(snapDict.lookup("maxConcave")));
-    // Min volume allowed (factor of minimum cellVolume)
-    scalar relMinVol(readScalar(snapDict.lookup("minVol")));
-    const scalar minCellVol = min(mesh.cellVolumes());
-    const scalar minPyrVol = relMinVol*minCellVol;
-    // Min area
-    scalar minArea(readScalar(snapDict.lookup("minArea")));
-
-    if (maxNonOrtho < 180.0-SMALL)
-    {
-        Pout<< "Checking non orthogonality" << endl;
-
-        label nOldSize = wrongFaces.size();
-        mesh.setNonOrthThreshold(maxNonOrtho);
-        mesh.checkFaceOrthogonality(false, &wrongFaces);
-
-        Pout<< "Detected " << wrongFaces.size() - nOldSize
-            << " faces with non-orthogonality > " << maxNonOrtho << " degrees"
-            << endl;
-    }
-
-    if (minPyrVol > -GREAT)
-    {
-        Pout<< "Checking face pyramids" << endl;
-
-        label nOldSize = wrongFaces.size();
-        mesh.checkFacePyramids(false, minPyrVol, &wrongFaces);
-        Pout<< "Detected additional " << wrongFaces.size() - nOldSize
-            << " faces with illegal face pyramids" << endl;
-    }
-
-    if (maxConcave < 180.0-SMALL)
-    {
-        Pout<< "Checking face angles" << endl;
-
-        label nOldSize = wrongFaces.size();
-        mesh.checkFaceAngles(false, maxConcave, &wrongFaces);
-        Pout<< "Detected additional " << wrongFaces.size() - nOldSize
-            << " faces with concavity > " << maxConcave << " degrees"
-            << endl;
-    }
-
-    if (minArea > -SMALL)
-    {
-        Pout<< "Checking face areas" << endl;
-
-        label nOldSize = wrongFaces.size();
-
-        const scalarField magFaceAreas(mag(mesh.faceAreas()));
-
-        forAll(magFaceAreas, faceI)
-        {
-            if (magFaceAreas[faceI] < minArea)
-            {
-                wrongFaces.insert(faceI);
-            }
-        }
-        Pout<< "Detected additional " << wrongFaces.size() - nOldSize
-            << " faces with area < " << minArea << " m^2" << endl;
-    }
-}
-
-
 // Merge faces on the same patch (usually from exposing refinement)
 // Can undo merges if these cause problems.
 label mergePatchFaces
 (
     const scalar minCos,
     const scalar concaveSin,
-    const bool snapMeshDict,
+    const autoPtr<IOdictionary>& qualDictPtr,
     const Time& runTime,
     polyMesh& mesh
 )
@@ -212,9 +126,9 @@ label mergePatchFaces
         // Faces in error.
         labelHashSet errorFaces;
 
-        if (snapMeshDict)
+        if (qualDictPtr.valid())
         {
-            checkSnapMesh(runTime, mesh, errorFaces);
+            motionSmoother::checkMesh(false, mesh, qualDictPtr(), errorFaces);
         }
         else
         {
@@ -437,8 +351,8 @@ int main(int argc, char *argv[])
     );
     argList::addBoolOption
     (
-        "snapMesh",
-        "use system/snapMeshDict"
+        "meshQuality",
+        "read user-defined mesh quality criterions from system/meshQualityDict"
     );
 
 #   include "setRootCase.H"
@@ -455,8 +369,8 @@ int main(int argc, char *argv[])
     scalar concaveAngle = args.optionLookupOrDefault("concaveAngle", 30.0);
     scalar concaveSin = Foam::sin(degToRad(concaveAngle));
 
-    const bool snapMeshDict = args.optionFound("snapMesh");
     const bool overwrite = args.optionFound("overwrite");
+    const bool meshQuality = args.optionFound("meshQuality");
 
     Info<< "Merging all faces of a cell" << nl
         << "    - which are on the same patch" << nl
@@ -468,23 +382,47 @@ int main(int argc, char *argv[])
         << "      (sin:" << concaveSin << ')' << nl
         << endl;
 
+    autoPtr<IOdictionary> qualDict;
+    if (meshQuality)
+    {
+        Info<< "Enabling user-defined geometry checks." << nl << endl;
+
+        qualDict.reset
+        (
+            new IOdictionary
+            (
+                IOobject
+                (
+                    "meshQualityDict",
+                    mesh.time().system(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                )
+           )
+        );
+    }
+
+
     if (!overwrite)
     {
         runTime++;
     }
 
+
+
     // Merge faces on same patch
     label nChanged = mergePatchFaces
     (
         minCos,
         concaveSin,
-        snapMeshDict,
+        qualDict,
         runTime,
         mesh
     );
 
     // Merge points on straight edges and remove unused points
-    if (snapMeshDict)
+    if (qualDict.valid())
     {
         Info<< "Merging all 'loose' points on surface edges, "
             << "regardless of the angle they make." << endl;

From eeac186f9f3b10f138f445fb38bbbf6f4ffd80cb Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 14 Nov 2012 11:24:21 +0000
Subject: [PATCH 49/81] BUG: paraFoam: pointFields not on faceZones

---
 .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H     |  7 --
 .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C |  3 +-
 .../vtkPV3Foam/vtkPV3FoamMeshZone.C           | 74 +------------------
 .../vtkPV3Foam/vtkPV3FoamPointFields.H        | 38 +++++++++-
 4 files changed, 40 insertions(+), 82 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index 397dc7ecc2..363f09d7f3 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -446,13 +446,6 @@ class vtkPV3Foam
             template<class PatchType>
             vtkPolyData* patchVTKMesh(const word& name, const PatchType&);
 
-            //- Add face zone mesh
-            vtkPolyData* faceZoneVTKMesh
-            (
-                const fvMesh&,
-                const labelList& faceLabels
-            );
-
             //- Add point zone
             vtkPolyData* pointZoneVTKMesh
             (
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C
index b229da9479..b80acb4949 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C
@@ -450,7 +450,8 @@ void Foam::vtkPV3Foam::convertMeshFaceZones
                 << zoneName << endl;
         }
 
-        vtkPolyData* vtkmesh = faceZoneVTKMesh(mesh, zMesh[zoneId]);
+        vtkPolyData* vtkmesh = patchVTKMesh(zoneName, zMesh[zoneId]());
+
         if (vtkmesh)
         {
             AddToBlock(output, vtkmesh, range, datasetNo, zoneName);
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
index 28a1fd4c5f..bfa3e1acc9 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,78 +35,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh
-(
-    const fvMesh& mesh,
-    const labelList& faceLabels
-)
-{
-    vtkPolyData* vtkmesh = vtkPolyData::New();
-
-    if (debug)
-    {
-        Info<< "<beg> Foam::vtkPV3Foam::faceZoneVTKMesh" << endl;
-        printMemory();
-    }
-
-    // Construct primitivePatch of faces in faceZone
-
-    const faceList& meshFaces = mesh.faces();
-    faceList patchFaces(faceLabels.size());
-    forAll(faceLabels, faceI)
-    {
-        patchFaces[faceI] = meshFaces[faceLabels[faceI]];
-    }
-    primitiveFacePatch p(patchFaces, mesh.points());
-
-
-    // The balance of this routine should be identical to patchVTKMesh
-
-    // Convert OpenFOAM mesh vertices to VTK
-    const pointField& points = p.localPoints();
-
-    vtkPoints* vtkpoints = vtkPoints::New();
-    vtkpoints->Allocate(points.size());
-    forAll(points, i)
-    {
-        vtkInsertNextOpenFOAMPoint(vtkpoints, points[i]);
-    }
-
-    vtkmesh->SetPoints(vtkpoints);
-    vtkpoints->Delete();
-
-
-    // Add faces as polygons
-    const faceList& faces = p.localFaces();
-
-    vtkCellArray* vtkcells = vtkCellArray::New();
-    vtkcells->Allocate(faces.size());
-
-    forAll(faces, faceI)
-    {
-        const face& f = faces[faceI];
-        vtkIdType nodeIds[f.size()];
-
-        forAll(f, fp)
-        {
-            nodeIds[fp] = f[fp];
-        }
-        vtkcells->InsertNextCell(f.size(), nodeIds);
-    }
-
-    vtkmesh->SetPolys(vtkcells);
-    vtkcells->Delete();
-
-    if (debug)
-    {
-        Info<< "<end> Foam::vtkPV3Foam::faceZoneVTKMesh" << endl;
-        printMemory();
-    }
-
-    return vtkmesh;
-}
-
-
 vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
 (
     const fvMesh& mesh,
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H
index 78582fe7e3..e74937cd2f 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,6 +129,42 @@ void Foam::vtkPV3Foam::convertPointFields
                 datasetNo
             );
         }
+
+        //
+        // Convert faceZones - if activated
+        //
+        for
+        (
+            int partId = arrayRangeFaceZones_.start();
+            partId < arrayRangeFaceZones_.end();
+            ++partId
+        )
+        {
+            const word zoneName = getPartName(partId);
+            const label datasetNo = partDataset_[partId];
+            const label zoneId = mesh.faceZones().findZoneID(zoneName);
+
+            if (!partStatus_[partId] || datasetNo < 0 || zoneId < 0)
+            {
+                continue;
+            }
+
+            // Extract the field on the zone
+            Field<Type> fld
+            (
+                ptf.internalField(),
+                mesh.faceZones()[zoneId]().meshPoints()
+            );
+
+            convertPatchPointField
+            (
+                fieldName,
+                fld,
+                output,
+                arrayRangeFaceZones_,
+                datasetNo
+            );
+        }
     }
 }
 

From 1bf00a47b8432fd62d04bc771c8905a3fcb2e587 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Nov 2012 15:20:53 +0000
Subject: [PATCH 50/81] ENH: Added new particle collector cloud function object

---
 .../include/makeParcelCloudFunctionObjects.H  |   4 +-
 .../ParticleCollector/ParticleCollector.C     | 668 ++++++++++++++++++
 .../ParticleCollector/ParticleCollector.H     | 252 +++++++
 .../ParticleCollector/ParticleCollectorI.H    |  34 +
 4 files changed, 957 insertions(+), 1 deletion(-)
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
 create mode 100644 src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollectorI.H

diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
index 9e19beae34..783878f480 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "FacePostProcessing.H"
+#include "ParticleCollector.H"
 #include "ParticleErosion.H"
 #include "ParticleTracks.H"
 #include "ParticleTrap.H"
@@ -42,6 +43,7 @@ License
     makeCloudFunctionObject(CloudType);                                       \
                                                                               \
     makeCloudFunctionObjectType(FacePostProcessing, CloudType);               \
+    makeCloudFunctionObjectType(ParticleCollector, CloudType);                \
     makeCloudFunctionObjectType(ParticleErosion, CloudType);                  \
     makeCloudFunctionObjectType(ParticleTracks, CloudType);                   \
     makeCloudFunctionObjectType(ParticleTrap, CloudType);                     \
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
new file mode 100644
index 0000000000..de22b5a044
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -0,0 +1,668 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "ParticleCollector.H"
+#include "Pstream.H"
+#include "surfaceWriter.H"
+#include "unitConversion.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::ParticleCollector<CloudType>::makeLogFile
+(
+    const faceList& faces,
+    const Field<point>& points,
+    const Field<scalar>& area
+)
+{
+    // Create the output file if not already created
+    if (log_)
+    {
+        if (debug)
+        {
+            Info<< "Creating output file" << endl;
+        }
+
+        if (Pstream::master())
+        {
+            const fileName logDir = outputDir_/this->owner().time().timeName();
+
+            // Create directory if does not exist
+            mkDir(logDir);
+
+            // Open new file at start up
+            outputFilePtr_.reset
+            (
+                new OFstream(logDir/(type() + ".dat"))
+            );
+
+            outputFilePtr_()
+                << "# Source     : " << type() << nl
+                << "# Total area : " << sum(area) << nl
+                << "# Time";
+
+            forAll(faces, i)
+            {
+                word id = Foam::name(i);
+
+                outputFilePtr_()
+                    << tab << "area[" << id << "]"
+                    << tab << "mass[" << id << "]"
+                    << tab << "massFlowRate[" << id << "]"
+                    << endl;
+            }
+        }
+    }
+}
+
+
+template<class CloudType>
+void Foam::ParticleCollector<CloudType>::initPolygons()
+{
+    mode_ = mtPolygon;
+
+    List<Field<point> > polygons(this->coeffDict().lookup("polygons"));
+    label nPoints = 0;
+    forAll(polygons, polyI)
+    {
+        label np = polygons[polyI].size();
+        if (np < 3)
+        {
+            FatalIOErrorIn
+            (
+                "Foam::ParticleCollector<CloudType>::initPolygons()",
+                this->coeffDict()
+            )
+                << "polygons must consist of at least 3 points"
+                << exit(FatalIOError);
+        }
+
+        nPoints += np;
+    }
+
+    label pointOffset = 0;
+    points_.setSize(nPoints);
+    faces_.setSize(polygons.size());
+    faceTris_.setSize(polygons.size());
+    area_.setSize(polygons.size());
+    forAll(faces_, faceI)
+    {
+        const Field<point>& polyPoints = polygons[faceI];
+        face f(identity(polyPoints.size()) + pointOffset);
+        UIndirectList<point>(points_, f) = polyPoints;
+        area_[faceI] = f.mag(points_);
+
+        DynamicList<face> tris;
+        f.triangles(points_, tris);
+        faceTris_[faceI].transfer(tris);
+
+        faces_[faceI].transfer(f);
+
+        pointOffset += polyPoints.size();
+    }
+}
+
+
+template<class CloudType>
+void Foam::ParticleCollector<CloudType>::initConcentricCircles()
+{
+    mode_ = mtConcentricCircle;
+
+    vector origin(this->coeffDict().lookup("origin"));
+
+    radius_ = this->coeffDict().lookup("radius");
+    nSector_ = readLabel(this->coeffDict().lookup("nSector"));
+ 
+    label nS = nSector_;
+
+    vector refDir;
+    if (nSector_ > 1)
+    {
+        refDir = this->coeffDict().lookup("refDir");
+        refDir -= normal_*(normal_ & refDir);
+        refDir /= mag(refDir);
+    }
+    else
+    {
+        // set 4 quadrants for single sector cases
+        nS = 4;
+
+        vector tangent = vector::zero;
+        scalar magTangent = 0.0;
+
+        Random rnd(1234);
+        while (magTangent < SMALL)
+        {
+            vector v = rnd.vector01();
+
+            tangent = v - (v & normal_)*normal_;
+            magTangent = mag(tangent);
+        }
+
+        refDir = tangent/magTangent;
+    }
+
+    scalar dTheta = 5.0;
+    scalar dThetaSector = 360.0/scalar(nS);
+    label intervalPerSector = max(1, ceil(dThetaSector/dTheta));
+    dTheta = dThetaSector/scalar(intervalPerSector);
+
+    label nPointPerSector = intervalPerSector + 1;
+
+    label nPointPerRadius = nS*(nPointPerSector - 1);
+    label nPoint = radius_.size()*nPointPerRadius;
+    label nFace = radius_.size()*nS;
+
+    // add origin
+    nPoint++;
+
+    points_.setSize(nPoint);
+    faces_.setSize(nFace);
+    area_.setSize(nFace);
+
+    coordSys_ = cylindricalCS("coordSys", origin, normal_, refDir, false);
+
+    List<label> ptIDs(identity(nPointPerRadius));
+
+    points_[0] = origin;
+
+    // points
+    forAll(radius_, radI)
+    {
+        label pointOffset = radI*nPointPerRadius + 1;
+
+        for (label i = 0; i < nPointPerRadius; i++)
+        {
+            label pI = i + pointOffset;
+            point pCyl(radius_[radI], degToRad(i*dTheta), 0.0);
+            points_[pI] = coordSys_.globalPosition(pCyl);
+        }
+    }
+
+    // faces
+    DynamicList<label> facePts(2*nPointPerSector);
+    forAll(radius_, radI)
+    {
+        if (radI == 0)
+        {
+            for (label secI = 0; secI < nS; secI++)
+            {
+                facePts.clear();
+
+                // append origin point
+                facePts.append(0);
+
+                for (label ptI = 0; ptI < nPointPerSector; ptI++)
+                {
+                    label i = ptI + secI*(nPointPerSector - 1);
+                    label id = ptIDs.fcIndex(i - 1) + 1;
+                    facePts.append(id);
+                }
+
+                label faceI = secI + radI*nS;
+
+                faces_[faceI] = face(facePts);
+                area_[faceI] = faces_[faceI].mag(points_);
+            }
+        }
+        else
+        {
+            for (label secI = 0; secI < nS; secI++)
+            {
+                facePts.clear();
+
+                label offset = (radI - 1)*nPointPerRadius + 1;
+
+                for (label ptI = 0; ptI < nPointPerSector; ptI++)
+                {
+                    label i = ptI + secI*(nPointPerSector - 1);
+                    label id = offset + ptIDs.fcIndex(i - 1);
+                    facePts.append(id);
+                }
+                for (label ptI = nPointPerSector-1; ptI >= 0; ptI--)
+                {
+                    label i = ptI + secI*(nPointPerSector - 1);
+                    label id = offset + nPointPerRadius + ptIDs.fcIndex(i - 1);
+                    facePts.append(id);
+                }
+
+                label faceI = secI + radI*nS;
+
+                faces_[faceI] = face(facePts);
+                area_[faceI] = faces_[faceI].mag(points_);
+            }
+        }
+    }
+}
+
+
+template<class CloudType>
+Foam::label Foam::ParticleCollector<CloudType>::collectParcelPolygon
+(
+    const point& position,
+    const vector& U
+) const
+{
+    scalar dt = this->owner().db().time().deltaTValue();
+
+    point end(position + dt*U);
+
+    label dummyNearType = -1;
+    label dummyNearLabel = -1;
+
+    forAll(faces_, faceI)
+    {
+        const label facePoint0 = faces_[faceI][0];
+
+        const point p0 = points_[facePoint0];
+
+        const scalar d1 = normal_ & (position - p0);
+        const scalar d2 = normal_ & (end - p0);
+
+        if (sign(d1) == sign(d2))
+        {
+            // did not cross polygon plane
+            continue;
+        }
+
+        // intersection point
+        point pIntersect = position + (d1/(d1 - d2))*dt*U;
+
+        const List<face>& tris = faceTris_[faceI];
+
+        // identify if point is within poly bounds
+        forAll(tris, triI)
+        {
+            const face& tri = tris[triI];
+            triPointRef t
+            (
+                points_[tri[0]],
+                points_[tri[1]],
+                points_[tri[2]]
+            );
+
+            if (t.classify(pIntersect, dummyNearType, dummyNearLabel))
+            {
+                return faceI;
+            }
+        }
+    }
+
+    return -1;
+}
+
+
+template<class CloudType>
+Foam::label Foam::ParticleCollector<CloudType>::collectParcelConcentricCircles
+(
+    const point& position,
+    const vector& U
+) const
+{
+    label secI = -1;
+
+    scalar dt = this->owner().db().time().deltaTValue();
+
+    point end(position + dt*U);
+
+    const scalar d1 = normal_ & (position - coordSys_.origin());
+    const scalar d2 = normal_ & (end - coordSys_.origin());
+
+    if (sign(d1) == sign(d2))
+    {
+        // did not cross plane
+        return secI;
+    }
+
+    // intersection point in cylindrical co-ordinate system
+    point pCyl = coordSys_.localPosition(position + (d1/(d1 - d2))*dt*U);
+
+    scalar r = pCyl[0];
+
+    if (r < radius_.last())
+    {
+        label radI = 0;
+        while (r > radius_[radI])
+        {
+            radI++;
+        }
+
+        if (nSector_ == 1)
+        {
+            secI = 4*radI;
+        }
+        else
+        {
+            scalar theta = pCyl[1] + constant::mathematical::pi;
+
+            secI =
+                nSector_*radI
+              + floor
+                (
+                    scalar(nSector_)*theta/constant::mathematical::twoPi
+                );
+        }
+    }
+
+    return secI;
+}
+
+
+template<class CloudType>
+void Foam::ParticleCollector<CloudType>::write()
+{
+    const fvMesh& mesh = this->owner().mesh();
+    const Time& time = mesh.time();
+    scalar timeNew = time.value();
+    scalar timeElapsed = timeNew - timeOld_;
+
+    totalTime_ += timeElapsed;
+
+    const scalar alpha = (totalTime_ - timeElapsed)/totalTime_;
+    const scalar beta = timeElapsed/totalTime_;
+
+    forAll(faces_, faceI)
+    {
+        massFlowRate_[faceI] =
+            alpha*massFlowRate_[faceI] + beta*mass_[faceI]/timeElapsed;
+        massTotal_[faceI] += mass_[faceI];
+    }
+
+    const label procI = Pstream::myProcNo();
+
+    Info<< type() << " output:" << nl;
+
+    if (outputFilePtr_.valid())
+    {
+        outputFilePtr_() << time.timeName();
+    }
+
+
+    Field<scalar> faceMassTotal(mass_.size());
+    Field<scalar> faceMassFlowRate(massFlowRate_.size());
+    
+    forAll(faces_, faceI)
+    {
+        scalarList allProcMass(Pstream::nProcs());
+        allProcMass[procI] = massTotal_[faceI];
+        Pstream::gatherList(allProcMass);
+        faceMassTotal[faceI] = sum(allProcMass);
+
+        scalarList allProcMassFlowRate(Pstream::nProcs());
+        allProcMassFlowRate[procI] = massFlowRate_[faceI];
+        Pstream::gatherList(allProcMassFlowRate);
+        faceMassFlowRate[faceI] = sum(allProcMassFlowRate);
+
+        Info<< "    face " << faceI
+            << ": total mass = " << faceMassTotal[faceI]
+            << "; average mass flow rate = " << faceMassFlowRate[faceI]
+            << nl;
+
+        if (outputFilePtr_.valid())
+        {
+            outputFilePtr_()
+                << tab << area_[faceI]
+                << tab << faceMassTotal[faceI]
+                << tab << faceMassFlowRate[faceI]
+                << endl;
+        }
+    }
+
+    Info<< endl;
+
+
+    if (surfaceFormat_ != "none")
+    {
+        if (Pstream::master())
+        {
+            autoPtr<surfaceWriter> writer(surfaceWriter::New(surfaceFormat_));
+
+            writer->write
+            (
+                outputDir_/time.timeName(),
+                "collector",
+                points_,
+                faces_,
+                "massTotal",
+                faceMassTotal,
+                false
+            );
+
+            writer->write
+            (
+                outputDir_/time.timeName(),
+                "collector",
+                points_,
+                faces_,
+                "massFlowRate",
+                faceMassFlowRate,
+                false
+            );
+        }
+    }
+
+
+    if (resetOnWrite_)
+    {
+        forAll(faces_, faceI)
+        {
+            massFlowRate_[faceI] = 0.0;
+        }
+        timeOld_ = timeNew;
+        totalTime_ = 0.0;
+    }
+
+    forAll(faces_, faceI)
+    {
+        mass_[faceI] = 0.0;
+    }
+
+    // writeProperties();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ParticleCollector<CloudType>::ParticleCollector
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    CloudFunctionObject<CloudType>(dict, owner, typeName),
+    mode_(mtUnknown),
+    parcelType_(this->coeffDict().lookupOrDefault("parcelType", -1)),
+    points_(),
+    faces_(),
+    faceTris_(),
+    nSector_(0),
+    radius_(),
+    coordSys_(false),
+    normal_(this->coeffDict().lookup("normal")),
+    negateParcelsOppositeNormal_
+    (
+        readBool(this->coeffDict().lookup("negateParcelsOppositeNormal"))
+    ),
+    surfaceFormat_(this->coeffDict().lookup("surfaceFormat")),
+    resetOnWrite_(this->coeffDict().lookup("resetOnWrite")),
+    totalTime_(0.0),
+    mass_(),
+    massTotal_(),
+    massFlowRate_(),
+    log_(this->coeffDict().lookup("log")),
+    outputFilePtr_(),
+    outputDir_(owner.mesh().time().path()),
+    timeOld_(owner.mesh().time().value())
+{
+    if (Pstream::parRun())
+    {
+        // Put in undecomposed case (Note: gives problems for
+        // distributed data running)
+        outputDir_ =
+            outputDir_/".."/"postProcessing"/cloud::prefix/owner.name();
+    }
+    else
+    {
+        outputDir_ =
+            outputDir_/"postProcessing"/cloud::prefix/owner.name();
+    }
+
+    normal_ /= mag(normal_);
+
+    word mode(this->coeffDict().lookup("mode"));
+    if (mode == "polygon")
+    {
+        initPolygons();
+    }
+    else if (mode == "concentricCircle")
+    {
+        initConcentricCircles();
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "Foam::ParticleCollector<CloudType>::ParticleCollector"
+            "("
+                "const dictionary& dict,"
+                "CloudType& owner"
+            ")"
+        )
+            << "Unknown mode " << mode << ".  Available options are "
+            << "polygon and concentricCircle" << exit(FatalError);
+    }
+
+    mass_.setSize(faces_.size(), 0.0);
+    massTotal_.setSize(faces_.size(), 0.0);
+    massFlowRate_.setSize(faces_.size(), 0.0);
+
+    makeLogFile(faces_, points_, area_);
+
+    // readProperties(); AND initialise mass... fields
+}
+
+
+template<class CloudType>
+Foam::ParticleCollector<CloudType>::ParticleCollector
+(
+    const ParticleCollector<CloudType>& pc
+)
+:
+    CloudFunctionObject<CloudType>(pc),
+    parcelType_(pc.parcelType_),
+    points_(pc.points_),
+    faces_(pc.faces_),
+    faceTris_(pc.faceTris_),
+    normal_(pc.normal_),
+    negateParcelsOppositeNormal_(pc.negateParcelsOppositeNormal_),
+    surfaceFormat_(pc.surfaceFormat_),
+    resetOnWrite_(pc.resetOnWrite_),
+    totalTime_(pc.totalTime_),
+    mass_(pc.mass_),
+    massTotal_(pc.massTotal_),
+    massFlowRate_(pc.massFlowRate_),
+    log_(pc.log_),
+    outputFilePtr_(),
+    outputDir_(pc.outputDir_),
+    timeOld_(0.0)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ParticleCollector<CloudType>::~ParticleCollector()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::ParticleCollector<CloudType>::postMove
+(
+    const parcelType& p,
+    const label cellI,
+    const scalar dt
+//    bool& keepParticle
+)
+{
+    if ((parcelType_ != -1) && (parcelType_ != p.typeId()))
+    {
+        return;
+    }
+
+    label faceI = -1;
+
+    switch (mode_)
+    {
+        case mtPolygon:
+        {
+            faceI = collectParcelPolygon(p.position(), p.U());
+            break;
+        }
+        case mtConcentricCircle:
+        {
+            faceI = collectParcelConcentricCircles(p.position(), p.U());
+            break;
+        }
+        default:
+        {
+        }
+    }
+
+    if (faceI != -1)
+    {
+        scalar m = p.nParticle()*p.mass();
+
+        if (negateParcelsOppositeNormal_)
+        {
+            vector Uhat = p.U();
+            Uhat /= mag(Uhat) + ROOTVSMALL;
+            if ((Uhat & normal_) < 0)
+            {
+                m *= -1.0;
+            }
+        }
+
+        // add mass contribution
+        mass_[faceI] += m;
+
+        if (nSector_ == 1)
+        {
+            mass_[faceI + 1] += m;
+            mass_[faceI + 2] += m;
+            mass_[faceI + 3] += m;
+        }
+
+        // remove particle
+//      keepParticle = false;
+
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
new file mode 100644
index 0000000000..dd166ba492
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
@@ -0,0 +1,252 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::ParticleCollector
+
+Description
+    Function object to collect the parcel mass- and mass flow rate over a
+    set of polygons.  The polygons are defined as lists of points.  If a
+    parcel is 'collected', it is subsequently flagged to be removed from the
+    domain.
+
+SourceFiles
+    ParticleCollector.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ParticleCollector_H
+#define ParticleCollector_H
+
+#include "CloudFunctionObject.H"
+#include "cylindricalCS.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class ParticleCollector Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class ParticleCollector
+:
+    public CloudFunctionObject<CloudType>
+{
+public:
+
+    enum modeType
+    {
+        mtPolygon,
+        mtConcentricCircle,
+        mtUnknown
+    };
+
+
+private:
+
+    // Private Data
+
+        // Typedefs
+
+            //- Convenience typedef for parcel type
+            typedef typename CloudType::parcelType parcelType;
+
+        //- Collector mode type
+        modeType mode_;
+
+        //- Index of parcel types to collect (-1 by default = all particles)
+        const label parcelType_;
+
+        //- List of points
+        Field<point> points_;
+
+        //- List of faces
+        List<face> faces_;
+
+
+        // Polygon collector
+
+            //- Triangulation of faces
+            List<List<face> > faceTris_;
+
+        // Concentric circles collector
+
+            //- Number of sectors per circle
+            label nSector_;
+
+            //- List of radii
+            List<scalar> radius_;
+
+            //- Cylindrical co-ordinate system
+            cylindricalCS coordSys_;
+
+
+        //- Face areas
+        Field<scalar> area_;
+
+        //- Polygon normal vector
+        vector normal_;
+
+        //- Remove mass of parcel travelling in opposite direction to normal_
+        bool negateParcelsOppositeNormal_;
+
+        //- Surface output format
+        const word surfaceFormat_;
+
+        //- Flag to indicate whether data should be reset/cleared on writing
+        Switch resetOnWrite_;
+
+        //- Total time
+        scalar totalTime_;
+
+        //- Mass storage
+        List<scalar> mass_;
+
+        //- Mass total storage
+        List<scalar> massTotal_;
+
+        //- Mass flow rate storage
+        List<scalar> massFlowRate_;
+
+        //- Flag to indicate whether data should be written to file
+        Switch log_;
+
+        //- Output file pointer
+        autoPtr<OFstream> outputFilePtr_;
+
+        //- Output directory
+        fileName outputDir_;
+
+        //- Last calculation time
+        scalar timeOld_;
+
+
+    // Private Member Functions
+
+        //- Helper function to create log files
+        void makeLogFile
+        (
+            const faceList& faces,
+            const Field<point>& points,
+            const Field<scalar>& area
+        );
+
+        //- Initialise polygon collectors
+        void initPolygons();
+
+        //- Initialise concentric circle collectors
+        void initConcentricCircles();
+
+        //- Collect parcels in polygon collectors
+        label collectParcelPolygon
+        (
+            const point& position,  
+            const vector& U
+        ) const;
+
+        //- Collect parcels in concentric circle collectors
+        label collectParcelConcentricCircles
+        (
+            const point& position,  
+            const vector& U
+        ) const;
+
+
+protected:
+
+    // Protected Member Functions
+
+        //- Write post-processing info
+        void write();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("particleCollector");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        ParticleCollector(const dictionary& dict, CloudType& owner);
+
+        //- Construct copy
+        ParticleCollector(const ParticleCollector<CloudType>& pc);
+
+        //- Construct and return a clone
+        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        {
+            return autoPtr<CloudFunctionObject<CloudType> >
+            (
+                new ParticleCollector<CloudType>(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~ParticleCollector();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to the reset on write flag
+            inline const Switch& resetOnWrite() const;
+
+
+        // Evaluation
+
+            //- Post-move hook
+            virtual void postMove
+            (
+                const parcelType& p,
+                const label cellI,
+                const scalar dt
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "ParticleCollectorI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ParticleCollector.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollectorI.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollectorI.H
new file mode 100644
index 0000000000..019deba51a
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollectorI.H
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+inline const Foam::Switch&
+Foam::ParticleCollector<CloudType>::resetOnWrite() const
+{
+    return resetOnWrite_;
+}
+
+
+// ************************************************************************* //

From 0c9c9ef91d5f506b4f660b0d13b76fe79507f9c7 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:43:12 +0000
Subject: [PATCH 51/81] bubbleFoam: Removed, replaced by twoPhaseEulerFoam

---
 .../solvers/multiphase/bubbleFoam/DDtU.H      |   11 -
 .../solvers/multiphase/bubbleFoam/Make/files  |    3 -
 .../multiphase/bubbleFoam/Make/options        |    6 -
 .../solvers/multiphase/bubbleFoam/UEqns.H     |   74 -
 .../solvers/multiphase/bubbleFoam/alphaEqn.H  |   61 -
 .../multiphase/bubbleFoam/bubbleFoam.C        |  110 -
 .../multiphase/bubbleFoam/createFields.H      |  195 --
 .../multiphase/bubbleFoam/createPhi1.H        |   67 -
 .../multiphase/bubbleFoam/createPhi2.H        |   67 -
 .../bubbleFoam/createRASTurbulence.H          |  178 --
 .../solvers/multiphase/bubbleFoam/kEpsilon.H  |   64 -
 .../multiphase/bubbleFoam/liftDragCoeffs.H    |   23 -
 .../solvers/multiphase/bubbleFoam/pEqn.H      |   94 -
 .../bubbleFoam/readBubbleFoamControls.H       |    4 -
 .../multiphase/bubbleFoam/wallDissipation.H   |   50 -
 .../multiphase/bubbleFoam/wallFunctions.H     |   81 -
 .../multiphase/bubbleFoam/wallViscosity.H     |   36 -
 .../solvers/multiphase/bubbleFoam/write.H     |   17 -
 .../bubbleFoam/bubbleColumn/0.org/U1          |   48 -
 .../bubbleFoam/bubbleColumn/0.org/U2          |   48 -
 .../bubbleFoam/bubbleColumn/0.org/alpha1      |   47 -
 .../bubbleFoam/bubbleColumn/0.org/epsilon     |   47 -
 .../bubbleFoam/bubbleColumn/0.org/k           |   47 -
 .../bubbleFoam/bubbleColumn/0.org/p           |   47 -
 .../multiphase/bubbleFoam/bubbleColumn/0/U1   | 1956 -----------------
 .../multiphase/bubbleFoam/bubbleColumn/0/U2   | 1956 -----------------
 .../bubbleFoam/bubbleColumn/0/alpha1          | 1926 ----------------
 .../bubbleFoam/bubbleColumn/0/epsilon         |   47 -
 .../multiphase/bubbleFoam/bubbleColumn/0/k    |   47 -
 .../multiphase/bubbleFoam/bubbleColumn/0/p    | 1926 ----------------
 .../bubbleColumn/constant/RASProperties       |   25 -
 .../bubbleFoam/bubbleColumn/constant/g        |   22 -
 .../constant/polyMesh/blockMeshDict           |   73 -
 .../bubbleColumn/constant/polyMesh/boundary   |   46 -
 .../bubbleColumn/constant/transportProperties |   37 -
 .../bubbleColumn/system/controlDict           |   49 -
 .../bubbleFoam/bubbleColumn/system/fvSchemes  |   65 -
 .../bubbleFoam/bubbleColumn/system/fvSolution |   62 -
 38 files changed, 9662 deletions(-)
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/DDtU.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/Make/files
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/Make/options
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/UEqns.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/alphaEqn.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/createFields.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/createPhi1.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/createPhi2.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/kEpsilon.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/pEqn.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/wallDissipation.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/wallFunctions.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/wallViscosity.H
 delete mode 100644 applications/solvers/multiphase/bubbleFoam/write.H
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U1
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U2
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha1
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0/U1
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0/U2
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha1
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution

diff --git a/applications/solvers/multiphase/bubbleFoam/DDtU.H b/applications/solvers/multiphase/bubbleFoam/DDtU.H
deleted file mode 100644
index 96b6a63a43..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/DDtU.H
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    DDtU1 =
-        fvc::ddt(U1)
-      + fvc::div(phi1, U1)
-      - fvc::div(phi1)*U1;
-
-    DDtU2 =
-        fvc::ddt(U2)
-      + fvc::div(phi2, U2)
-      - fvc::div(phi2)*U2;
-}
diff --git a/applications/solvers/multiphase/bubbleFoam/Make/files b/applications/solvers/multiphase/bubbleFoam/Make/files
deleted file mode 100644
index 1bc79aa226..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-bubbleFoam.C
-
-EXE = $(FOAM_APPBIN)/bubbleFoam
diff --git a/applications/solvers/multiphase/bubbleFoam/Make/options b/applications/solvers/multiphase/bubbleFoam/Make/options
deleted file mode 100644
index 39da2bd6db..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/Make/options
+++ /dev/null
@@ -1,6 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/applications/solvers/multiphase/bubbleFoam/UEqns.H b/applications/solvers/multiphase/bubbleFoam/UEqns.H
deleted file mode 100644
index 703f6b6d8d..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/UEqns.H
+++ /dev/null
@@ -1,74 +0,0 @@
-fvVectorMatrix U1Eqn(U1, U1.dimensions()*dimVol/dimTime);
-fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
-
-{
-    volTensorField Rc1(-nuEff1*(T(fvc::grad(U1))));
-    Rc1 = Rc1 + (2.0/3.0)*sqr(Ct)*I*k - (2.0/3.0)*I*tr(Rc1);
-
-    surfaceScalarField phiR1
-    (
-      - fvc::interpolate(nuEff1)
-       *mesh.magSf()*fvc::snGrad(alpha1)
-       /fvc::interpolate(alpha1 + scalar(0.001))
-    );
-
-    U1Eqn =
-    (
-        (scalar(1) + Cvm*rho2*alpha2/rho1)*
-        (
-            fvm::ddt(U1)
-          + fvm::div(phi1, U1, "div(phi1,U1)")
-          - fvm::Sp(fvc::div(phi1), U1)
-        )
-
-      - fvm::laplacian(nuEff1, U1)
-      + fvc::div(Rc1)
-
-      + fvm::div(phiR1, U1, "div(phi1,U1)")
-      - fvm::Sp(fvc::div(phiR1), U1)
-      + (fvc::grad(alpha1)/(fvc::average(alpha1) + scalar(0.001)) & Rc1)
-     ==
-    //  g                        // Buoyancy term transfered to p-equation
-      - fvm::Sp(alpha2/rho1*dragCoef, U1)
-    //+ alpha2/rho1*dragCoef*U2    // Explicit drag transfered to p-equation
-      - alpha2/rho1*(liftCoeff - Cvm*rho2*DDtU2)
-    );
-
-    U1Eqn.relax();
-
-
-    volTensorField Rc2(-nuEff2*T(fvc::grad(U2)));
-    Rc2 = Rc2 + (2.0/3.0)*I*k - (2.0/3.0)*I*tr(Rc2);
-
-    surfaceScalarField phiR2
-    (
-       - fvc::interpolate(nuEff2)
-        *mesh.magSf()*fvc::snGrad(alpha2)
-        /fvc::interpolate(alpha2 + scalar(0.001))
-    );
-
-    U2Eqn =
-    (
-        (scalar(1) + Cvm*rho2*alpha1/rho2)*
-        (
-            fvm::ddt(U2)
-          + fvm::div(phi2, U2, "div(phi2,U2)")
-          - fvm::Sp(fvc::div(phi2), U2)
-        )
-
-      - fvm::laplacian(nuEff2, U2)
-      + fvc::div(Rc2)
-
-      + fvm::div(phiR2, U2, "div(phi2,U2)")
-      - fvm::Sp(fvc::div(phiR2), U2)
-
-      + (fvc::grad(alpha2)/(fvc::average(alpha2) + scalar(0.001)) & Rc2)
-     ==
-    //  g                        // Buoyancy term transfered to p-equation
-      - fvm::Sp(alpha1/rho2*dragCoef, U2)
-    //+ alpha1/rho2*dragCoef*U1   // Explicit drag transfered to p-equation
-      + alpha1/rho2*(liftCoeff + Cvm*rho2*DDtU1)
-    );
-
-    U2Eqn.relax();
-}
diff --git a/applications/solvers/multiphase/bubbleFoam/alphaEqn.H b/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
deleted file mode 100644
index 0ecab03016..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    word scheme("div(phi,alpha1)");
-
-    surfaceScalarField phir(phi1 - phi2);
-
-    Info<< "Max Ur Courant Number = "
-        << (
-               max
-               (
-                   mesh.surfaceInterpolation::deltaCoeffs()*mag(phir)
-                  /mesh.magSf()
-                )*runTime.deltaT()
-            ).value()
-        << endl;
-
-    for (int acorr=0; acorr<nAlphaCorr; acorr++)
-    {
-        fvScalarMatrix alpha1Eqn
-        (
-             fvm::ddt(alpha1)
-           + fvm::div(phi, alpha1, scheme)
-           + fvm::div(-fvc::flux(-phir, alpha2, scheme), alpha1, scheme)
-        );
-        alpha1Eqn.relax();
-        alpha1Eqn.solve();
-
-        /*
-        fvScalarMatrix alpha2Eqn
-        (
-            fvm::ddt(alpha2)
-          + fvm::div(phi, alpha2, scheme)
-          + fvm::div
-            (
-                -fvc::flux(phir, scalar(1) - alpha2, scheme),
-                alpha2,
-                scheme
-            )
-        );
-        alpha2Eqn.relax();
-        alpha2Eqn.solve();
-
-        alpha1 =
-            0.5
-           *(
-                 scalar(1)
-               + sqr(scalar(1) - alpha2)
-               - sqr(scalar(1) - alpha1)
-            );
-        */
-
-        alpha2 = scalar(1) - alpha1;
-    }
-
-    Info<< "Dispersed phase volume fraction = "
-        << alpha1.weightedAverage(mesh.V()).value()
-        << "  Min(alpha1) = " << min(alpha1).value()
-        << "  Max(alpha1) = " << max(alpha1).value()
-        << endl;
-}
-
-rho = alpha1*rho1 + alpha2*rho2;
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
deleted file mode 100644
index 5374675510..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ /dev/null
@@ -1,110 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    bubbleFoam
-
-Description
-    Solver for a system of 2 incompressible fluid phases with one phase
-    dispersed, e.g. gas bubbles in a liquid.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "nearWallDist.H"
-#include "wallFvPatch.H"
-#include "Switch.H"
-
-#include "pimpleControl.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "setRootCase.H"
-
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "readGravitationalAcceleration.H"
-    #include "createFields.H"
-    #include "initContinuityErrs.H"
-    #include "readTimeControls.H"
-    #include "CourantNo.H"
-    #include "setInitialDeltaT.H"
-
-    pimpleControl pimple(mesh);
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-        #include "readBubbleFoamControls.H"
-        #include "CourantNo.H"
-        #include "setDeltaT.H"
-
-        runTime++;
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            #include "alphaEqn.H"
-            #include "liftDragCoeffs.H"
-            #include "UEqns.H"
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                #include "pEqn.H"
-
-                if (correctAlpha && !pimple.finalIter())
-                {
-                    #include "alphaEqn.H"
-                }
-            }
-
-            #include "DDtU.H"
-
-            if (pimple.turbCorr())
-            {
-                #include "kEpsilon.H"
-                nuEff1 = sqr(Ct)*nut2 + nu1;
-            }
-        }
-
-        #include "write.H"
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H
deleted file mode 100644
index 9c33ee23a1..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/createFields.H
+++ /dev/null
@@ -1,195 +0,0 @@
-    Info<< "Reading field alpha1\n" << endl;
-    volScalarField alpha1
-    (
-        IOobject
-        (
-            "alpha1",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    volScalarField alpha2
-    (
-        IOobject
-        (
-            "alpha2",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        scalar(1) - alpha1
-        //,alpha1.boundaryField().types()
-    );
-
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    Info<< "Reading field U1\n" << endl;
-    volVectorField U1
-    (
-        IOobject
-        (
-            "U1",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    Info<< "Reading field U2\n" << endl;
-    volVectorField U2
-    (
-        IOobject
-        (
-            "U2",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        alpha1*U1 + alpha2*U2
-    );
-
-
-    Info<< "Reading transportProperties\n" << endl;
-
-    IOdictionary transportProperties
-    (
-        IOobject
-        (
-            "transportProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar rho1
-    (
-        transportProperties.lookup("rho1")
-    );
-
-    dimensionedScalar rho2
-    (
-        transportProperties.lookup("rho2")
-    );
-
-    dimensionedScalar nu1
-    (
-        transportProperties.lookup("nu1")
-    );
-
-    dimensionedScalar nu2
-    (
-        transportProperties.lookup("nu2")
-    );
-
-    dimensionedScalar d1
-    (
-        transportProperties.lookup("d1")
-    );
-
-    dimensionedScalar d2
-    (
-        transportProperties.lookup("d2")
-    );
-
-    dimensionedScalar Cvm
-    (
-        transportProperties.lookup("Cvm")
-    );
-
-    dimensionedScalar Cl
-    (
-        transportProperties.lookup("Cl")
-    );
-
-    dimensionedScalar Ct
-    (
-        transportProperties.lookup("Ct")
-    );
-
-    #include "createPhi1.H"
-    #include "createPhi2.H"
-
-    surfaceScalarField phi
-    (
-        IOobject
-        (
-            "phi",
-            runTime.timeName(),
-            mesh
-        ),
-        fvc::interpolate(alpha1)*phi1
-      + fvc::interpolate(alpha2)*phi2
-    );
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh
-        ),
-        alpha1*rho1 + alpha2*rho2
-    );
-
-    #include "createRASTurbulence.H"
-
-    Info<< "Calculating field DDtU1 and DDtU2\n" << endl;
-
-    volVectorField DDtU1
-    (
-        fvc::ddt(U1)
-      + fvc::div(phi1, U1)
-      - fvc::div(phi1)*U1
-    );
-
-    volVectorField DDtU2
-    (
-        fvc::ddt(U2)
-      + fvc::div(phi2, U2)
-      - fvc::div(phi2)*U2
-    );
-
-
-    Info<< "Calculating field g.h\n" << endl;
-    volScalarField gh("gh", g & mesh.C());
-
-
-    label pRefCell = 0;
-    scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue);
diff --git a/applications/solvers/multiphase/bubbleFoam/createPhi1.H b/applications/solvers/multiphase/bubbleFoam/createPhi1.H
deleted file mode 100644
index 81bac77602..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/createPhi1.H
+++ /dev/null
@@ -1,67 +0,0 @@
-    IOobject phi1Header
-    (
-        "phi1",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ
-    );
-
-    autoPtr<surfaceScalarField> phi1Ptr(NULL);
-
-    if (phi1Header.headerOk())
-    {
-        Info<< "Reading face flux field phi1\n" << endl;
-
-        phi1Ptr.reset
-        (
-            new surfaceScalarField
-            (
-                IOobject
-                (
-                    "phi1",
-                    runTime.timeName(),
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                mesh
-            )
-        );
-    }
-    else
-    {
-        Info<< "Calculating face flux field phi1\n" << endl;
-
-        wordList phiTypes
-        (
-            U1.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
-        );
-
-        forAll(U1.boundaryField(), i)
-        {
-            if (isA<fixedValueFvPatchVectorField>(U1.boundaryField()[i]))
-            {
-                phiTypes[i] = fixedValueFvPatchScalarField::typeName;
-            }
-        }
-
-        phi1Ptr.reset
-        (
-            new surfaceScalarField
-            (
-                IOobject
-                (
-                    "phi1",
-                    runTime.timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                fvc::interpolate(U1) & mesh.Sf(),
-                phiTypes
-            )
-        );
-    }
-
-    surfaceScalarField& phi1 = phi1Ptr();
diff --git a/applications/solvers/multiphase/bubbleFoam/createPhi2.H b/applications/solvers/multiphase/bubbleFoam/createPhi2.H
deleted file mode 100644
index ebba6a3f6c..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/createPhi2.H
+++ /dev/null
@@ -1,67 +0,0 @@
-    IOobject phi2Header
-    (
-        "phi2",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ
-    );
-
-    autoPtr<surfaceScalarField> phi2Ptr(NULL);
-
-    if (phi2Header.headerOk())
-    {
-        Info<< "Reading face flux field phi2\n" << endl;
-
-        phi2Ptr.reset
-        (
-            new surfaceScalarField
-            (
-                IOobject
-                (
-                    "phi2",
-                    runTime.timeName(),
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                mesh
-            )
-        );
-    }
-    else
-    {
-        Info<< "Calculating face flux field phi2\n" << endl;
-
-        wordList phiTypes
-        (
-            U2.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
-        );
-
-        forAll(U2.boundaryField(), i)
-        {
-            if (isA<fixedValueFvPatchVectorField>(U2.boundaryField()[i]))
-            {
-                phiTypes[i] = fixedValueFvPatchScalarField::typeName;
-            }
-        }
-
-        phi2Ptr.reset
-        (
-            new surfaceScalarField
-            (
-                IOobject
-                (
-                    "phi2",
-                    runTime.timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                fvc::interpolate(U2) & mesh.Sf(),
-                phiTypes
-            )
-        );
-    }
-
-    surfaceScalarField& phi2 = phi2Ptr();
diff --git a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
deleted file mode 100644
index bacd835655..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H
+++ /dev/null
@@ -1,178 +0,0 @@
-    IOdictionary RASProperties
-    (
-        IOobject
-        (
-            "RASProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-
-
-    Switch turbulence
-    (
-        RASProperties.lookup("turbulence")
-    );
-
-    dictionary kEpsilonDict
-    (
-        RASProperties.subDictPtr("kEpsilonCoeffs")
-    );
-
-    dimensionedScalar Cmu
-    (
-        dimensionedScalar::lookupOrAddToDict
-        (
-            "Cmu",
-            kEpsilonDict,
-            0.09
-        )
-    );
-
-    dimensionedScalar C1
-    (
-        dimensionedScalar::lookupOrAddToDict
-        (
-            "C1",
-            kEpsilonDict,
-            1.44
-        )
-    );
-
-    dimensionedScalar C2
-    (
-        dimensionedScalar::lookupOrAddToDict
-        (
-            "C2",
-            kEpsilonDict,
-            1.92
-        )
-    );
-
-    dimensionedScalar alpha1k
-    (
-        dimensionedScalar::lookupOrAddToDict
-        (
-            "alpha1k",
-            kEpsilonDict,
-            1.0
-        )
-    );
-
-    dimensionedScalar alpha1Eps
-    (
-        dimensionedScalar::lookupOrAddToDict
-        (
-            "alpha1Eps",
-            kEpsilonDict,
-            0.76923
-        )
-    );
-
-    dictionary wallFunctionDict
-    (
-        RASProperties.subDictPtr("wallFunctionCoeffs")
-    );
-
-    dimensionedScalar kappa
-    (
-        dimensionedScalar::lookupOrAddToDict
-        (
-            "kappa",
-            wallFunctionDict,
-            0.41
-        )
-    );
-
-    dimensionedScalar E
-    (
-        dimensionedScalar::lookupOrAddToDict
-        (
-            "E",
-            wallFunctionDict,
-            9.8
-        )
-    );
-
-    if (RASProperties.lookupOrDefault("printCoeffs", false))
-    {
-        Info<< "kEpsilonCoeffs" << kEpsilonDict << nl
-            << "wallFunctionCoeffs" << wallFunctionDict << endl;
-    }
-
-
-    nearWallDist y(mesh);
-
-
-    Info<< "Reading field k\n" << endl;
-    volScalarField k
-    (
-        IOobject
-        (
-            "k",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    Info<< "Reading field epsilon\n" << endl;
-    volScalarField epsilon
-    (
-        IOobject
-        (
-            "epsilon",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-    Info<< "Calculating field nut2\n" << endl;
-    volScalarField nut2
-    (
-        IOobject
-        (
-            "nut2",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        Cmu*sqr(k)/epsilon
-    );
-
-    Info<< "Calculating field nuEff1\n" << endl;
-    volScalarField nuEff1
-    (
-        IOobject
-        (
-            "nuEff1",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        sqr(Ct)*nut2 + nu1
-    );
-
-    Info<< "Calculating field nuEff2\n" << endl;
-    volScalarField nuEff2
-    (
-        IOobject
-        (
-            "nuEff2",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        nut2 + nu2
-    );
diff --git a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
deleted file mode 100644
index 1340587ea3..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
+++ /dev/null
@@ -1,64 +0,0 @@
-if (turbulence)
-{
-    if (mesh.changing())
-    {
-        y.correct();
-    }
-
-    tmp<volTensorField> tgradU2 = fvc::grad(U2);
-    volScalarField G(2*nut2*(tgradU2() && dev(symm(tgradU2()))));
-    tgradU2.clear();
-
-    #include "wallFunctions.H"
-
-    // Dissipation equation
-    fvScalarMatrix epsEqn
-    (
-        fvm::ddt(epsilon)
-      + fvm::div(phi2, epsilon)
-      - fvm::Sp(fvc::div(phi2), epsilon)
-      - fvm::laplacian
-        (
-            alpha1Eps*nuEff2, epsilon,
-            "laplacian(DepsilonEff,epsilon)"
-        )
-      ==
-         C1*G*epsilon/k
-       - fvm::Sp(C2*epsilon/k, epsilon)
-    );
-
-    #include "wallDissipation.H"
-
-    epsEqn.relax();
-    epsEqn.solve();
-
-    epsilon.max(dimensionedScalar("zero", epsilon.dimensions(), 1.0e-15));
-
-
-    // Turbulent kinetic energy equation
-    fvScalarMatrix kEqn
-    (
-        fvm::ddt(k)
-      + fvm::div(phi2, k)
-      - fvm::Sp(fvc::div(phi2), k)
-      - fvm::laplacian
-        (
-            alpha1k*nuEff2, k,
-            "laplacian(DkEff,k)"
-        )
-      ==
-        G
-      - fvm::Sp(epsilon/k, k)
-    );
-    kEqn.relax();
-    kEqn.solve();
-
-    k.max(dimensionedScalar("zero", k.dimensions(), 1.0e-8));
-
-    //- Re-calculate turbulence viscosity
-    nut2 = Cmu*sqr(k)/epsilon;
-
-    #include "wallViscosity.H"
-}
-
-nuEff2 = nut2 + nu2;
diff --git a/applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H b/applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H
deleted file mode 100644
index d2ebb75a2f..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/liftDragCoeffs.H
+++ /dev/null
@@ -1,23 +0,0 @@
-    volVectorField Ur(U1 - U2);
-    volScalarField magUr(mag(Ur));
-
-    volScalarField Cd1MagUr
-    (
-        (24.0*nu2/d1)*(scalar(1) + 0.15*pow(d1*magUr/nu2, 0.687))
-    );
-
-    volScalarField Cd2MagUr
-    (
-        (24.0*nu1/d2)*(scalar(1) + 0.15*pow(d2*magUr/nu1, 0.687))
-    );
-
-    volScalarField dragCoef
-    (
-        "Cd",
-        0.75*(alpha2*rho2*Cd1MagUr/d1 + alpha1*rho1*Cd2MagUr/d2)
-    );
-
-    volVectorField liftCoeff
-    (
-        Cl*(alpha2*rho2 + alpha1*rho1)*(Ur ^ fvc::curl(U))
-    );
diff --git a/applications/solvers/multiphase/bubbleFoam/pEqn.H b/applications/solvers/multiphase/bubbleFoam/pEqn.H
deleted file mode 100644
index d438b1124f..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/pEqn.H
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    surfaceScalarField alpha1f(fvc::interpolate(alpha1));
-    surfaceScalarField alpha2f(scalar(1) - alpha1f);
-
-    volScalarField rAU1(1.0/U1Eqn.A());
-    volScalarField rAU2(1.0/U2Eqn.A());
-
-    surfaceScalarField rAU1f(fvc::interpolate(rAU1));
-    surfaceScalarField rAU2f(fvc::interpolate(rAU2));
-
-    volVectorField HbyA1("HbyA1", U1);
-    HbyA1 = rAU1*U1Eqn.H();
-
-    volVectorField HbyA2("HbyA2", U2);
-    HbyA2 = rAU2*U2Eqn.H();
-
-    surfaceScalarField phiDrag1
-    (
-        fvc::interpolate(alpha2/rho1*dragCoef*rAU1)*phi2
-      + rAU1f*(g & mesh.Sf())
-    );
-    surfaceScalarField phiDrag2
-    (
-        fvc::interpolate(alpha1/rho2*dragCoef*rAU2)*phi1
-      + rAU2f*(g & mesh.Sf())
-    );
-
-    forAll(p.boundaryField(), patchi)
-    {
-        if (isA<zeroGradientFvPatchScalarField>(p.boundaryField()[patchi]))
-        {
-            phiDrag1.boundaryField()[patchi] = 0.0;
-            phiDrag2.boundaryField()[patchi] = 0.0;
-        }
-    }
-
-    surfaceScalarField phiHbyA1
-    (
-        (fvc::interpolate(HbyA1) & mesh.Sf())
-      + fvc::ddtPhiCorr(rAU1, U1, phi1)
-    );
-
-    surfaceScalarField phiHbyA2
-    (
-        (fvc::interpolate(HbyA2) & mesh.Sf())
-      + fvc::ddtPhiCorr(rAU2, U2, phi2)
-    );
-
-    phi = alpha1f*phiHbyA1 + alpha2f*phiHbyA2;
-
-    phiHbyA1 += phiDrag1;
-    phiHbyA2 += phiDrag2;
-    surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
-
-    surfaceScalarField Dp
-    (
-        "Dp",
-        alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
-    );
-
-    while (pimple.correctNonOrthogonal())
-    {
-        fvScalarMatrix pEqn
-        (
-            fvm::laplacian(Dp, p) == fvc::div(phiHbyA)
-        );
-
-        pEqn.setReference(pRefCell, pRefValue);
-
-        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
-
-        if (pimple.finalNonOrthogonalIter())
-        {
-            surfaceScalarField SfGradp(pEqn.flux()/Dp);
-
-            phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
-            phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
-            phi = alpha1f*phi1 + alpha2f*phi2;
-
-            p.relax();
-            SfGradp = pEqn.flux()/Dp;
-
-            U1 = HbyA1 + (fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1));
-            U1.correctBoundaryConditions();
-
-            U2 = HbyA2 + (fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2));
-            U2.correctBoundaryConditions();
-
-            U = alpha1*U1 + alpha2*U2;
-        }
-    }
-}
-
-#include "continuityErrs.H"
diff --git a/applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H b/applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H
deleted file mode 100644
index 248f608f5c..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/readBubbleFoamControls.H
+++ /dev/null
@@ -1,4 +0,0 @@
-
-    int nAlphaCorr(readInt(pimple.dict().lookup("nAlphaCorr")));
-
-    Switch correctAlpha(pimple.dict().lookup("correctAlpha"));
diff --git a/applications/solvers/multiphase/bubbleFoam/wallDissipation.H b/applications/solvers/multiphase/bubbleFoam/wallDissipation.H
deleted file mode 100644
index 14224fd646..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/wallDissipation.H
+++ /dev/null
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    wallDissipation
-
-Description
-    Set wall dissipation in the epsilon matrix
-
-\*---------------------------------------------------------------------------*/
-
-{
-    const fvPatchList& patches = mesh.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& p = patches[patchi];
-
-        if (isA<wallFvPatch>(p))
-        {
-            epsEqn.setValues
-            (
-                p.faceCells(),
-                epsilon.boundaryField()[patchi].patchInternalField()
-            );
-        }
-    }
-}
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H
deleted file mode 100644
index c91cce9a00..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    labelList cellBoundaryFaceCount(epsilon.size(), 0);
-
-    scalar Cmu25 = ::pow(Cmu.value(), 0.25);
-    scalar Cmu75 = ::pow(Cmu.value(), 0.75);
-    scalar kappa_ = kappa.value();
-    scalar nu2_ = nu2.value();
-
-    const fvPatchList& patches = mesh.boundary();
-
-    //- Initialise the near-wall P field to zero
-    forAll(patches, patchi)
-    {
-        const fvPatch& currPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(currPatch))
-        {
-            forAll(currPatch, facei)
-            {
-                label faceCelli = currPatch.faceCells()[facei];
-
-                epsilon[faceCelli] = 0.0;
-                G[faceCelli] = 0.0;
-            }
-        }
-    }
-
-    //- Accumulate the wall face contributions to epsilon and G
-    //  Increment cellBoundaryFaceCount for each face for averaging
-    forAll(patches, patchi)
-    {
-        const fvPatch& currPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(currPatch))
-        {
-            const scalarField& nut2w = nut2.boundaryField()[patchi];
-
-            scalarField magFaceGradU(mag(U2.boundaryField()[patchi].snGrad()));
-
-            forAll(currPatch, facei)
-            {
-                label faceCelli = currPatch.faceCells()[facei];
-
-                // For corner cells (with two boundary or more faces),
-                // epsilon and G in the near-wall cell are calculated
-                // as an average
-
-                cellBoundaryFaceCount[faceCelli]++;
-
-                epsilon[faceCelli] +=
-                     Cmu75*::pow(k[faceCelli], 1.5)
-                    /(kappa_*y[patchi][facei]);
-
-                G[faceCelli] +=
-                    (nut2w[facei] + nu2_)*magFaceGradU[facei]
-                   *Cmu25*::sqrt(k[faceCelli])
-                   /(kappa_*y[patchi][facei]);
-            }
-        }
-    }
-
-
-    // perform the averaging
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-                G[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-                cellBoundaryFaceCount[faceCelli] = 1;
-            }
-        }
-    }
-}
diff --git a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H
deleted file mode 100644
index bd51ed7dd1..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    scalar Cmu25 = ::pow(Cmu.value(), 0.25);
-    scalar kappa_ = kappa.value();
-    scalar E_ = E.value();
-    scalar nu2_ = nu2.value();
-
-    const fvPatchList& patches = mesh.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& currPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(currPatch))
-        {
-            scalarField& nutw = nut2.boundaryField()[patchi];
-
-            forAll(currPatch, facei)
-            {
-                label faceCelli = currPatch.faceCells()[facei];
-
-                // calculate yPlus
-                scalar yPlus =
-                    Cmu25*y[patchi][facei]*::sqrt(k[faceCelli])/nu2_;
-
-                if (yPlus > 11.6)
-                {
-                    nutw[facei] = nu2_*(yPlus*kappa_/::log(E_*yPlus) -1);
-                }
-                else
-                {
-                    nutw[facei] = 0.0;
-                }
-            }
-        }
-    }
-}
diff --git a/applications/solvers/multiphase/bubbleFoam/write.H b/applications/solvers/multiphase/bubbleFoam/write.H
deleted file mode 100644
index 303661beb6..0000000000
--- a/applications/solvers/multiphase/bubbleFoam/write.H
+++ /dev/null
@@ -1,17 +0,0 @@
-    if (runTime.outputTime())
-    {
-        volVectorField Ur
-        (
-            IOobject
-            (
-                "Ur",
-                runTime.timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            U1 - U2
-        );
-
-        runTime.write();
-    }
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U1 b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U1
deleted file mode 100644
index 6272fb9188..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U1
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- 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       volVectorField;
-    object      U1;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform (0 0.1 0);
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
-    }
-
-    walls
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U2 b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U2
deleted file mode 100644
index fb96d28c70..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/U2
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- 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       volVectorField;
-    object      U2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
-    }
-
-    walls
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha1 b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha1
deleted file mode 100644
index 4eedc09549..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha1
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- 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;
-    object      alpha1;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 0.5;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
-    }
-
-    walls
-    {
-        type            zeroGradient;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon
deleted file mode 100644
index d5ee15eb79..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- 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;
-    object      epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -3 0 0 0 0];
-
-internalField   uniform 0.1;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 0.1;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 0.1;
-        value           uniform 0.1;
-    }
-
-    walls
-    {
-        type            zeroGradient;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k
deleted file mode 100644
index a791cb824f..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- 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;
-    object      k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -2 0 0 0 0];
-
-internalField   uniform 1e-8;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 1e-8;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1e-8;
-        value           uniform 1e-8;
-    }
-
-    walls
-    {
-        type            zeroGradient;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
deleted file mode 100644
index 536747ce3f..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- 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;
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    outlet
-    {
-        type            fixedValue;
-        value           uniform 0;
-    }
-
-    walls
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U1 b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U1
deleted file mode 100644
index a067cb3d20..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U1
+++ /dev/null
@@ -1,1956 +0,0 @@
-/*--------------------------------*- 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       volVectorField;
-    object      U1;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   nonuniform List<vector>
-1875
-(
-(0.235741 0.282915 0)
-(0.643036 0.399243 0)
-(0.656185 0.509736 0)
-(0.636409 0.544659 0)
-(0.620127 0.564227 0)
-(0.618713 0.561656 0)
-(0.624412 0.553842 0)
-(0.632129 0.542499 0)
-(0.629964 0.532026 0)
-(0.624875 0.526406 0)
-(0.614482 0.526789 0)
-(0.599004 0.532843 0)
-(0.577409 0.553691 0)
-(0.530174 0.581747 0)
-(0.467086 0.62077 0)
-(0.341265 0.702532 0)
-(0.200802 0.714208 0)
-(0.165579 0.724117 0)
-(0.0823803 0.878697 0)
-(-0.016522 0.926312 0)
-(-0.226396 0.75159 0)
-(-0.179979 0.678163 0)
-(-0.399049 0.427978 0)
-(-0.566877 0.274105 0)
-(-0.384263 -0.0548673 0)
-(0.0716513 -0.439321 0)
-(0.279506 -0.152191 0)
-(0.184572 0.1313 0)
-(0.175589 0.255174 0)
-(0.184014 0.271204 0)
-(0.208684 0.269064 0)
-(0.242769 0.248253 0)
-(0.280598 0.228197 0)
-(0.319307 0.217199 0)
-(0.34987 0.217243 0)
-(0.381907 0.223478 0)
-(0.424078 0.230925 0)
-(0.428005 0.270264 0)
-(0.382643 0.307171 0)
-(0.372617 0.391425 0)
-(0.258543 0.50144 0)
-(0.0953053 0.676366 0)
-(0.104968 0.742667 0)
-(0.096802 0.869526 0)
-(0.139361 0.870893 0)
-(0.0573226 0.667963 0)
-(0.214903 0.561766 0)
-(0.0766779 0.612272 0)
-(-0.122334 -0.0156288 0)
-(-0.279094 -0.521725 0)
-(-0.0176985 -0.513921 0)
-(0.0347137 -0.042279 0)
-(-0.0122756 0.189036 0)
-(0.0400778 0.115918 0)
-(0.127855 0.0810941 0)
-(0.180943 0.0966721 0)
-(0.198338 0.136208 0)
-(0.208426 0.154902 0)
-(0.247423 0.163264 0)
-(0.249173 0.210267 0)
-(0.218257 0.201626 0)
-(0.161338 0.201241 0)
-(0.176038 0.26962 0)
-(0.0915893 0.343315 0)
-(0.0809896 0.414782 0)
-(-0.0331324 0.566673 0)
-(-0.122711 0.595887 0)
-(-0.0631875 0.636468 0)
-(-0.0752413 0.772388 0)
-(0.016323 0.787342 0)
-(-0.00494172 0.556271 0)
-(0.168714 0.358189 0)
-(0.0777835 0.477472 0)
-(0.0848983 0.117252 0)
-(-0.150044 -0.530939 0)
-(-0.00246017 -0.543038 0)
-(0.0310676 0.0203172 0)
-(-0.00859394 0.242012 0)
-(0.0432859 0.157066 0)
-(0.0739057 0.132058 0)
-(0.0769579 0.160969 0)
-(0.0543572 0.201658 0)
-(0.0281194 0.187048 0)
-(0.0597751 0.160184 0)
-(0.0150864 0.204361 0)
-(-0.0627548 0.330466 0)
-(-0.125905 0.384734 0)
-(-0.162897 0.409445 0)
-(-0.176189 0.432821 0)
-(-0.164775 0.478269 0)
-(-0.170618 0.523923 0)
-(-0.108591 0.511002 0)
-(-0.126957 0.573263 0)
-(-0.12712 0.734609 0)
-(-0.0845458 0.759789 0)
-(0.0331765 0.480641 0)
-(0.101535 0.455155 0)
-(0.010038 0.657924 0)
-(0.0613247 0.491649 0)
-(-0.0891678 -0.313494 0)
-(0.000978649 -0.577408 0)
-(-0.0152532 -0.125008 0)
-(-0.00602979 0.0905946 0)
-(0.0792542 -0.0215229 0)
-(0.0448018 -0.0383249 0)
-(0.0212028 0.0839119 0)
-(-0.0733629 0.190164 0)
-(-0.106851 0.162443 0)
-(-0.143221 0.168897 0)
-(-0.218732 0.293125 0)
-(-0.226009 0.313401 0)
-(-0.230132 0.296989 0)
-(-0.213528 0.316163 0)
-(-0.213571 0.346585 0)
-(-0.189509 0.381493 0)
-(-0.166401 0.381986 0)
-(-0.167863 0.465124 0)
-(-0.273715 0.550543 0)
-(-0.282759 0.685692 0)
-(-0.144366 0.557903 0)
-(0.0228787 0.269495 0)
-(0.0339209 0.413566 0)
-(-0.0446192 0.53295 0)
-(0.0689717 0.338812 0)
-(-0.0777225 -0.43038 0)
-(0.00337122 -0.510514 0)
-(-0.0233767 -0.0465083 0)
-(-0.0190977 0.00964726 0)
-(0.0445354 -0.0085983 0)
-(-0.0290037 0.0996159 0)
-(-0.0714682 0.256276 0)
-(-0.141746 0.328702 0)
-(-0.146813 0.298179 0)
-(-0.220543 0.313735 0)
-(-0.23063 0.316241 0)
-(-0.215578 0.326605 0)
-(-0.208755 0.351326 0)
-(-0.207563 0.378341 0)
-(-0.213012 0.392876 0)
-(-0.195504 0.408488 0)
-(-0.207271 0.443346 0)
-(-0.252032 0.56554 0)
-(-0.293884 0.626126 0)
-(-0.277673 0.649848 0)
-(-0.140787 0.414759 0)
-(-0.0173278 0.237967 0)
-(-0.00146389 0.449184 0)
-(-0.00921544 0.593652 0)
-(0.0443774 0.468614 0)
-(-0.101398 -0.313839 0)
-(0.0119738 -0.498432 0)
-(-0.0226992 -0.034944 0)
-(-0.0302639 0.0354088 0)
-(-0.0461342 0.015388 0)
-(-0.117576 0.125313 0)
-(-0.155351 0.28538 0)
-(-0.184462 0.328131 0)
-(-0.18456 0.310887 0)
-(-0.222241 0.306776 0)
-(-0.228316 0.283665 0)
-(-0.22837 0.28412 0)
-(-0.237535 0.312724 0)
-(-0.243165 0.343901 0)
-(-0.247758 0.359063 0)
-(-0.238153 0.403224 0)
-(-0.281716 0.490919 0)
-(-0.301372 0.53859 0)
-(-0.270337 0.559814 0)
-(-0.209984 0.480356 0)
-(-0.116475 0.162647 0)
-(-0.0848917 0.035491 0)
-(-0.0162196 0.389816 0)
-(0.00804055 0.547809 0)
-(0.000151655 0.44985 0)
-(-0.0742983 -0.373666 0)
-(0.0226381 -0.424386 0)
-(-0.0159965 0.0889873 0)
-(-0.0489576 0.158477 0)
-(-0.0932017 0.135951 0)
-(-0.131842 0.252351 0)
-(-0.169339 0.376081 0)
-(-0.208511 0.406023 0)
-(-0.236303 0.386353 0)
-(-0.263553 0.361001 0)
-(-0.280644 0.323677 0)
-(-0.307179 0.324151 0)
-(-0.338995 0.354472 0)
-(-0.351826 0.37819 0)
-(-0.363041 0.394315 0)
-(-0.38315 0.429582 0)
-(-0.37241 0.460261 0)
-(-0.278268 0.484737 0)
-(-0.151544 0.43029 0)
-(0.0354422 0.303739 0)
-(0.133782 0.109043 0)
-(0.0461519 0.155129 0)
-(-0.0969644 0.350308 0)
-(-0.0260814 0.555089 0)
-(-0.0576074 0.509295 0)
-(0.0638435 -0.36229 0)
-(0.0397873 -0.401762 0)
-(0.0132581 0.208607 0)
-(-0.0503483 0.290348 0)
-(-0.139116 0.21531 0)
-(-0.124556 0.315017 0)
-(-0.165117 0.47282 0)
-(-0.166557 0.506898 0)
-(-0.221453 0.47662 0)
-(-0.240043 0.436727 0)
-(-0.279175 0.417863 0)
-(-0.311754 0.419931 0)
-(-0.337641 0.423714 0)
-(-0.343674 0.415868 0)
-(-0.348424 0.416639 0)
-(-0.338202 0.415982 0)
-(-0.326527 0.394585 0)
-(-0.268182 0.288732 0)
-(-0.158546 0.159757 0)
-(-0.00445933 0.0705633 0)
-(0.00775141 0.0256028 0)
-(-0.133256 0.248876 0)
-(-0.293176 0.437779 0)
-(-0.241293 0.497609 0)
-(-0.106385 0.385991 0)
-(0.177888 -0.400565 0)
-(0.104788 -0.388573 0)
-(-0.0393141 0.305495 0)
-(0.0314174 0.518475 0)
-(-0.141042 0.351628 0)
-(-0.131753 0.347489 0)
-(-0.135579 0.491547 0)
-(-0.103922 0.56379 0)
-(-0.14706 0.583771 0)
-(-0.15107 0.5458 0)
-(-0.194289 0.515018 0)
-(-0.216366 0.477417 0)
-(-0.24922 0.451599 0)
-(-0.246783 0.428726 0)
-(-0.247815 0.413063 0)
-(-0.239395 0.371203 0)
-(-0.235777 0.287928 0)
-(-0.238215 0.186885 0)
-(-0.245344 0.109425 0)
-(-0.245592 0.0939 0)
-(-0.361738 0.192577 0)
-(-0.464709 0.325927 0)
-(-0.459003 0.332914 0)
-(-0.348293 0.260469 0)
-(-0.10742 0.047654 0)
-(0.186306 -0.315578 0)
-(0.129128 -0.319172 0)
-(-0.132039 0.274902 0)
-(0.177386 0.599848 0)
-(-0.00569923 0.545343 0)
-(-0.107578 0.376326 0)
-(-0.101016 0.458921 0)
-(-0.0840805 0.549942 0)
-(-0.0843162 0.575151 0)
-(-0.0853267 0.566258 0)
-(-0.0955599 0.546293 0)
-(-0.112786 0.503591 0)
-(-0.128787 0.447535 0)
-(-0.144053 0.394955 0)
-(-0.146489 0.356389 0)
-(-0.155312 0.31432 0)
-(-0.1612 0.291751 0)
-(-0.209886 0.250728 0)
-(-0.250769 0.216813 0)
-(-0.290388 0.277419 0)
-(-0.383223 0.404172 0)
-(-0.430982 0.404915 0)
-(-0.39869 0.288507 0)
-(-0.261189 0.0585085 0)
-(-0.117553 -0.154962 0)
-(0.0284448 -0.228772 0)
-(0.0532209 -0.256435 0)
-(-0.0878511 0.284606 0)
-(0.183881 0.519631 0)
-(0.173214 0.831358 0)
-(-0.0214973 0.609281 0)
-(-0.0257563 0.51429 0)
-(-0.0764946 0.571152 0)
-(-0.0851017 0.58564 0)
-(-0.0835825 0.5714 0)
-(-0.0731847 0.539861 0)
-(-0.0567206 0.494451 0)
-(-0.0633894 0.448248 0)
-(-0.0501005 0.412787 0)
-(-0.0722485 0.397611 0)
-(-0.0915791 0.372539 0)
-(-0.123198 0.3627 0)
-(-0.1621 0.385102 0)
-(-0.201852 0.418073 0)
-(-0.211814 0.505279 0)
-(-0.292788 0.542034 0)
-(-0.350848 0.410291 0)
-(-0.298318 0.0969379 0)
-(-0.221553 -0.0919876 0)
-(-0.159419 -0.1918 0)
-(-0.109666 -0.409249 0)
-(-0.099626 -0.329575 0)
-(0.0829934 0.275393 0)
-(0.129316 0.445538 0)
-(0.182822 0.937096 0)
-(0.0586748 0.912372 0)
-(-0.0366136 0.733023 0)
-(-0.0693767 0.662879 0)
-(-0.0958532 0.628555 0)
-(-0.102424 0.566329 0)
-(-0.0952108 0.509975 0)
-(-0.0654833 0.460343 0)
-(-0.0340469 0.416414 0)
-(-0.0302951 0.387487 0)
-(0.0100919 0.393965 0)
-(-0.0102004 0.428929 0)
-(-0.0131914 0.45272 0)
-(-0.0536362 0.46925 0)
-(-0.0302082 0.518055 0)
-(-0.0824134 0.624794 0)
-(-0.131488 0.629799 0)
-(-0.190399 0.354308 0)
-(-0.227804 0.0378569 0)
-(-0.196371 -0.137285 0)
-(-0.115147 -0.384143 0)
-(-0.0925873 -0.652513 0)
-(-0.129486 -0.47392 0)
-(0.184737 0.0590685 0)
-(0.0951174 0.279155 0)
-(0.115851 0.929985 0)
-(0.00536483 1.15476 0)
-(-0.0612269 0.940058 0)
-(-0.0913946 0.768869 0)
-(-0.109165 0.66495 0)
-(-0.103878 0.578309 0)
-(-0.100924 0.478229 0)
-(-0.0982537 0.409154 0)
-(-0.0446602 0.363152 0)
-(-0.0233506 0.344588 0)
-(0.0221284 0.361135 0)
-(0.0622751 0.404815 0)
-(0.068573 0.476626 0)
-(0.0397619 0.56955 0)
-(0.044843 0.696141 0)
-(0.00739304 0.784365 0)
-(-0.0353837 0.682166 0)
-(-0.054491 0.348148 0)
-(-0.110365 0.0272955 0)
-(-0.151626 -0.31712 0)
-(-0.083404 -0.572871 0)
-(-0.0299063 -0.795518 0)
-(-0.076496 -0.56303 0)
-(0.158467 -0.0433973 0)
-(0.00265698 0.231616 0)
-(0.0754251 0.912905 0)
-(0.0273339 1.21539 0)
-(0.0186149 1.05431 0)
-(-0.0674814 0.773516 0)
-(-0.0734814 0.603954 0)
-(-0.072503 0.534852 0)
-(-0.0512511 0.433518 0)
-(-0.0689144 0.330904 0)
-(-0.0333096 0.25889 0)
-(0.00335975 0.24727 0)
-(0.0385826 0.246643 0)
-(0.086685 0.306052 0)
-(0.109185 0.477149 0)
-(0.107485 0.646506 0)
-(0.060058 0.813502 0)
-(0.0623319 0.809725 0)
-(0.0660441 0.626911 0)
-(0.0294839 0.31501 0)
-(-0.0410107 -0.0413669 0)
-(-0.0688077 -0.461737 0)
-(-0.0451669 -0.675752 0)
-(-0.0312537 -0.95119 0)
-(-0.0282598 -0.627506 0)
-(0.0931726 -0.0896422 0)
-(-0.0535398 0.196147 0)
-(0.03951 0.795993 0)
-(0.0184638 1.17691 0)
-(0.0483535 1.03713 0)
-(0.01431 0.794962 0)
-(0.0132507 0.536308 0)
-(0.0092842 0.456988 0)
-(0.0481602 0.349471 0)
-(0.0701298 0.271648 0)
-(0.0575455 0.225959 0)
-(0.0785957 0.216094 0)
-(0.0779246 0.224146 0)
-(0.120944 0.31623 0)
-(0.164705 0.532851 0)
-(0.123465 0.754381 0)
-(0.104467 0.817128 0)
-(0.116549 0.764054 0)
-(0.0831026 0.504635 0)
-(0.128796 0.205998 0)
-(-0.0138401 -0.0667637 0)
-(0.0181645 -0.459589 0)
-(-0.0128174 -0.68815 0)
-(-0.017547 -0.974061 0)
-(-0.00840551 -0.673361 0)
-(0.00822702 -0.194852 0)
-(-0.071645 0.168316 0)
-(-0.0806822 0.737102 0)
-(-0.0938222 1.0826 0)
-(0.0177071 0.937794 0)
-(0.0796967 0.718466 0)
-(0.127064 0.444121 0)
-(0.168919 0.315965 0)
-(0.181978 0.203143 0)
-(0.202663 0.173831 0)
-(0.192463 0.177011 0)
-(0.217227 0.208191 0)
-(0.192131 0.26242 0)
-(0.164929 0.411379 0)
-(0.157545 0.664289 0)
-(0.0948154 0.84731 0)
-(0.111204 0.801222 0)
-(0.0852142 0.662595 0)
-(0.196797 0.409345 0)
-(0.101225 0.247307 0)
-(0.037499 -0.0453147 0)
-(0.0418648 -0.437514 0)
-(0.0305666 -0.654025 0)
-(-0.0101884 -0.967798 0)
-(0.00666966 -0.606389 0)
-(-0.0466157 -0.106413 0)
-(-0.0930025 0.223512 0)
-(-0.103796 0.683087 0)
-(-0.126081 0.946518 0)
-(-0.0809068 0.714748 0)
-(0.164119 0.56268 0)
-(0.22365 0.41285 0)
-(0.343769 0.284466 0)
-(0.367632 0.226448 0)
-(0.403446 0.226353 0)
-(0.381248 0.259374 0)
-(0.28092 0.285321 0)
-(0.19021 0.389749 0)
-(0.123542 0.639503 0)
-(0.0822898 0.859198 0)
-(0.0275014 0.845123 0)
-(0.0478751 0.719529 0)
-(0.1634 0.508388 0)
-(0.18675 0.418961 0)
-(-0.0188603 0.300859 0)
-(0.112872 -0.139527 0)
-(0.0319502 -0.397924 0)
-(0.0413109 -0.611967 0)
-(0.0121018 -0.911382 0)
-(0.0292974 -0.520995 0)
-(-0.0454483 -0.0342725 0)
-(-0.0552005 0.244192 0)
-(-0.0187108 0.641819 0)
-(-0.00392448 0.945723 0)
-(0.0590754 0.464378 0)
-(0.193572 0.230904 0)
-(0.360107 0.129977 0)
-(0.457896 0.114731 0)
-(0.449846 0.153839 0)
-(0.35478 0.218934 0)
-(0.282452 0.31836 0)
-(0.135631 0.529179 0)
-(-0.0104523 0.766662 0)
-(-0.0699151 0.884932 0)
-(-0.0798656 0.907075 0)
-(-0.0180589 0.77165 0)
-(0.0654196 0.572711 0)
-(0.103478 0.504827 0)
-(-0.0039403 0.466 0)
-(-0.0164834 0.195092 0)
-(0.0943815 -0.199648 0)
-(0.0483169 -0.352399 0)
-(0.0309815 -0.530705 0)
-(0.0199486 -0.83714 0)
-(0.0616991 -0.485384 0)
-(-0.08931 0.0278569 0)
-(-0.0369102 0.218205 0)
-(-0.0710228 0.521819 0)
-(0.129189 0.69364 0)
-(0.300769 0.351698 0)
-(0.43648 0.0142277 0)
-(0.422976 -0.0116133 0)
-(0.402254 0.019141 0)
-(0.329033 0.116881 0)
-(0.132185 0.332016 0)
-(-0.0504714 0.58357 0)
-(-0.164611 0.752304 0)
-(-0.161356 0.819447 0)
-(-0.140296 0.847766 0)
-(-0.133019 0.780767 0)
-(-0.0558104 0.565828 0)
-(-0.0421847 0.481593 0)
-(-0.0610841 0.429487 0)
-(-0.0495913 0.385818 0)
-(0.0701272 -0.00087012 0)
-(0.0699393 -0.203695 0)
-(0.0699017 -0.264919 0)
-(0.0352785 -0.453343 0)
-(0.0198059 -0.758114 0)
-(0.0947532 -0.366002 0)
-(-0.103995 0.1518 0)
-(-0.0611994 0.255559 0)
-(-0.136178 0.326725 0)
-(0.0145911 0.296929 0)
-(0.276856 0.05756 0)
-(0.380361 0.019215 0)
-(0.273045 0.0628518 0)
-(-0.0187354 0.246248 0)
-(-0.084113 0.384817 0)
-(-0.173072 0.517818 0)
-(-0.210301 0.654612 0)
-(-0.216471 0.73272 0)
-(-0.15641 0.783852 0)
-(-0.111004 0.791076 0)
-(-0.0919115 0.626045 0)
-(-0.0382221 0.422521 0)
-(-0.00374529 0.396448 0)
-(0.0199982 0.277348 0)
-(0.0807092 0.126763 0)
-(0.137657 -0.107667 0)
-(0.108744 -0.175782 0)
-(0.0921292 -0.229546 0)
-(0.0330253 -0.410571 0)
-(0.0399913 -0.701655 0)
-(0.0831855 -0.264682 0)
-(-0.0525147 0.33668 0)
-(-0.0995546 0.353966 0)
-(-0.147808 0.345331 0)
-(0.00114486 0.235027 0)
-(0.0780509 0.17504 0)
-(-0.130424 0.194343 0)
-(-0.21737 0.246303 0)
-(-0.282431 0.313825 0)
-(-0.281029 0.384869 0)
-(-0.298633 0.48192 0)
-(-0.286344 0.560142 0)
-(-0.204477 0.600066 0)
-(-0.101962 0.589334 0)
-(0.0154568 0.562593 0)
-(0.104744 0.419933 0)
-(0.113871 0.29179 0)
-(0.114072 0.253422 0)
-(0.144195 0.207784 0)
-(0.137859 0.13119 0)
-(0.179822 0.0103463 0)
-(0.154117 -0.0125473 0)
-(0.111143 -0.0821216 0)
-(0.0452644 -0.277637 0)
-(0.0322329 -0.578898 0)
-(0.0587524 -0.204294 0)
-(-0.0217904 0.535616 0)
-(-0.0759713 0.560311 0)
-(-0.0924362 0.477343 0)
-(-0.0858707 0.335762 0)
-(-0.222658 0.349394 0)
-(-0.324933 0.382547 0)
-(-0.372756 0.375995 0)
-(-0.393928 0.392573 0)
-(-0.403701 0.422262 0)
-(-0.382142 0.48022 0)
-(-0.330672 0.522744 0)
-(-0.230309 0.531101 0)
-(-0.106644 0.484111 0)
-(0.0327251 0.428938 0)
-(0.111603 0.400133 0)
-(0.122368 0.377773 0)
-(0.118555 0.363892 0)
-(0.148874 0.320774 0)
-(0.104056 0.262003 0)
-(0.143294 0.132499 0)
-(0.0727229 0.0733983 0)
-(0.0822665 -0.029979 0)
-(0.0216526 -0.216217 0)
-(0.0338216 -0.49864 0)
-(-0.0234396 -0.231193 0)
-(0.0373678 0.582834 0)
-(-0.017698 0.648052 0)
-(0.0448454 0.683503 0)
-(-0.0308462 0.625434 0)
-(-0.121979 0.533731 0)
-(-0.230161 0.47568 0)
-(-0.282096 0.43059 0)
-(-0.328778 0.427814 0)
-(-0.353656 0.439371 0)
-(-0.356971 0.45729 0)
-(-0.333592 0.467845 0)
-(-0.276499 0.433591 0)
-(-0.206096 0.395726 0)
-(-0.166571 0.380191 0)
-(-0.122135 0.384489 0)
-(-0.0749418 0.390556 0)
-(-0.0191717 0.370048 0)
-(0.0508939 0.338859 0)
-(0.0781517 0.240278 0)
-(0.107177 0.144706 0)
-(0.0414861 0.0862876 0)
-(0.0797925 -0.00775321 0)
-(0.0192869 -0.169527 0)
-(0.0241504 -0.438638 0)
-(-0.081061 -0.281677 0)
-(0.0680263 0.501908 0)
-(0.00761151 0.592481 0)
-(0.11237 0.650602 0)
-(0.120222 0.692767 0)
-(0.076381 0.640735 0)
-(0.0435646 0.592202 0)
-(-0.00704673 0.519488 0)
-(-0.0529055 0.457091 0)
-(-0.0945998 0.415788 0)
-(-0.109221 0.39738 0)
-(-0.128647 0.382119 0)
-(-0.15085 0.343108 0)
-(-0.165905 0.323666 0)
-(-0.159186 0.272493 0)
-(-0.178405 0.212053 0)
-(-0.152347 0.200932 0)
-(-0.106738 0.206092 0)
-(-0.0409545 0.220547 0)
-(0.0292831 0.205538 0)
-(0.0480035 0.170426 0)
-(0.0216452 0.0979804 0)
-(0.0605892 0.00452084 0)
-(0.0197604 -0.108866 0)
-(0.0191903 -0.35583 0)
-(-0.168087 -0.222241 0)
-(0.124255 0.373472 0)
-(0.100922 0.562734 0)
-(0.107066 0.553002 0)
-(0.111518 0.647912 0)
-(0.121255 0.593008 0)
-(0.177971 0.534942 0)
-(0.173158 0.49479 0)
-(0.175518 0.46665 0)
-(0.151385 0.450839 0)
-(0.136686 0.434342 0)
-(0.129877 0.421327 0)
-(0.0888619 0.370709 0)
-(0.0677146 0.343116 0)
-(0.0451249 0.33121 0)
-(-0.0354312 0.248082 0)
-(-0.0677769 0.185143 0)
-(-0.0624212 0.124639 0)
-(-0.0358642 0.106767 0)
-(-0.0183848 0.117101 0)
-(-0.00722449 0.113201 0)
-(0.0091117 0.0698647 0)
-(0.0190983 0.0258889 0)
-(0.010464 -0.0583469 0)
-(0.0124889 -0.292181 0)
-(-0.101489 -0.158783 0)
-(0.0941319 0.222708 0)
-(0.223795 0.679517 0)
-(0.0859099 0.638079 0)
-(0.118747 0.618448 0)
-(0.0947352 0.50543 0)
-(0.166015 0.504795 0)
-(0.154554 0.506781 0)
-(0.180343 0.482475 0)
-(0.188773 0.466304 0)
-(0.183248 0.43866 0)
-(0.195555 0.42226 0)
-(0.18703 0.398796 0)
-(0.172307 0.357477 0)
-(0.188553 0.322775 0)
-(0.179164 0.315358 0)
-(0.138888 0.257457 0)
-(0.0555977 0.157168 0)
-(0.0334133 0.116259 0)
-(0.045675 0.0960564 0)
-(0.045597 0.0768809 0)
-(0.0460825 0.0482323 0)
-(0.0308541 0.0298896 0)
-(0.0150448 -0.0266301 0)
-(0.0107973 -0.263822 0)
-(0.109591 -0.242822 0)
-(-0.0345656 -0.0552707 0)
-(0.219224 0.577897 0)
-(0.172744 0.726031 0)
-(0.176021 0.632936 0)
-(0.0997307 0.512431 0)
-(0.0647615 0.453942 0)
-(0.0774694 0.456494 0)
-(0.113461 0.447621 0)
-(0.140381 0.447794 0)
-(0.148106 0.424762 0)
-(0.178683 0.409128 0)
-(0.188975 0.390282 0)
-(0.198496 0.336553 0)
-(0.215609 0.293902 0)
-(0.216578 0.292526 0)
-(0.21657 0.289171 0)
-(0.195731 0.242661 0)
-(0.153341 0.183659 0)
-(0.116212 0.165992 0)
-(0.0869091 0.135945 0)
-(0.0703859 0.108181 0)
-(0.0480584 0.0857186 0)
-(0.0211139 0.0218787 0)
-(0.00519211 -0.225222 0)
-(0.178603 -0.278265 0)
-(-0.106461 -0.0909177 0)
-(0.146275 0.381655 0)
-(0.290084 0.658313 0)
-(0.306093 0.715942 0)
-(0.256461 0.620428 0)
-(0.13089 0.506253 0)
-(0.0691344 0.46424 0)
-(0.0333927 0.376227 0)
-(0.0842164 0.39668 0)
-(0.110246 0.38841 0)
-(0.153541 0.373591 0)
-(0.179875 0.364521 0)
-(0.191288 0.333081 0)
-(0.196534 0.309778 0)
-(0.188151 0.312461 0)
-(0.185766 0.312039 0)
-(0.175564 0.288461 0)
-(0.156038 0.279805 0)
-(0.112074 0.270078 0)
-(0.088611 0.219895 0)
-(0.0674079 0.183114 0)
-(0.0471247 0.169935 0)
-(0.0194921 0.122769 0)
-(-0.00285402 -0.170739 0)
-(0.0941155 -0.259626 0)
-(-0.0234933 -0.0152202 0)
-(0.071703 0.0752687 0)
-(0.294711 0.411006 0)
-(0.393775 0.677173 0)
-(0.382177 0.820832 0)
-(0.311991 0.785725 0)
-(0.153294 0.5849 0)
-(0.0581871 0.445413 0)
-(0.019897 0.340989 0)
-(0.0598109 0.30556 0)
-(0.0799765 0.30064 0)
-(0.0975052 0.317296 0)
-(0.107351 0.330964 0)
-(0.106836 0.335844 0)
-(0.0963823 0.349838 0)
-(0.0898661 0.351248 0)
-(0.0980146 0.34323 0)
-(0.0924582 0.336779 0)
-(0.0861809 0.311847 0)
-(0.0814255 0.254263 0)
-(0.058156 0.23788 0)
-(0.0359749 0.226852 0)
-(0.014445 0.167141 0)
-(-0.00998266 -0.15107 0)
-(0.0112834 -0.313363 0)
-(0.0715993 -0.126529 0)
-(0.13804 0.0596103 0)
-(0.208352 0.198328 0)
-(0.33543 0.556612 0)
-(0.367526 0.817105 0)
-(0.331963 0.925083 0)
-(0.288716 0.86626 0)
-(0.119516 0.613272 0)
-(0.0213305 0.409556 0)
-(0.00288115 0.321486 0)
-(-0.00184527 0.327894 0)
-(-0.0200352 0.336838 0)
-(-0.0176014 0.318454 0)
-(-0.0123875 0.322313 0)
-(-0.00711572 0.34405 0)
-(0.00582193 0.334679 0)
-(0.0431185 0.313189 0)
-(0.0610771 0.308512 0)
-(0.0816515 0.299416 0)
-(0.0762299 0.276897 0)
-(0.0530371 0.288962 0)
-(0.0227383 0.294844 0)
-(0.0156083 0.231894 0)
-(-0.0114399 -0.132471 0)
-(0.0134529 -0.347688 0)
-(0.079025 -0.225853 0)
-(0.193419 -0.0825656 0)
-(0.185346 0.19832 0)
-(0.198066 0.430484 0)
-(0.261748 0.752074 0)
-(0.2655 0.935787 0)
-(0.253947 0.968376 0)
-(0.197651 0.887118 0)
-(0.0569221 0.596265 0)
-(-0.00727763 0.389971 0)
-(0.00647102 0.367941 0)
-(-0.019417 0.366703 0)
-(-0.0491864 0.339547 0)
-(-0.0609269 0.313277 0)
-(-0.0537495 0.290211 0)
-(-0.00291402 0.274253 0)
-(0.0212483 0.244181 0)
-(0.0615173 0.247987 0)
-(0.0646929 0.281769 0)
-(0.0650348 0.319014 0)
-(0.0397922 0.357081 0)
-(0.0147324 0.337644 0)
-(0.0130117 0.248252 0)
-(-0.00522624 -0.12207 0)
-(0.0174861 -0.582804 0)
-(0.101267 -0.447083 0)
-(0.153078 -0.307123 0)
-(0.138352 0.0765649 0)
-(0.0169229 0.375656 0)
-(0.0635127 0.63493 0)
-(0.117076 0.884902 0)
-(0.109839 0.971737 0)
-(0.106707 0.911321 0)
-(0.0204431 0.765901 0)
-(0.0190239 0.564596 0)
-(0.0332211 0.497217 0)
-(-0.0104522 0.467609 0)
-(-0.0386365 0.407411 0)
-(-0.0599213 0.295918 0)
-(-0.0357757 0.223158 0)
-(0.00377389 0.200356 0)
-(0.025912 0.195859 0)
-(0.0468245 0.220486 0)
-(0.0547925 0.29274 0)
-(0.024556 0.353807 0)
-(0.0115634 0.379676 0)
-(0.022681 0.366547 0)
-(-0.00387461 0.282119 0)
-(0.00984657 -0.118877 0)
-(-0.0154485 -0.646497 0)
-(0.0619399 -0.522591 0)
-(0.0298834 -0.388703 0)
-(0.0153697 0.0468793 0)
-(-0.167824 0.313491 0)
-(-0.0596589 0.46941 0)
-(-0.0297625 0.73582 0)
-(0.0149087 0.929575 0)
-(0.00302068 0.948068 0)
-(-0.0594943 0.80347 0)
-(-0.0214168 0.608683 0)
-(-0.00260312 0.537231 0)
-(-0.021117 0.522042 0)
-(-0.0274971 0.411276 0)
-(-0.0342818 0.260393 0)
-(0.0203943 0.153033 0)
-(0.026644 0.142869 0)
-(0.0618593 0.160265 0)
-(0.0380121 0.227009 0)
-(0.0142235 0.339477 0)
-(-0.0287879 0.426888 0)
-(0.00376108 0.356778 0)
-(0.0124013 0.365546 0)
-(-0.0148726 0.294815 0)
-(0.0121691 -0.12912 0)
-(-0.00837725 -0.646993 0)
-(0.0303243 -0.494813 0)
-(-0.056148 -0.34333 0)
-(0.0247167 0.179262 0)
-(-0.116245 0.391012 0)
-(-0.141089 0.36748 0)
-(-0.00977432 0.554635 0)
-(-0.0506905 0.842692 0)
-(-0.0584951 0.936035 0)
-(-0.126521 0.836338 0)
-(-0.0616442 0.679534 0)
-(-0.0381944 0.586149 0)
-(-0.0563979 0.527771 0)
-(-0.0310636 0.38849 0)
-(0.0137392 0.201387 0)
-(0.0384745 0.120632 0)
-(0.0499893 0.121272 0)
-(0.049417 0.171544 0)
-(0.0108466 0.296391 0)
-(-0.0597035 0.438302 0)
-(-0.0593196 0.411948 0)
-(-0.0370405 0.306178 0)
-(-0.000567594 0.351611 0)
-(-0.0145671 0.304825 0)
-(0.00569453 -0.127327 0)
-(-0.00175474 -0.632184 0)
-(-0.0167561 -0.491808 0)
-(-0.0339384 -0.393575 0)
-(0.00660426 0.0201117 0)
-(0.00459421 0.394683 0)
-(-0.0782881 0.324231 0)
-(-0.0757814 0.537292 0)
-(-0.192919 0.876977 0)
-(-0.213285 0.945702 0)
-(-0.226764 0.860683 0)
-(-0.131272 0.728648 0)
-(-0.0816488 0.605627 0)
-(-0.111472 0.506008 0)
-(-0.0348215 0.317314 0)
-(-0.00210775 0.152294 0)
-(0.00985953 0.0973508 0)
-(0.0183181 0.0927687 0)
-(0.0012309 0.230642 0)
-(-0.0569869 0.400433 0)
-(-0.0518154 0.446686 0)
-(-0.0524795 0.394719 0)
-(-0.0520397 0.245992 0)
-(-0.00898284 0.31004 0)
-(-0.00936986 0.286268 0)
-(-0.0120188 -0.15093 0)
-(-0.00124509 -0.580516 0)
-(-0.0508386 -0.41997 0)
-(-0.0574098 -0.317123 0)
-(-0.0807306 -0.0281494 0)
-(-0.0188234 0.319458 0)
-(-0.0500477 0.355009 0)
-(-0.18666 0.606264 0)
-(-0.228665 0.86669 0)
-(-0.235455 0.918083 0)
-(-0.228263 0.860398 0)
-(-0.15448 0.705207 0)
-(-0.14404 0.59085 0)
-(-0.144805 0.451652 0)
-(-0.064383 0.261286 0)
-(-0.0814582 0.171595 0)
-(-0.052395 0.124168 0)
-(-0.079759 0.112212 0)
-(-0.0406262 0.247633 0)
-(-0.0418178 0.394852 0)
-(-0.0307752 0.433291 0)
-(-0.0254287 0.370634 0)
-(-0.0530538 0.230166 0)
-(-0.035095 0.271946 0)
-(0.0150094 0.276405 0)
-(-0.0448812 -0.16052 0)
-(0.0240896 -0.513333 0)
-(-0.0863335 -0.367498 0)
-(-0.0688123 -0.244121 0)
-(-0.0890785 -0.0317175 0)
-(-0.0793237 0.297982 0)
-(-0.0563717 0.500362 0)
-(-0.161074 0.715071 0)
-(-0.180122 0.877156 0)
-(-0.173559 0.920054 0)
-(-0.171918 0.866964 0)
-(-0.128901 0.69887 0)
-(-0.148239 0.54928 0)
-(-0.150545 0.380671 0)
-(-0.103008 0.22971 0)
-(-0.141783 0.152239 0)
-(-0.110652 0.0932229 0)
-(-0.125519 0.0795343 0)
-(-0.0618407 0.205492 0)
-(-0.0268184 0.366537 0)
-(0.00436284 0.417029 0)
-(0.026955 0.394564 0)
-(-0.041 0.243698 0)
-(-0.0189685 0.207076 0)
-(0.0171521 0.242314 0)
-(-0.0627274 -0.176441 0)
-(-0.00469549 -0.417746 0)
-(-0.0682657 -0.25485 0)
-(-0.0446811 -0.0716016 0)
-(-0.134864 0.119087 0)
-(-0.056723 0.314636 0)
-(0.0246377 0.540308 0)
-(-0.0355549 0.736661 0)
-(-0.0261421 0.869366 0)
-(-0.00338725 0.893001 0)
-(-0.0280542 0.844498 0)
-(-0.0501085 0.624275 0)
-(-0.108064 0.461067 0)
-(-0.101965 0.336476 0)
-(-0.12582 0.239797 0)
-(-0.145465 0.136284 0)
-(-0.133991 0.0647587 0)
-(-0.119506 0.0500433 0)
-(-0.0944102 0.094431 0)
-(-0.0381739 0.265869 0)
-(-0.00181084 0.369962 0)
-(0.0191126 0.386683 0)
-(-0.0132707 0.296248 0)
-(-0.00503545 0.221029 0)
-(-0.00360394 0.230115 0)
-(-0.00387831 -0.193514 0)
-(-0.00124815 -0.396263 0)
-(0.000659186 -0.217313 0)
-(-0.0149599 -0.0227759 0)
-(-0.103082 0.153274 0)
-(-0.00881352 0.316591 0)
-(0.00697105 0.54472 0)
-(0.0683759 0.790587 0)
-(0.0881708 0.875543 0)
-(0.131051 0.8854 0)
-(0.153055 0.843528 0)
-(0.102832 0.667216 0)
-(0.0100483 0.457964 0)
-(-0.00472595 0.35735 0)
-(-0.0704871 0.266542 0)
-(-0.075944 0.162638 0)
-(-0.134987 0.10004 0)
-(-0.169857 0.0541053 0)
-(-0.207495 0.0299362 0)
-(-0.138875 0.161513 0)
-(-0.0741671 0.297873 0)
-(-0.0528094 0.349883 0)
-(-0.0572178 0.283572 0)
-(-0.0475208 0.28319 0)
-(-0.0837696 0.21918 0)
-(0.119373 -0.13034 0)
-(0.0140292 -0.407655 0)
-(0.0281799 -0.202569 0)
-(0.0157554 0.0550778 0)
-(-0.0407486 0.262239 0)
-(-0.04835 0.338458 0)
-(0.00184659 0.510997 0)
-(0.107529 0.744421 0)
-(0.13474 0.815296 0)
-(0.180758 0.807629 0)
-(0.216659 0.768895 0)
-(0.242042 0.668272 0)
-(0.178217 0.522521 0)
-(0.145086 0.398864 0)
-(0.111679 0.303903 0)
-(0.0873781 0.258368 0)
-(-0.0130921 0.160195 0)
-(-0.123084 0.0292317 0)
-(-0.154503 -0.0349541 0)
-(-0.115384 0.0116656 0)
-(-0.0448117 0.209472 0)
-(-0.0254027 0.339661 0)
-(-0.0205712 0.324028 0)
-(-0.0782689 0.347256 0)
-(-0.151594 0.0851155 0)
-(0.161857 -0.159066 0)
-(-0.00079583 -0.510744 0)
-(0.0367659 -0.322731 0)
-(0.00436837 -0.0601892 0)
-(-0.00162217 0.217638 0)
-(-0.042506 0.298305 0)
-(-0.0209705 0.3821 0)
-(0.0390537 0.623276 0)
-(0.0572121 0.767531 0)
-(0.109408 0.757204 0)
-(0.163441 0.718129 0)
-(0.212964 0.624803 0)
-(0.223163 0.512125 0)
-(0.224942 0.398333 0)
-(0.209707 0.283173 0)
-(0.199997 0.249508 0)
-(0.179774 0.249769 0)
-(0.1404 0.204056 0)
-(0.0621226 0.173019 0)
-(-0.0350832 0.128112 0)
-(0.0651027 0.207725 0)
-(0.0774832 0.365649 0)
-(0.105103 0.406896 0)
-(0.0139424 0.418387 0)
-(-0.0534702 0.0236424 0)
-(-0.0254968 -0.179775 0)
-(-0.0197414 -0.523111 0)
-(-0.0151767 -0.382117 0)
-(-0.0652401 -0.152882 0)
-(-0.131157 0.0127455 0)
-(-0.127327 0.158798 0)
-(-0.207669 0.304087 0)
-(-0.214544 0.502758 0)
-(-0.156959 0.613397 0)
-(-0.0441714 0.605997 0)
-(0.0694555 0.56978 0)
-(0.175682 0.52382 0)
-(0.234886 0.458995 0)
-(0.293526 0.368076 0)
-(0.315869 0.310514 0)
-(0.320004 0.282308 0)
-(0.320285 0.23218 0)
-(0.310034 0.209118 0)
-(0.285357 0.216183 0)
-(0.18124 0.239452 0)
-(0.154706 0.327359 0)
-(0.104107 0.460736 0)
-(0.127681 0.596384 0)
-(0.0510406 0.550831 0)
-(0.0306224 0.0289253 0)
-(-0.149458 -0.312758 0)
-(-0.0571538 -0.224533 0)
-(-0.103833 -0.0821527 0)
-(-0.0510103 0.0584673 0)
-(-0.181429 0.178163 0)
-(-0.229988 0.241476 0)
-(-0.291735 0.279832 0)
-(-0.283538 0.350373 0)
-(-0.186892 0.40339 0)
-(-0.0594935 0.366249 0)
-(0.0451803 0.36991 0)
-(0.172757 0.36527 0)
-(0.244939 0.345462 0)
-(0.323222 0.290138 0)
-(0.36125 0.24977 0)
-(0.363276 0.249649 0)
-(0.34094 0.248581 0)
-(0.310182 0.260333 0)
-(0.285814 0.318668 0)
-(0.195601 0.379669 0)
-(0.121694 0.463151 0)
-(0.0237203 0.587949 0)
-(0.00940268 0.674559 0)
-(0.00861108 0.515413 0)
-(0.105533 0.0412871 0)
-(-0.140579 -0.275062 0)
-(-0.00876215 -0.107407 0)
-(-0.0431207 0.164546 0)
-(-0.020213 0.373575 0)
-(-0.0400042 0.390338 0)
-(-0.176577 0.366413 0)
-(-0.231296 0.369062 0)
-(-0.235105 0.376687 0)
-(-0.167183 0.327083 0)
-(-0.0749037 0.290792 0)
-(0.00657539 0.294359 0)
-(0.111368 0.279913 0)
-(0.195217 0.271733 0)
-(0.254655 0.249068 0)
-(0.278169 0.250767 0)
-(0.274064 0.283095 0)
-(0.214829 0.321707 0)
-(0.165297 0.378281 0)
-(0.0980425 0.427816 0)
-(0.0576529 0.47275 0)
-(-0.0354664 0.552169 0)
-(-0.119782 0.680849 0)
-(-0.136409 0.742336 0)
-(-0.085715 0.395962 0)
-(0.168009 0.105932 0)
-(-0.0908044 -0.0903563 0)
-(0.00751634 -0.107811 0)
-(0.0261208 0.105356 0)
-(0.0155522 0.429857 0)
-(0.029345 0.598991 0)
-(-0.0304323 0.606508 0)
-(-0.108105 0.425044 0)
-(-0.148714 0.310853 0)
-(-0.153614 0.249443 0)
-(-0.111718 0.166168 0)
-(-0.029903 0.13086 0)
-(0.052302 0.140123 0)
-(0.12806 0.161011 0)
-(0.151882 0.196802 0)
-(0.162078 0.232077 0)
-(0.139486 0.336437 0)
-(0.0828776 0.407984 0)
-(0.0467674 0.422546 0)
-(0.0174912 0.482975 0)
-(-0.0207265 0.574779 0)
-(-0.118092 0.710429 0)
-(-0.169671 0.79938 0)
-(-0.172639 0.65219 0)
-(-0.11318 0.163768 0)
-(0.0740119 0.0678705 0)
-(-0.032643 -0.0496032 0)
-(-0.00467146 -0.196429 0)
-(0.0451271 0.0354147 0)
-(-0.00981724 0.395284 0)
-(0.00606257 0.570846 0)
-(0.0515557 0.578723 0)
-(0.0396863 0.49984 0)
-(-0.00620084 0.334399 0)
-(-0.0336259 0.149798 0)
-(-0.0316543 0.0154754 0)
-(0.0455227 -0.0230972 0)
-(0.113372 0.0174697 0)
-(0.129284 0.0963977 0)
-(0.126463 0.210909 0)
-(0.0852588 0.289155 0)
-(0.0550623 0.410565 0)
-(0.0195341 0.512649 0)
-(-0.0181692 0.504224 0)
-(-0.0149237 0.548821 0)
-(-0.0923979 0.680424 0)
-(-0.14648 0.781489 0)
-(-0.18875 0.793219 0)
-(-0.0995924 0.524549 0)
-(-0.0040145 0.123256 0)
-(-0.12727 0.0341329 0)
-(0.0807081 -0.1467 0)
-(-0.00076019 -0.220549 0)
-(-0.013215 0.0105428 0)
-(-0.0298836 0.380443 0)
-(-0.0549821 0.471697 0)
-(0.0210394 0.514742 0)
-(0.0386774 0.436949 0)
-(0.060202 0.289638 0)
-(0.0838186 0.126877 0)
-(0.127805 -0.0266268 0)
-(0.137739 -0.0859074 0)
-(0.154206 -0.0472625 0)
-(0.132975 0.0591954 0)
-(0.0577565 0.224334 0)
-(-0.0213538 0.339879 0)
-(-0.0332973 0.439851 0)
-(-0.0337095 0.523317 0)
-(-0.0384002 0.538151 0)
-(-0.0543147 0.675268 0)
-(-0.130406 0.822794 0)
-(-0.140645 0.850869 0)
-(-0.186935 0.754907 0)
-(-0.0941667 0.359312 0)
-(0.000341583 0.118548 0)
-(-0.0837424 0.0538106 0)
-(-0.0108504 -0.170567 0)
-(0.00485081 -0.12704 0)
-(-0.0652925 0.0601908 0)
-(-0.0073192 0.379985 0)
-(-0.044286 0.46143 0)
-(-0.019585 0.403637 0)
-(0.0148553 0.386601 0)
-(0.0394496 0.267879 0)
-(0.0689075 0.0881942 0)
-(0.0927399 -0.0355481 0)
-(0.121513 -0.0924899 0)
-(0.0744564 -0.0575202 0)
-(0.00203815 0.0792308 0)
-(-0.0688985 0.280327 0)
-(-0.0846886 0.331054 0)
-(-0.0574481 0.394378 0)
-(-0.046738 0.495183 0)
-(-0.0569556 0.589143 0)
-(-0.0488666 0.762575 0)
-(-0.0837662 0.837151 0)
-(-0.0362952 0.864824 0)
-(-0.0872404 0.649347 0)
-(-0.0930859 0.196317 0)
-(-0.113837 0.0629803 0)
-(-0.00634958 -0.0393083 0)
-(-0.0939062 -0.248063 0)
-(0.027026 -0.0449289 0)
-(-0.0796617 0.10423 0)
-(0.0481566 0.393231 0)
-(-0.00985512 0.510459 0)
-(-0.0512572 0.422027 0)
-(-0.0186494 0.342818 0)
-(-0.0211694 0.232334 0)
-(0.0294272 0.124964 0)
-(0.014583 0.0700108 0)
-(-0.0550495 0.0357735 0)
-(-0.107019 0.0359347 0)
-(-0.139789 0.132879 0)
-(-0.127426 0.231361 0)
-(-0.0955142 0.249451 0)
-(-0.0786527 0.289923 0)
-(-0.0537554 0.444587 0)
-(-0.0623488 0.568098 0)
-(-0.0301118 0.713906 0)
-(-0.0125989 0.789553 0)
-(0.0365551 0.796701 0)
-(0.0558399 0.599649 0)
-(0.0385447 0.174216 0)
-(-0.0856235 -0.0928018 0)
-(0.0290259 -0.182754 0)
-(-0.0410914 -0.319952 0)
-(-0.00349083 -0.0217508 0)
-(-0.0159245 0.100502 0)
-(0.0344982 0.382244 0)
-(0.0297407 0.644911 0)
-(-0.0726894 0.479895 0)
-(-0.0526846 0.355177 0)
-(-0.0700315 0.256062 0)
-(-0.0668595 0.189971 0)
-(-0.117863 0.161359 0)
-(-0.179612 0.09919 0)
-(-0.211369 0.0868543 0)
-(-0.215556 0.118227 0)
-(-0.177735 0.203563 0)
-(-0.133124 0.227237 0)
-(-0.134022 0.267812 0)
-(-0.100864 0.387906 0)
-(-0.0866887 0.513985 0)
-(-0.0417419 0.628328 0)
-(0.0193697 0.680555 0)
-(0.0710356 0.67808 0)
-(0.0698951 0.464672 0)
-(0.11105 0.244453 0)
-(0.038762 0.135977 0)
-(-0.00618444 -0.0741662 0)
-(-0.0111672 -0.29923 0)
-(-0.00883044 -0.0159959 0)
-(0.0644642 0.0949305 0)
-(0.0171104 0.37312 0)
-(0.0470784 0.764826 0)
-(-0.0441168 0.64005 0)
-(-0.0764224 0.409611 0)
-(-0.11031 0.312174 0)
-(-0.145673 0.274772 0)
-(-0.151255 0.253988 0)
-(-0.17977 0.188627 0)
-(-0.224372 0.128936 0)
-(-0.244101 0.115674 0)
-(-0.23125 0.129625 0)
-(-0.181473 0.198005 0)
-(-0.161137 0.233946 0)
-(-0.07742 0.323917 0)
-(-0.0167313 0.436184 0)
-(0.0600125 0.512343 0)
-(0.143579 0.574979 0)
-(0.199178 0.574293 0)
-(0.187832 0.441358 0)
-(0.173177 0.232049 0)
-(0.102517 0.0830313 0)
-(0.00562395 -0.157521 0)
-(0.0137379 -0.348099 0)
-(-0.00209802 -0.126714 0)
-(0.0579357 0.00341209 0)
-(-0.00393709 0.30359 0)
-(0.0129365 0.749648 0)
-(0.00636471 0.717602 0)
-(-0.0473581 0.491794 0)
-(-0.0940097 0.314532 0)
-(-0.120948 0.241443 0)
-(-0.117316 0.222363 0)
-(-0.0950772 0.249163 0)
-(-0.143263 0.21708 0)
-(-0.186579 0.146907 0)
-(-0.186906 0.129444 0)
-(-0.172615 0.132459 0)
-(-0.141689 0.209054 0)
-(-0.065028 0.288772 0)
-(0.0109694 0.374736 0)
-(0.107316 0.435624 0)
-(0.205873 0.489364 0)
-(0.241668 0.490961 0)
-(0.261295 0.418904 0)
-(0.208797 0.301695 0)
-(0.14754 0.189503 0)
-(0.052205 -0.0227262 0)
-(-0.000226005 -0.20319 0)
-(0.0149858 -0.11323 0)
-(-0.0251609 -0.0172732 0)
-(-0.0675066 0.234318 0)
-(-0.0247121 0.61655 0)
-(0.0346177 0.675542 0)
-(0.0404307 0.495464 0)
-(0.0301441 0.317745 0)
-(-0.00145274 0.227923 0)
-(-0.0079058 0.168486 0)
-(0.00881478 0.178744 0)
-(0.0142094 0.184652 0)
-(0.0109365 0.183289 0)
-(-0.0504834 0.143603 0)
-(-0.0687759 0.102511 0)
-(-0.0492016 0.084267 0)
-(-0.0205119 0.145011 0)
-(0.0207946 0.212318 0)
-(0.103694 0.264198 0)
-(0.124572 0.403862 0)
-(0.118797 0.472333 0)
-(0.135576 0.426056 0)
-(0.102809 0.409622 0)
-(0.090979 0.367401 0)
-(0.0439372 0.239235 0)
-(0.0228147 0.109459 0)
-(0.000729784 -0.0150522 0)
-(-0.06967 0.0854803 0)
-(-0.101667 0.236864 0)
-(-0.0786541 0.451445 0)
-(0.0279657 0.538601 0)
-(0.0720736 0.429777 0)
-(0.0970121 0.304859 0)
-(0.0832798 0.254486 0)
-(0.0646138 0.230094 0)
-(0.0526706 0.229286 0)
-(0.0521812 0.222326 0)
-(0.0524684 0.223521 0)
-(0.028205 0.222374 0)
-(-0.0120505 0.147458 0)
-(-0.0247418 0.0926673 0)
-(-0.0360528 0.0788476 0)
-(-0.0034036 0.0951646 0)
-(-0.0104874 0.166043 0)
-(-0.0235465 0.334683 0)
-(-0.0254866 0.420683 0)
-(0.0140892 0.439067 0)
-(0.00318077 0.423386 0)
-(0.0406603 0.400135 0)
-(0.0220917 0.267533 0)
-(0.00419795 0.0769291 0)
-(-0.0556798 0.221124 0)
-(-0.111416 0.244073 0)
-(-0.113138 0.29068 0)
-(-0.084981 0.366281 0)
-(0.0340627 0.390914 0)
-(0.112319 0.349694 0)
-(0.153546 0.285598 0)
-(0.155711 0.257537 0)
-(0.172464 0.234024 0)
-(0.165254 0.227225 0)
-(0.160556 0.229587 0)
-(0.150373 0.232914 0)
-(0.150369 0.243911 0)
-(0.119925 0.267488 0)
-(0.042383 0.237492 0)
-(-0.0164234 0.217229 0)
-(-0.057532 0.232229 0)
-(-0.118922 0.271383 0)
-(-0.118183 0.310308 0)
-(-0.0826988 0.370053 0)
-(-0.024234 0.379997 0)
-(0.013069 0.377998 0)
-(0.0649385 0.363736 0)
-(0.0726979 0.330489 0)
-(0.0372599 0.271168 0)
-(-0.0227592 0.166587 0)
-(-0.045109 0.162179 0)
-(-0.057107 0.214093 0)
-(-0.0355015 0.22262 0)
-(0.00610955 0.217134 0)
-(0.0318206 0.204924 0)
-(0.0588701 0.187467 0)
-(0.0567559 0.163217 0)
-(0.0643046 0.126832 0)
-(0.051835 0.11628 0)
-(0.0491894 0.108254 0)
-(0.0365407 0.106943 0)
-(0.0338923 0.116717 0)
-(0.0233242 0.152776 0)
-(0.0192095 0.180815 0)
-(-0.00187597 0.192335 0)
-(-0.0265211 0.195875 0)
-(-0.0372467 0.196655 0)
-(-0.0502362 0.192021 0)
-(-0.0304718 0.185786 0)
-(-0.0135897 0.212906 0)
-(0.00755532 0.221834 0)
-(0.023687 0.239275 0)
-(0.0393698 0.249142 0)
-(0.0219197 0.218769 0)
-(-0.000889062 0.0372328 0)
-(-0.0109179 0.0361254 0)
-(-0.0118703 0.00876492 0)
-(-0.000399272 -0.000965297 0)
-(0.00476532 0.00485894 0)
-(0.0201189 -0.00846372 0)
-(0.023538 -0.0184024 0)
-(0.0329939 -0.0161307 0)
-(0.0271365 -0.011824 0)
-(0.0191704 -0.00626783 0)
-(0.00721846 -0.00269044 0)
-(-0.00380106 0.000204209 0)
-(-0.0155682 0.0075794 0)
-(-0.0166443 0.00969329 0)
-(-0.0144695 -0.0106955 0)
-(-0.017289 -0.00276448 0)
-(-0.0203945 0.000486899 0)
-(-0.0203629 0.0173321 0)
-(-0.0173736 0.0131108 0)
-(-0.0210876 0.0247896 0)
-(-0.0200303 0.027252 0)
-(-0.0163761 0.0280907 0)
-(-0.0184973 0.0168725 0)
-(-0.00814656 0.0214623 0)
-(-0.00635894 0.0515029 0)
-(0.00263785 0.105431 0)
-(0.00784603 0.0774799 0)
-(0.012794 0.0476885 0)
-(0.0100005 0.0337762 0)
-(0.00998213 0.0151447 0)
-(0.013375 0.014538 0)
-(0.01064 0.0243762 0)
-(0.0108938 0.0333939 0)
-(0.00708949 0.0599289 0)
-(0.0063219 0.0752113 0)
-(0.00352056 0.0902293 0)
-(0.00303961 0.0930398 0)
-(-0.000739618 0.0936394 0)
-(0.00113638 0.102865 0)
-(-0.0014072 0.129181 0)
-(-0.00470629 0.142469 0)
-(-0.00826279 0.13966 0)
-(-0.00959612 0.119403 0)
-(-0.00811088 0.102042 0)
-(-0.0136462 0.0818668 0)
-(-0.0104404 0.0797099 0)
-(-0.0111963 0.0954558 0)
-(-0.00904115 0.0998635 0)
-(-0.00818974 0.111696 0)
-(-0.00420239 0.0874926 0)
-(0.00832122 0.0294026 0)
-(0.0163569 0.0257081 0)
-(0.0156461 0.0162097 0)
-(0.0138831 0.0138027 0)
-(0.00941427 0.00252724 0)
-(9.23742e-05 -0.00317251 0)
-(-0.00794842 -0.0030951 0)
-(-0.0156632 0.00393349 0)
-(-0.0202418 0.0137601 0)
-(-0.0213532 0.0180685 0)
-(-0.0213409 0.0215884 0)
-(-0.0191931 0.0235439 0)
-(-0.0195375 0.0252773 0)
-(-0.0218451 0.0213986 0)
-(-0.0223475 0.020223 0)
-(-0.0169932 0.0275293 0)
-(-0.0112268 0.0304899 0)
-(-0.00801043 0.0289567 0)
-(-0.0073384 0.0375701 0)
-(-0.00492998 0.0398616 0)
-(-0.00748991 0.0345227 0)
-(-0.004897 0.0354485 0)
-(-0.00389305 0.0275279 0)
-(-0.00547738 0.0284404 0)
-(-0.000114832 0.0422311 0)
-(0.00323697 0.0418529 0)
-(0.00693436 0.0541668 0)
-(0.00533842 0.0458649 0)
-(0.00464955 0.040595 0)
-(0.00332081 0.0409023 0)
-(-0.00143932 0.047033 0)
-(-0.00665501 0.0519916 0)
-(-0.0122429 0.0551032 0)
-(-0.0151883 0.0621665 0)
-(-0.0153335 0.069971 0)
-(-0.0145141 0.075572 0)
-(-0.0129823 0.0810442 0)
-(-0.0122081 0.0901706 0)
-(-0.0110202 0.102835 0)
-(-0.0135107 0.108334 0)
-(-0.0158171 0.109475 0)
-(-0.0162267 0.109277 0)
-(-0.0163757 0.102745 0)
-(-0.0156424 0.0863168 0)
-(-0.0130092 0.0736925 0)
-(-0.0104344 0.0721 0)
-(-0.00722615 0.0774299 0)
-(-0.00555619 0.0914663 0)
-(-0.00665705 0.0914474 0)
-(-0.00388641 0.0642169 0)
-(-0.000204964 0.0122315 0)
-(-0.000228595 0.027382 0)
-(-0.00242514 0.0268567 0)
-(-0.00541226 0.0237125 0)
-(-0.00911667 0.022152 0)
-(-0.0132311 0.0244865 0)
-(-0.0180855 0.0270152 0)
-(-0.0230586 0.0292667 0)
-(-0.0276128 0.0271902 0)
-(-0.0307595 0.0236217 0)
-(-0.0320236 0.0236937 0)
-(-0.0338763 0.0249443 0)
-(-0.0342174 0.0288376 0)
-(-0.0335568 0.0313019 0)
-(-0.030145 0.0383379 0)
-(-0.025123 0.0410185 0)
-(-0.0191966 0.0391962 0)
-(-0.0134511 0.0351858 0)
-(-0.00825613 0.0375324 0)
-(-0.00659678 0.0355623 0)
-(-0.00566839 0.0288518 0)
-(-0.00426853 0.0328891 0)
-(-0.00309202 0.0334201 0)
-(-0.00129145 0.0336145 0)
-(-0.000383509 0.026633 0)
-(0.000388305 0.0381359 0)
-(0.000140119 0.0543182 0)
-(-0.00175165 0.0522751 0)
-(-0.00495678 0.0506859 0)
-(-0.00896256 0.0529871 0)
-(-0.012648 0.0619988 0)
-(-0.0161942 0.0682708 0)
-(-0.0195339 0.0709862 0)
-(-0.0214304 0.0734389 0)
-(-0.0230337 0.0738665 0)
-(-0.0240072 0.0763829 0)
-(-0.0229048 0.0799903 0)
-(-0.0218983 0.0828124 0)
-(-0.0207069 0.0874317 0)
-(-0.0196511 0.0831635 0)
-(-0.0185951 0.0784909 0)
-(-0.0173721 0.0769959 0)
-(-0.0162813 0.0715107 0)
-(-0.0147273 0.0647173 0)
-(-0.0109883 0.0612385 0)
-(-0.0070107 0.0604651 0)
-(-0.00428308 0.0650219 0)
-(-0.00210055 0.0782312 0)
-(-0.00234165 0.0785294 0)
-(-0.00068969 0.0538614 0)
-(0.000768602 0.0152334 0)
-(0.00101087 0.0362592 0)
-(-0.0014709 0.0426089 0)
-(-0.00432248 0.0439428 0)
-(-0.00769063 0.043786 0)
-(-0.00998155 0.0450119 0)
-(-0.0118706 0.0469298 0)
-(-0.0143337 0.0456528 0)
-(-0.0159306 0.0397406 0)
-(-0.0176695 0.0344576 0)
-(-0.0189501 0.028382 0)
-(-0.0196868 0.0257259 0)
-(-0.0205149 0.0289217 0)
-(-0.019904 0.0319103 0)
-(-0.0173981 0.0391277 0)
-(-0.0159314 0.0417027 0)
-(-0.0145701 0.0395478 0)
-(-0.0128388 0.0352527 0)
-(-0.0116716 0.0312417 0)
-(-0.00974169 0.0241002 0)
-(-0.00760504 0.0194289 0)
-(-0.00574268 0.0276763 0)
-(-0.00450226 0.0347502 0)
-(-0.00331936 0.0363018 0)
-(-0.0015274 0.0255251 0)
-(0.000759533 0.0305284 0)
-(0.000211934 0.0555467 0)
-(-0.00183273 0.0604757 0)
-(-0.00302484 0.060675 0)
-(-0.00550673 0.0617753 0)
-(-0.0074195 0.0673607 0)
-(-0.00973395 0.0739986 0)
-(-0.0112497 0.0759676 0)
-(-0.0121034 0.0766357 0)
-(-0.0129594 0.0765552 0)
-(-0.0135983 0.0761909 0)
-(-0.0148322 0.0791906 0)
-(-0.0148402 0.0790924 0)
-(-0.0144451 0.0759001 0)
-(-0.0140224 0.069556 0)
-(-0.0133596 0.0676323 0)
-(-0.012054 0.0651036 0)
-(-0.011161 0.0603916 0)
-(-0.00981228 0.0529708 0)
-(-0.00828881 0.0475987 0)
-(-0.0058001 0.04671 0)
-(-0.00381277 0.0534496 0)
-(-0.00172907 0.0678406 0)
-(-0.00249782 0.0670913 0)
-(-0.00141651 0.0382277 0)
-(-0.000631535 0.0163944 0)
-(0.00116823 0.0451877 0)
-(-0.00048028 0.0531234 0)
-(-0.00211115 0.0553757 0)
-(-0.00426904 0.056869 0)
-(-0.00556868 0.0578019 0)
-(-0.00678294 0.0588073 0)
-(-0.00734732 0.0544393 0)
-(-0.00791982 0.0470128 0)
-(-0.00816387 0.0414441 0)
-(-0.00913804 0.0362031 0)
-(-0.00924399 0.0321556 0)
-(-0.00869927 0.0315201 0)
-(-0.00804335 0.0340917 0)
-(-0.00860439 0.0407039 0)
-(-0.00962969 0.0411691 0)
-(-0.0096443 0.0389076 0)
-(-0.00954651 0.0341963 0)
-(-0.00912947 0.0289834 0)
-(-0.00888313 0.0191947 0)
-(-0.00688196 0.0135823 0)
-(-0.00507437 0.0227161 0)
-(-0.00364652 0.0360645 0)
-(-0.000977042 0.0399214 0)
-(-0.000295946 0.0210058 0)
-(0.000661274 0.0263467 0)
-(0.00121277 0.0524322 0)
-(0.00181305 0.0648208 0)
-(0.00102348 0.0661749 0)
-(-4.21879e-05 0.0665862 0)
-(-0.00153058 0.0698841 0)
-(-0.00269932 0.0750705 0)
-(-0.00344427 0.0753113 0)
-(-0.00410122 0.075549 0)
-(-0.00529693 0.0759204 0)
-(-0.00632764 0.0756554 0)
-(-0.00857929 0.0748667 0)
-(-0.00947641 0.0733598 0)
-(-0.0107941 0.0722133 0)
-(-0.010854 0.0697039 0)
-(-0.0102928 0.0666245 0)
-(-0.00963178 0.0614168 0)
-(-0.00908917 0.0558574 0)
-(-0.00837295 0.0478907 0)
-(-0.00766772 0.0392212 0)
-(-0.00585876 0.0344989 0)
-(-0.00324352 0.0428294 0)
-(-0.00206952 0.05481 0)
-(-0.00192363 0.0560593 0)
-(-0.000889134 0.0316408 0)
-(-8.61034e-05 0.0148961 0)
-(0.000634069 0.0452522 0)
-(0.000627484 0.056128 0)
-(-0.000661189 0.062166 0)
-(-0.00211933 0.0651315 0)
-(-0.00379582 0.0664434 0)
-(-0.0049347 0.0656931 0)
-(-0.00556715 0.0603197 0)
-(-0.00621368 0.0539765 0)
-(-0.0064416 0.0491056 0)
-(-0.00665564 0.0462538 0)
-(-0.00688395 0.0422472 0)
-(-0.00716632 0.039176 0)
-(-0.0071072 0.0404775 0)
-(-0.00720542 0.0423664 0)
-(-0.00652677 0.0416549 0)
-(-0.00691073 0.0392317 0)
-(-0.00706747 0.034473 0)
-(-0.00778003 0.0291014 0)
-(-0.0082399 0.0166819 0)
-(-0.00590701 0.00709291 0)
-(-0.0026857 0.0173647 0)
-(0.000246555 0.0365611 0)
-(0.000932857 0.040609 0)
-(1.43618e-05 0.0181046 0)
-(6.90221e-05 0.0227105 0)
-(0.000972261 0.0483872 0)
-(0.00210597 0.0653144 0)
-(0.00177564 0.0698403 0)
-(0.00179897 0.0711708 0)
-(0.000282096 0.0736208 0)
-(-0.000214332 0.0765497 0)
-(-0.000617432 0.0756276 0)
-(-0.000590557 0.0748067 0)
-(-0.00166972 0.0742995 0)
-(-0.00217442 0.0740852 0)
-(-0.00362413 0.0730762 0)
-(-0.00442812 0.071181 0)
-(-0.00570316 0.0692549 0)
-(-0.00662594 0.065727 0)
-(-0.00929225 0.0628918 0)
-(-0.0099458 0.0598605 0)
-(-0.0102085 0.054762 0)
-(-0.0101435 0.0476179 0)
-(-0.00947758 0.0320287 0)
-(-0.00795288 0.0192686 0)
-(-0.00409102 0.0261446 0)
-(-0.00136555 0.0437056 0)
-(-0.000273246 0.0535679 0)
-(-0.000468439 0.0307009 0)
-(-0.000482653 0.0148155 0)
-(-0.000210333 0.0430514 0)
-(-0.000649454 0.0565092 0)
-(-0.000709084 0.0651379 0)
-(-0.00183836 0.0707304 0)
-(-0.00260624 0.0731516 0)
-(-0.00289267 0.0701625 0)
-(-0.00297848 0.0635408 0)
-(-0.00290129 0.0587764 0)
-(-0.00246732 0.0553257 0)
-(-0.00232053 0.0531068 0)
-(-0.00202011 0.050043 0)
-(-0.00239146 0.0464371 0)
-(-0.00288795 0.0482332 0)
-(-0.00358318 0.0530222 0)
-(-0.00403609 0.0520443 0)
-(-0.00461004 0.0438574 0)
-(-0.00507318 0.0379698 0)
-(-0.00487897 0.0300219 0)
-(-0.00503163 0.0148737 0)
-(-0.0044699 -0.00231427 0)
-(-0.00180411 0.00560353 0)
-(0.00111937 0.0307654 0)
-(0.00137975 0.0415677 0)
-(-6.5017e-05 0.0192573 0)
-(0.000154227 0.0221408 0)
-(0.000831073 0.0465661 0)
-(0.00196378 0.0643843 0)
-(0.000991177 0.0703509 0)
-(0.00192951 0.0731564 0)
-(0.00215767 0.0738976 0)
-(0.00361954 0.0749689 0)
-(0.0032643 0.0732098 0)
-(0.00274641 0.0713266 0)
-(0.00177121 0.0703531 0)
-(0.00119458 0.0705353 0)
-(0.000457795 0.0705964 0)
-(-0.00105068 0.0704228 0)
-(-0.00282823 0.0692495 0)
-(-0.00283751 0.0655087 0)
-(-0.00271662 0.0624402 0)
-(-0.00394709 0.0594688 0)
-(-0.00682997 0.0525935 0)
-(-0.00896154 0.0449431 0)
-(-0.0113863 0.0284452 0)
-(-0.0101195 0.0094908 0)
-(-0.00576168 0.0110592 0)
-(-0.00141511 0.0339685 0)
-(-0.000184051 0.0535972 0)
-(-0.000390543 0.0309184 0)
-(0.000250334 0.0146883 0)
-(-0.00116077 0.0410085 0)
-(-0.000607842 0.0583253 0)
-(0.000623438 0.0670997 0)
-(0.000626773 0.0703409 0)
-(0.00102934 0.0714644 0)
-(0.00101064 0.0699733 0)
-(0.00215279 0.0679278 0)
-(0.00194893 0.0644388 0)
-(0.00224381 0.0613804 0)
-(0.0018758 0.0585361 0)
-(0.00225657 0.0575628 0)
-(0.002201 0.056449 0)
-(0.00257885 0.0546076 0)
-(0.00194442 0.0556921 0)
-(0.00137974 0.0567111 0)
-(0.000790356 0.0559749 0)
-(-0.000693834 0.0515105 0)
-(-0.00246095 0.0426869 0)
-(-0.00435634 0.0200381 0)
-(-0.0046594 -0.0123244 0)
-(-0.00240587 -0.0112653 0)
-(0.000127061 0.0208291 0)
-(0.00100678 0.0418954 0)
-(0.000178237 0.0204995 0)
-(-3.47705e-05 0.0221259 0)
-(0.000168322 0.0466435 0)
-(0.000606035 0.0581834 0)
-(0.00209966 0.0658211 0)
-(0.00291758 0.0700834 0)
-(0.00373258 0.0710174 0)
-(0.00465223 0.0702379 0)
-(0.00542186 0.0688238 0)
-(0.00634204 0.0688285 0)
-(0.00646058 0.0680056 0)
-(0.00635787 0.0680063 0)
-(0.00541188 0.0674845 0)
-(0.00480507 0.0670948 0)
-(0.00347078 0.0674545 0)
-(0.00225916 0.0654976 0)
-(0.00185056 0.0628573 0)
-(0.00145202 0.0612726 0)
-(0.000794784 0.0576345 0)
-(-0.000266685 0.050504 0)
-(-0.00234926 0.0311307 0)
-(-0.00389543 0.00262073 0)
-(-0.0023423 -0.00187042 0)
-(0.000792318 0.0238221 0)
-(0.00177742 0.0512227 0)
-(-0.000137857 0.0310889 0)
-(-0.000341015 0.0163751 0)
-(0.000693643 0.04145 0)
-(0.00112016 0.0561378 0)
-(0.00168389 0.0637979 0)
-(0.00254669 0.0688043 0)
-(0.00315952 0.0695811 0)
-(0.00401955 0.0683637 0)
-(0.00447847 0.0663724 0)
-(0.00500263 0.0643315 0)
-(0.00572865 0.0636441 0)
-(0.006171 0.0632924 0)
-(0.00667487 0.0633355 0)
-(0.00676439 0.0631104 0)
-(0.00689083 0.0627547 0)
-(0.00700441 0.061495 0)
-(0.00631699 0.0610127 0)
-(0.00571111 0.0604527 0)
-(0.00460875 0.0577279 0)
-(0.0035155 0.0517286 0)
-(0.00139706 0.0307053 0)
-(-3.4248e-05 -0.0103453 0)
-(-0.000763431 -0.0192348 0)
-(-0.00137342 0.0137521 0)
-(-0.000775117 0.0464732 0)
-(-0.000315151 0.026368 0)
-(-0.000277026 0.019399 0)
-(-0.000208676 0.0414544 0)
-(0.000588077 0.054035 0)
-(0.00160943 0.0607068 0)
-(0.002845 0.0648347 0)
-(0.00427534 0.0657852 0)
-(0.00542144 0.0652204 0)
-(0.00659942 0.0646493 0)
-(0.00707241 0.0638414 0)
-(0.00775865 0.0633495 0)
-(0.00813385 0.0635637 0)
-(0.00860942 0.0640182 0)
-(0.00878633 0.0642919 0)
-(0.00906341 0.0647026 0)
-(0.00889552 0.0644635 0)
-(0.00871155 0.0635299 0)
-(0.00877684 0.0627959 0)
-(0.00864766 0.0604613 0)
-(0.00854711 0.0552068 0)
-(0.00812161 0.0370192 0)
-(0.00666832 0.00536132 0)
-(0.00188094 -0.000733165 0)
-(-0.00110206 0.0218729 0)
-(-0.000958377 0.0465305 0)
-(-0.000114652 0.0263982 0)
-)
-;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform (0 0.1 0);
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           nonuniform List<vector>
-25
-(
-(-0.000277026 0.019399 0)
-(-0.000208676 0.0414544 0)
-(0.000588077 0.054035 0)
-(0.00160943 0.0607068 0)
-(0.002845 0.0648347 0)
-(0.00427534 0.0657852 0)
-(0.00542144 0.0652204 0)
-(0.00659942 0.0646493 0)
-(0.00707241 0.0638414 0)
-(0.00775865 0.0633495 0)
-(0.00813385 0.0635637 0)
-(0.00860942 0.0640182 0)
-(0.00878633 0.0642919 0)
-(0.00906341 0.0647026 0)
-(0.00889552 0.0644635 0)
-(0.00871155 0.0635299 0)
-(0.00877684 0.0627959 0)
-(0.00864766 0.0604613 0)
-(0.00854711 0.0552068 0)
-(0.00812161 0.0370192 0)
-(0.00666832 0.00536132 0)
-(0.00188094 -0.000733165 0)
-(-0.00110206 0.0218729 0)
-(-0.000958377 0.0465305 0)
-(-0.000114652 0.0263982 0)
-)
-;
-    }
-
-    walls
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U2 b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U2
deleted file mode 100644
index b77b538211..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/U2
+++ /dev/null
@@ -1,1956 +0,0 @@
-/*--------------------------------*- 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       volVectorField;
-    object      U2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   nonuniform List<vector>
-1875
-(
-(0.141328 -0.587592 0)
-(0.407198 -0.393846 0)
-(0.471126 -0.270619 0)
-(0.508946 -0.195538 0)
-(0.523061 -0.14316 0)
-(0.539622 -0.0977173 0)
-(0.548878 -0.0659859 0)
-(0.567946 -0.0430895 0)
-(0.578326 -0.0279877 0)
-(0.591975 -0.0173755 0)
-(0.598382 -0.00543302 0)
-(0.602371 0.00298469 0)
-(0.602818 0.0244833 0)
-(0.582319 0.0349973 0)
-(0.557426 0.0670562 0)
-(0.490779 0.104966 0)
-(0.411761 0.121197 0)
-(0.29205 0.167622 0)
-(0.205957 0.357008 0)
-(-0.0750581 0.261865 0)
-(-0.182646 0.0455632 0)
-(-0.234558 -0.0957123 0)
-(-0.31884 -0.230828 0)
-(-0.38533 -0.333269 0)
-(-0.121762 -0.618504 0)
-(0.0228774 -0.742864 0)
-(0.082943 -0.271518 0)
-(0.0359799 0.0416798 0)
-(0.0442251 0.0662757 0)
-(0.0605173 0.0354886 0)
-(0.112994 -0.00478512 0)
-(0.143369 -0.0322493 0)
-(0.17737 -0.0416224 0)
-(0.205379 -0.0435591 0)
-(0.244187 -0.0337155 0)
-(0.266524 -0.0279681 0)
-(0.300861 -0.0269897 0)
-(0.315941 -0.00488653 0)
-(0.316896 0.0292872 0)
-(0.304809 0.085202 0)
-(0.295386 0.168277 0)
-(0.247849 0.328991 0)
-(0.18699 0.371779 0)
-(0.162611 0.493281 0)
-(0.164709 0.55336 0)
-(0.0918576 0.406066 0)
-(0.0830756 0.362236 0)
-(0.00846045 0.465409 0)
-(0.0191522 0.0169109 0)
-(-0.0389573 -0.629635 0)
-(0.00479983 -0.807249 0)
-(0.00804917 -0.335873 0)
-(-0.0174928 -0.134114 0)
-(0.023681 -0.185376 0)
-(0.0742247 -0.221152 0)
-(0.121909 -0.203071 0)
-(0.138184 -0.164171 0)
-(0.144453 -0.147616 0)
-(0.15823 -0.150581 0)
-(0.167622 -0.130841 0)
-(0.143162 -0.128813 0)
-(0.102984 -0.0830639 0)
-(0.0521285 0.0406228 0)
-(0.0160529 0.0800667 0)
-(-0.0390595 0.132918 0)
-(-0.0287579 0.27406 0)
-(0.0163274 0.310607 0)
-(-0.00736691 0.323679 0)
-(0.0418154 0.448216 0)
-(-0.00262386 0.49017 0)
-(0.055766 0.294311 0)
-(0.0782353 0.0551085 0)
-(0.0885758 0.187602 0)
-(0.0850894 -0.0224171 0)
-(-0.0188588 -0.690999 0)
-(1.46791e-05 -0.803677 0)
-(-0.00718855 -0.30425 0)
-(0.00650334 -0.0529118 0)
-(0.0244985 -0.195668 0)
-(0.0281027 -0.235278 0)
-(0.022556 -0.178575 0)
-(-0.0117286 -0.0998749 0)
-(-0.0290608 -0.096969 0)
-(-0.0435147 -0.102997 0)
-(-0.0768449 0.0108748 0)
-(-0.114896 0.109529 0)
-(-0.154653 0.112206 0)
-(-0.165648 0.117244 0)
-(-0.155625 0.135812 0)
-(-0.154801 0.168179 0)
-(-0.110043 0.210407 0)
-(-0.0383216 0.235033 0)
-(-0.0761922 0.282187 0)
-(-0.0291805 0.463355 0)
-(-0.0771569 0.473508 0)
-(0.061873 0.172768 0)
-(0.0389505 0.222105 0)
-(0.0221948 0.353828 0)
-(0.0386762 0.176293 0)
-(-0.010499 -0.61329 0)
-(-0.00189533 -0.781055 0)
-(-0.0365181 -0.34555 0)
-(-0.00588702 -0.228562 0)
-(0.0160305 -0.292565 0)
-(0.00260469 -0.28611 0)
-(-0.0356617 -0.180758 0)
-(-0.0873849 -0.103015 0)
-(-0.124531 -0.113136 0)
-(-0.185368 -0.0631684 0)
-(-0.208621 0.0372702 0)
-(-0.202716 0.0563095 0)
-(-0.18878 0.0553577 0)
-(-0.18201 0.0562007 0)
-(-0.173468 0.0744435 0)
-(-0.155375 0.104129 0)
-(-0.134083 0.117301 0)
-(-0.120484 0.202531 0)
-(-0.162523 0.330437 0)
-(-0.164869 0.456317 0)
-(-0.113519 0.322577 0)
-(-0.0114789 0.0362488 0)
-(-0.000529388 0.136233 0)
-(0.00244512 0.230692 0)
-(0.027275 0.0872039 0)
-(0.000467767 -0.633673 0)
-(-0.00325022 -0.732094 0)
-(-0.031785 -0.286604 0)
-(-0.040756 -0.236432 0)
-(-0.0579675 -0.268754 0)
-(-0.0888941 -0.167478 0)
-(-0.131313 -0.00881036 0)
-(-0.147688 0.0451313 0)
-(-0.175941 0.0333486 0)
-(-0.207272 0.0367743 0)
-(-0.20986 0.0381687 0)
-(-0.187629 0.046922 0)
-(-0.178911 0.052913 0)
-(-0.175672 0.0812691 0)
-(-0.177437 0.0960784 0)
-(-0.166475 0.110874 0)
-(-0.179492 0.172139 0)
-(-0.207112 0.31274 0)
-(-0.21512 0.359454 0)
-(-0.213602 0.358721 0)
-(-0.109787 0.0748308 0)
-(-0.0314076 -0.127609 0)
-(0.0103633 0.154496 0)
-(0.0300304 0.266164 0)
-(0.0196886 0.182605 0)
-(-0.00295027 -0.595477 0)
-(-0.00461531 -0.699854 0)
-(-0.0335189 -0.245772 0)
-(-0.0863643 -0.204575 0)
-(-0.125782 -0.206756 0)
-(-0.157489 -0.119514 0)
-(-0.186664 -0.0151862 0)
-(-0.196345 0.0207685 0)
-(-0.217759 0.0158033 0)
-(-0.223696 0.0115586 0)
-(-0.230472 -0.00639501 0)
-(-0.233823 -0.00520494 0)
-(-0.239565 0.0418247 0)
-(-0.241857 0.0782775 0)
-(-0.239917 0.0984028 0)
-(-0.242954 0.157943 0)
-(-0.253126 0.249888 0)
-(-0.249963 0.30908 0)
-(-0.211175 0.327829 0)
-(-0.154898 0.244763 0)
-(-0.021435 -0.106602 0)
-(-0.0262265 -0.215899 0)
-(-0.0155256 0.0490102 0)
-(0.0386338 0.237341 0)
-(-0.0125229 0.217057 0)
-(0.0248543 -0.648682 0)
-(-0.00282494 -0.658135 0)
-(-0.0281092 -0.118291 0)
-(-0.108293 -0.0794797 0)
-(-0.146892 -0.114212 0)
-(-0.166241 -0.00993724 0)
-(-0.199463 0.109011 0)
-(-0.221044 0.127126 0)
-(-0.262537 0.106789 0)
-(-0.280071 0.0874168 0)
-(-0.304304 0.0699351 0)
-(-0.330763 0.0783221 0)
-(-0.346742 0.102479 0)
-(-0.350277 0.118439 0)
-(-0.348213 0.149831 0)
-(-0.342132 0.190307 0)
-(-0.307604 0.226971 0)
-(-0.238452 0.239965 0)
-(-0.126559 0.14176 0)
-(-0.00226976 -0.0514187 0)
-(0.0715288 -0.205662 0)
-(0.0457356 -0.154447 0)
-(-0.0543987 0.033337 0)
-(0.00153217 0.267173 0)
-(-0.0523456 0.260674 0)
-(0.0515815 -0.657791 0)
-(-0.0042388 -0.641036 0)
-(-0.0144542 -0.0231465 0)
-(-0.0924468 0.0221748 0)
-(-0.166495 -0.0535047 0)
-(-0.17046 0.0113704 0)
-(-0.187187 0.154589 0)
-(-0.186326 0.186315 0)
-(-0.22657 0.17605 0)
-(-0.249646 0.147332 0)
-(-0.282787 0.135649 0)
-(-0.308191 0.133375 0)
-(-0.320306 0.133493 0)
-(-0.320954 0.135237 0)
-(-0.316922 0.127562 0)
-(-0.297588 0.0999883 0)
-(-0.268281 0.0341976 0)
-(-0.210512 -0.105244 0)
-(-0.14677 -0.200443 0)
-(-0.095961 -0.218758 0)
-(-0.124224 -0.197037 0)
-(-0.174899 0.0402852 0)
-(-0.203208 0.187373 0)
-(-0.163869 0.226427 0)
-(-0.073401 0.125654 0)
-(0.0648069 -0.651497 0)
-(0.00963547 -0.636309 0)
-(-0.021823 0.0202224 0)
-(0.00442565 0.25421 0)
-(-0.146693 0.0398455 0)
-(-0.163799 0.050874 0)
-(-0.158574 0.161816 0)
-(-0.143021 0.234515 0)
-(-0.149025 0.249563 0)
-(-0.163294 0.23226 0)
-(-0.187975 0.209808 0)
-(-0.204073 0.183553 0)
-(-0.21345 0.158689 0)
-(-0.206414 0.127527 0)
-(-0.200531 0.105585 0)
-(-0.182087 0.0785725 0)
-(-0.165823 0.0386821 0)
-(-0.16238 -0.0363184 0)
-(-0.206799 -0.138972 0)
-(-0.232001 -0.165309 0)
-(-0.315408 -0.075936 0)
-(-0.350429 0.060434 0)
-(-0.317785 0.0804353 0)
-(-0.234297 -0.0199362 0)
-(-0.0537424 -0.326032 0)
-(0.0394164 -0.591598 0)
-(0.0160432 -0.637747 0)
-(-0.0167472 -0.0370706 0)
-(0.0700601 0.319342 0)
-(-0.00011737 0.305692 0)
-(-0.123859 0.0752975 0)
-(-0.129703 0.128666 0)
-(-0.134618 0.210706 0)
-(-0.115309 0.243918 0)
-(-0.113484 0.245536 0)
-(-0.105609 0.233929 0)
-(-0.108059 0.197444 0)
-(-0.103107 0.147911 0)
-(-0.102882 0.111297 0)
-(-0.100469 0.0834879 0)
-(-0.10245 0.0281695 0)
-(-0.110972 -0.00275163 0)
-(-0.123564 -0.0202841 0)
-(-0.171786 -0.0455071 0)
-(-0.243411 0.00730176 0)
-(-0.322536 0.0901807 0)
-(-0.352229 0.0716724 0)
-(-0.298381 -0.101472 0)
-(-0.173246 -0.368227 0)
-(-0.0958428 -0.534607 0)
-(-0.0478101 -0.631696 0)
-(-0.00605675 -0.678005 0)
-(0.0600641 -0.0889499 0)
-(0.0715667 0.140341 0)
-(0.166609 0.523257 0)
-(0.0131515 0.35006 0)
-(-0.0831248 0.202151 0)
-(-0.114929 0.226442 0)
-(-0.117191 0.229745 0)
-(-0.112581 0.218291 0)
-(-0.0884068 0.202984 0)
-(-0.0660003 0.170927 0)
-(-0.0456544 0.134802 0)
-(-0.0359376 0.104045 0)
-(-0.0284461 0.0959227 0)
-(-0.0375488 0.0978522 0)
-(-0.0679028 0.0841385 0)
-(-0.105408 0.0955035 0)
-(-0.142601 0.113502 0)
-(-0.227967 0.15778 0)
-(-0.276289 0.172186 0)
-(-0.290459 0.0160417 0)
-(-0.217142 -0.32267 0)
-(-0.179438 -0.481 0)
-(-0.134738 -0.646593 0)
-(-0.0527305 -0.898435 0)
-(-0.00464843 -0.752723 0)
-(0.0861668 -0.192141 0)
-(0.0832924 -0.018079 0)
-(0.167598 0.506777 0)
-(0.0908788 0.568434 0)
-(-0.0390154 0.433137 0)
-(-0.0992553 0.333121 0)
-(-0.0989457 0.277312 0)
-(-0.117282 0.206658 0)
-(-0.0896135 0.143976 0)
-(-0.0698513 0.107515 0)
-(-0.0283897 0.0784945 0)
-(-0.00755728 0.0598762 0)
-(0.017426 0.0799018 0)
-(0.0281911 0.109849 0)
-(0.0296122 0.148962 0)
-(-0.00329769 0.163455 0)
-(-0.0381909 0.212174 0)
-(-0.134705 0.304022 0)
-(-0.179129 0.27877 0)
-(-0.175798 -0.0424924 0)
-(-0.147938 -0.332053 0)
-(-0.155526 -0.572853 0)
-(-0.0742423 -0.827878 0)
-(-0.031722 -1.06452 0)
-(-0.00497943 -0.816896 0)
-(0.0661569 -0.275501 0)
-(0.0411654 -0.0723348 0)
-(0.115296 0.521128 0)
-(0.0499076 0.771648 0)
-(-0.0285514 0.595736 0)
-(-0.0954843 0.379592 0)
-(-0.0800799 0.30071 0)
-(-0.0779072 0.234122 0)
-(-0.0679635 0.121367 0)
-(-0.0531882 0.0465711 0)
-(-0.0291629 0.00329654 0)
-(0.0105907 -0.00501976 0)
-(0.0266129 0.00723001 0)
-(0.0711656 0.0576663 0)
-(0.0715542 0.144507 0)
-(0.0542078 0.240689 0)
-(-0.0329753 0.395554 0)
-(-0.0922822 0.461433 0)
-(-0.11284 0.294822 0)
-(-0.0661122 -0.0283381 0)
-(-0.107186 -0.369281 0)
-(-0.0681092 -0.692162 0)
-(-0.0493278 -0.902297 0)
-(-0.0131765 -1.15995 0)
-(-0.00529396 -0.854041 0)
-(0.0264625 -0.333988 0)
-(0.0123356 -0.106993 0)
-(0.0656379 0.532297 0)
-(0.0548766 0.84728 0)
-(0.0392556 0.717724 0)
-(-0.0239426 0.456147 0)
-(-0.0200907 0.246051 0)
-(0.000158709 0.185387 0)
-(0.00702713 0.115848 0)
-(0.0302902 0.0329831 0)
-(0.0363806 -0.0393656 0)
-(0.0547254 -0.0522775 0)
-(0.0663981 -0.0491431 0)
-(0.085558 0.0132205 0)
-(0.0840639 0.182426 0)
-(0.0199625 0.395905 0)
-(-0.0447644 0.518386 0)
-(-0.0438389 0.47704 0)
-(-0.0462442 0.253125 0)
-(0.0190119 -0.0599265 0)
-(-0.0211191 -0.32049 0)
-(-0.00140919 -0.704402 0)
-(-0.0296794 -0.934986 0)
-(0.00294744 -1.20717 0)
-(-0.00502847 -0.866074 0)
-(0.00447177 -0.380753 0)
-(0.009953 -0.13218 0)
-(0.0151587 0.434369 0)
-(0.0512587 0.824786 0)
-(0.0503782 0.712343 0)
-(0.0673933 0.50062 0)
-(0.0554755 0.234709 0)
-(0.0729832 0.155077 0)
-(0.107537 0.0435273 0)
-(0.145697 -0.0350085 0)
-(0.158028 -0.0592425 0)
-(0.155656 -0.0604752 0)
-(0.153577 -0.0482091 0)
-(0.147781 0.0343288 0)
-(0.0778396 0.287788 0)
-(0.0076784 0.526385 0)
-(-0.0109194 0.541247 0)
-(-0.00801424 0.440228 0)
-(0.0447894 0.18005 0)
-(0.0377121 -0.0511607 0)
-(0.0501829 -0.342464 0)
-(0.0466317 -0.675238 0)
-(0.0138355 -0.915047 0)
-(0.00526552 -1.21379 0)
-(-0.00628324 -0.856036 0)
-(-0.0382733 -0.375962 0)
-(-0.0435875 -0.0466261 0)
-(-0.0741799 0.426507 0)
-(-0.0120238 0.767415 0)
-(-0.00324379 0.653579 0)
-(0.11478 0.444471 0)
-(0.11688 0.226569 0)
-(0.186479 0.0636765 0)
-(0.231976 -0.0596767 0)
-(0.259375 -0.0920622 0)
-(0.260842 -0.087921 0)
-(0.257013 -0.0706506 0)
-(0.239437 -0.0273109 0)
-(0.151717 0.164506 0)
-(0.0384009 0.494848 0)
-(-0.0110416 0.589157 0)
-(0.00991454 0.526979 0)
-(0.0389032 0.376089 0)
-(0.113176 0.137369 0)
-(0.0241961 -0.0703522 0)
-(0.0761038 -0.363502 0)
-(0.0738838 -0.651921 0)
-(0.032841 -0.853651 0)
-(0.0181681 -1.17048 0)
-(-0.00912479 -0.760123 0)
-(-0.0639007 -0.273429 0)
-(-0.0836544 0.0186488 0)
-(-0.0963249 0.416698 0)
-(-0.0592642 0.680638 0)
-(-0.0509097 0.397753 0)
-(0.118176 0.247523 0)
-(0.210302 0.0583809 0)
-(0.31141 -0.0701555 0)
-(0.344235 -0.101279 0)
-(0.367075 -0.0873726 0)
-(0.358033 -0.0784151 0)
-(0.29556 -0.0338926 0)
-(0.173658 0.163807 0)
-(0.0323059 0.486972 0)
-(-0.0393237 0.62878 0)
-(-0.0361694 0.582835 0)
-(0.0251427 0.428498 0)
-(0.0981398 0.232815 0)
-(0.0638067 0.11443 0)
-(0.0294412 -0.0574359 0)
-(0.095811 -0.414268 0)
-(0.0853611 -0.602914 0)
-(0.0413674 -0.801703 0)
-(0.0203061 -1.10205 0)
-(0.00450397 -0.705737 0)
-(-0.060549 -0.222994 0)
-(-0.0603627 0.0406057 0)
-(-0.0604538 0.400014 0)
-(0.010791 0.665055 0)
-(0.0723317 0.176299 0)
-(0.181287 -0.13286 0)
-(0.293251 -0.210169 0)
-(0.34435 -0.204318 0)
-(0.345312 -0.18904 0)
-(0.27979 -0.118427 0)
-(0.196523 0.0848835 0)
-(0.0751319 0.346971 0)
-(-0.0523592 0.552147 0)
-(-0.105607 0.626239 0)
-(-0.107303 0.630356 0)
-(-0.0409278 0.445805 0)
-(0.0134773 0.223898 0)
-(-0.00459444 0.164338 0)
-(-0.0285914 0.130422 0)
-(0.0795159 -0.15708 0)
-(0.108017 -0.427057 0)
-(0.0825904 -0.535547 0)
-(0.0488153 -0.725901 0)
-(0.0143886 -1.03967 0)
-(0.0127417 -0.635874 0)
-(-0.080797 -0.142085 0)
-(-0.0676818 0.0221205 0)
-(-0.087376 0.256627 0)
-(0.0920228 0.441718 0)
-(0.219453 0.0478658 0)
-(0.275372 -0.239473 0)
-(0.236792 -0.256197 0)
-(0.175612 -0.148919 0)
-(0.0419573 0.100826 0)
-(-0.0159335 0.233402 0)
-(-0.0821223 0.407673 0)
-(-0.140316 0.537814 0)
-(-0.153897 0.585894 0)
-(-0.144673 0.59486 0)
-(-0.130828 0.458913 0)
-(-0.0506682 0.224733 0)
-(-0.0588765 0.160775 0)
-(-0.031821 0.070989 0)
-(0.0335221 -0.00832151 0)
-(0.119762 -0.260365 0)
-(0.111941 -0.411091 0)
-(0.080808 -0.485952 0)
-(0.0415036 -0.669329 0)
-(0.0239398 -0.969745 0)
-(0.015765 -0.560772 0)
-(-0.0796842 -0.0476543 0)
-(-0.101823 0.0377204 0)
-(-0.121939 0.0713156 0)
-(0.0251774 -0.0280695 0)
-(0.1003 -0.193856 0)
-(0.0377616 -0.100762 0)
-(-0.116086 0.0263818 0)
-(-0.168487 0.114161 0)
-(-0.162883 0.214738 0)
-(-0.176459 0.33233 0)
-(-0.187281 0.457423 0)
-(-0.17636 0.527125 0)
-(-0.155238 0.560162 0)
-(-0.115171 0.553276 0)
-(-0.0617492 0.377456 0)
-(0.0110144 0.190905 0)
-(0.0213497 0.13559 0)
-(0.128768 0.0254199 0)
-(0.134301 -0.0813305 0)
-(0.175739 -0.271087 0)
-(0.111957 -0.327556 0)
-(0.0931212 -0.401658 0)
-(0.0445862 -0.605137 0)
-(0.0230658 -0.900848 0)
-(0.0120065 -0.52165 0)
-(-0.0465004 0.119645 0)
-(-0.11873 0.119468 0)
-(-0.15585 0.0526239 0)
-(-0.162284 -0.030867 0)
-(-0.246827 -0.00364903 0)
-(-0.311299 0.039828 0)
-(-0.31643 0.0947303 0)
-(-0.306262 0.167069 0)
-(-0.280234 0.242432 0)
-(-0.257161 0.34134 0)
-(-0.218908 0.423286 0)
-(-0.1613 0.462913 0)
-(-0.0962842 0.44693 0)
-(0.00191533 0.396616 0)
-(0.0875455 0.25258 0)
-(0.131619 0.11575 0)
-(0.146675 0.0541667 0)
-(0.177877 -0.0084048 0)
-(0.151416 -0.0631711 0)
-(0.152428 -0.186928 0)
-(0.0958256 -0.239872 0)
-(0.0813998 -0.339693 0)
-(0.0526949 -0.528782 0)
-(0.0181482 -0.816406 0)
-(-0.00990437 -0.512476 0)
-(-0.00616312 0.257865 0)
-(-0.0736314 0.297555 0)
-(-0.123616 0.216202 0)
-(-0.245059 0.0806595 0)
-(-0.324357 0.0573919 0)
-(-0.372728 0.0682567 0)
-(-0.39257 0.076091 0)
-(-0.389243 0.107371 0)
-(-0.368765 0.147884 0)
-(-0.332843 0.215465 0)
-(-0.272673 0.255086 0)
-(-0.198142 0.248497 0)
-(-0.104689 0.198167 0)
-(-0.0195644 0.145198 0)
-(0.0523821 0.145558 0)
-(0.0785321 0.136651 0)
-(0.0912755 0.117247 0)
-(0.0917151 0.0748145 0)
-(0.0862369 -0.0415884 0)
-(0.0852139 -0.162239 0)
-(0.057173 -0.207596 0)
-(0.0621046 -0.308446 0)
-(0.0389606 -0.47988 0)
-(0.0192977 -0.747278 0)
-(-0.0323951 -0.526524 0)
-(0.0287901 0.266351 0)
-(-0.0114164 0.346555 0)
-(0.0135635 0.413278 0)
-(-0.0794306 0.355025 0)
-(-0.152411 0.258917 0)
-(-0.199423 0.201722 0)
-(-0.25261 0.143251 0)
-(-0.285052 0.116451 0)
-(-0.304071 0.108053 0)
-(-0.300215 0.103884 0)
-(-0.286285 0.0988546 0)
-(-0.249693 0.0525655 0)
-(-0.219048 0.00257268 0)
-(-0.198662 -0.0121167 0)
-(-0.157317 -0.00979547 0)
-(-0.0887329 0.0119922 0)
-(-0.0370592 0.0207376 0)
-(0.0254417 0.023543 0)
-(0.0646955 -0.0377082 0)
-(0.0674813 -0.127181 0)
-(0.0553626 -0.193988 0)
-(0.0600558 -0.291493 0)
-(0.0491321 -0.431016 0)
-(0.0138046 -0.684908 0)
-(-0.0554377 -0.515715 0)
-(0.0403631 0.198831 0)
-(0.0170801 0.304054 0)
-(0.0526324 0.373156 0)
-(0.0649974 0.427363 0)
-(0.0417311 0.363627 0)
-(0.0561173 0.308784 0)
-(0.0344024 0.252964 0)
-(0.0240541 0.201931 0)
-(-0.0113325 0.170132 0)
-(-0.0205178 0.144001 0)
-(-0.0501747 0.115041 0)
-(-0.0555406 0.0542483 0)
-(-0.0845445 0.0463893 0)
-(-0.107912 -0.0105872 0)
-(-0.126921 -0.0994882 0)
-(-0.110383 -0.120981 0)
-(-0.0740087 -0.138441 0)
-(-0.0203488 -0.132262 0)
-(0.0197271 -0.126592 0)
-(0.0375504 -0.137954 0)
-(0.0518819 -0.192512 0)
-(0.0533115 -0.264374 0)
-(0.0452728 -0.368829 0)
-(0.01184 -0.608724 0)
-(-0.0652443 -0.495563 0)
-(0.0544782 0.106084 0)
-(0.0641934 0.314641 0)
-(0.0267499 0.295559 0)
-(0.0609044 0.392867 0)
-(0.0813812 0.329044 0)
-(0.141386 0.277043 0)
-(0.14439 0.242614 0)
-(0.164484 0.215323 0)
-(0.150891 0.195912 0)
-(0.155656 0.17452 0)
-(0.140921 0.16208 0)
-(0.141963 0.126316 0)
-(0.112746 0.0874115 0)
-(0.121139 0.06641 0)
-(0.097101 0.0130078 0)
-(0.0387512 -0.0785452 0)
-(0.014831 -0.153835 0)
-(0.000194791 -0.174033 0)
-(0.0124981 -0.178511 0)
-(0.0213051 -0.193302 0)
-(0.0444436 -0.226222 0)
-(0.0363172 -0.26194 0)
-(0.0350105 -0.33072 0)
-(0.00231084 -0.562738 0)
-(-0.00690599 -0.473525 0)
-(0.0298961 -0.200657 0)
-(0.160186 0.368583 0)
-(0.0444242 0.35397 0)
-(0.0722517 0.31122 0)
-(0.0669161 0.189339 0)
-(0.116539 0.200444 0)
-(0.12591 0.218946 0)
-(0.153887 0.207962 0)
-(0.161991 0.196181 0)
-(0.171775 0.171875 0)
-(0.174727 0.156636 0)
-(0.185728 0.134227 0)
-(0.18249 0.0874118 0)
-(0.195502 0.0530592 0)
-(0.207473 0.0429468 0)
-(0.197119 0.0167141 0)
-(0.168999 -0.0636777 0)
-(0.129633 -0.120225 0)
-(0.107102 -0.153251 0)
-(0.0844121 -0.185625 0)
-(0.0764674 -0.218903 0)
-(0.0497723 -0.239604 0)
-(0.0347453 -0.297959 0)
-(0.000835631 -0.526742 0)
-(0.0434272 -0.508472 0)
-(-0.00245697 -0.34179 0)
-(0.140425 0.313556 0)
-(0.139668 0.426683 0)
-(0.132491 0.338531 0)
-(0.0776437 0.19962 0)
-(0.0508353 0.163614 0)
-(0.0558915 0.160603 0)
-(0.0811297 0.144092 0)
-(0.114711 0.164357 0)
-(0.13716 0.154078 0)
-(0.161918 0.143056 0)
-(0.182614 0.126522 0)
-(0.202622 0.0771959 0)
-(0.209639 0.0325766 0)
-(0.22341 0.0210046 0)
-(0.23117 0.00758103 0)
-(0.224106 -0.0362851 0)
-(0.192797 -0.0798443 0)
-(0.155805 -0.0840634 0)
-(0.118823 -0.112241 0)
-(0.0969732 -0.143962 0)
-(0.0631112 -0.165946 0)
-(0.0382719 -0.226468 0)
-(-0.00279704 -0.482966 0)
-(0.0318007 -0.552667 0)
-(0.0110758 -0.360617 0)
-(0.055706 0.0106889 0)
-(0.241117 0.337863 0)
-(0.248953 0.407336 0)
-(0.223642 0.341254 0)
-(0.111755 0.217367 0)
-(0.067144 0.154599 0)
-(0.0409666 0.0877402 0)
-(0.0675786 0.0889569 0)
-(0.104083 0.0766849 0)
-(0.138849 0.0661065 0)
-(0.171811 0.062172 0)
-(0.190036 0.038931 0)
-(0.18998 0.0290067 0)
-(0.187934 0.0351048 0)
-(0.180689 0.0395141 0)
-(0.176422 0.0256545 0)
-(0.149298 0.0141135 0)
-(0.120961 -0.00608253 0)
-(0.0999667 -0.0621907 0)
-(0.0829492 -0.0973883 0)
-(0.0537402 -0.111246 0)
-(0.0279118 -0.159416 0)
-(-0.00348037 -0.450794 0)
-(-0.00131269 -0.615393 0)
-(0.0526006 -0.362766 0)
-(0.0885479 -0.272343 0)
-(0.198163 0.0127411 0)
-(0.314129 0.321658 0)
-(0.324467 0.472186 0)
-(0.269044 0.459088 0)
-(0.171737 0.304611 0)
-(0.08092 0.137817 0)
-(0.0402267 0.0394506 0)
-(0.0595369 0.00723824 0)
-(0.0665376 0.00767564 0)
-(0.0739504 0.0324211 0)
-(0.0768002 0.0528203 0)
-(0.0813303 0.0567844 0)
-(0.077895 0.0644389 0)
-(0.0762383 0.0596264 0)
-(0.0813588 0.0469026 0)
-(0.086707 0.042376 0)
-(0.0939943 0.0157405 0)
-(0.0872962 -0.0382245 0)
-(0.0726993 -0.048049 0)
-(0.0398602 -0.0489157 0)
-(0.0176133 -0.103853 0)
-(-0.00235635 -0.433684 0)
-(0.0108666 -0.683658 0)
-(0.0587422 -0.533914 0)
-(0.144533 -0.337999 0)
-(0.165859 -0.175201 0)
-(0.24986 0.154183 0)
-(0.310588 0.416794 0)
-(0.34105 0.555056 0)
-(0.290969 0.524821 0)
-(0.1991 0.369865 0)
-(0.0781573 0.129703 0)
-(0.0250862 0.0310259 0)
-(0.00224413 0.0409705 0)
-(-0.0227009 0.0511548 0)
-(-0.0266613 0.0283099 0)
-(-0.0260723 0.0301902 0)
-(-0.0108984 0.0452663 0)
-(0.0131347 0.0350406 0)
-(0.0343355 0.00125637 0)
-(0.0646541 -0.0130759 0)
-(0.0849039 -0.0103723 0)
-(0.0820883 -0.0161553 0)
-(0.057671 0.00524627 0)
-(0.0302551 0.00699213 0)
-(0.0103747 -0.0659985 0)
-(0.000714226 -0.423919 0)
-(0.0245603 -0.78384 0)
-(0.0613749 -0.650976 0)
-(0.113691 -0.530118 0)
-(0.16506 -0.213175 0)
-(0.151863 0.026944 0)
-(0.22399 0.334263 0)
-(0.273741 0.533322 0)
-(0.274904 0.603735 0)
-(0.245253 0.556227 0)
-(0.170789 0.395414 0)
-(0.074067 0.170476 0)
-(0.0321165 0.118241 0)
-(-0.0098076 0.0955603 0)
-(-0.0389737 0.0532779 0)
-(-0.0577222 0.00609831 0)
-(-0.0291821 -0.0273601 0)
-(0.00208681 -0.0478301 0)
-(0.0358219 -0.0705262 0)
-(0.0562599 -0.0622995 0)
-(0.072392 -0.0223857 0)
-(0.060153 0.0252537 0)
-(0.0331496 0.0670785 0)
-(0.0264923 0.0484509 0)
-(0.00443797 -0.0407328 0)
-(0.00194611 -0.421197 0)
-(0.00800689 -0.876982 0)
-(0.0467447 -0.740743 0)
-(0.0571526 -0.600843 0)
-(0.0830832 -0.273779 0)
-(0.0501711 0.0151921 0)
-(0.0747706 0.221892 0)
-(0.145479 0.470573 0)
-(0.189759 0.602014 0)
-(0.180918 0.571978 0)
-(0.152343 0.477984 0)
-(0.0747413 0.303399 0)
-(0.0475676 0.223897 0)
-(0.00239068 0.197412 0)
-(-0.023737 0.121708 0)
-(-0.0350205 8.64307e-06 0)
-(-0.00430099 -0.0891615 0)
-(0.0186832 -0.11216 0)
-(0.045255 -0.113633 0)
-(0.0521649 -0.081771 0)
-(0.0542314 -0.00357292 0)
-(0.0196266 0.072391 0)
-(0.00643038 0.0854042 0)
-(0.0275128 0.0653283 0)
-(-0.00383825 -0.0173229 0)
-(0.00389471 -0.422112 0)
-(-0.00371036 -0.897268 0)
-(0.00361706 -0.76279 0)
-(-0.0214306 -0.612449 0)
-(-0.0166473 -0.185119 0)
-(-0.0574046 0.0833044 0)
-(-0.0526381 0.189572 0)
-(0.0296727 0.378627 0)
-(0.102907 0.576425 0)
-(0.0989364 0.639277 0)
-(0.0867511 0.569991 0)
-(0.0366425 0.365771 0)
-(0.00842057 0.267055 0)
-(-0.00865605 0.238615 0)
-(-0.0184412 0.128305 0)
-(0.00344795 -0.030025 0)
-(0.027736 -0.138928 0)
-(0.0445904 -0.153121 0)
-(0.0595281 -0.135606 0)
-(0.0481561 -0.0788869 0)
-(0.00512038 0.0630083 0)
-(-0.0238472 0.138237 0)
-(-0.0128722 0.0512843 0)
-(0.0186787 0.0579933 0)
-(-0.00601231 -0.000103004 0)
-(0.00202937 -0.427716 0)
-(-0.013944 -0.878726 0)
-(-0.0214961 -0.724682 0)
-(-0.0541008 -0.58999 0)
-(-0.0326117 -0.15975 0)
-(-0.0338793 0.0513378 0)
-(-0.0647639 0.0592487 0)
-(-0.00426192 0.22268 0)
-(0.0243695 0.498823 0)
-(0.0303826 0.618095 0)
-(0.0241493 0.573736 0)
-(-0.0138117 0.438574 0)
-(-0.037928 0.313887 0)
-(-0.0389408 0.239907 0)
-(-0.0243783 0.10198 0)
-(0.0197862 -0.101906 0)
-(0.0254727 -0.176428 0)
-(0.0391877 -0.179607 0)
-(0.0412259 -0.120853 0)
-(-0.00834411 0.0475824 0)
-(-0.0455479 0.155021 0)
-(-0.0488253 0.113025 0)
-(-0.033537 -0.01114 0)
-(-0.00646106 0.0436291 0)
-(-0.00400594 0.0071718 0)
-(-0.0024336 -0.432948 0)
-(-0.0115444 -0.831409 0)
-(-0.0254689 -0.692633 0)
-(-0.0575779 -0.575702 0)
-(-0.0635187 -0.223816 0)
-(-0.00450069 0.0388722 0)
-(-0.0106727 0.00824413 0)
-(-0.0808397 0.214504 0)
-(-0.0612216 0.546008 0)
-(-0.077674 0.662833 0)
-(-0.0827792 0.625657 0)
-(-0.105406 0.462827 0)
-(-0.082612 0.310072 0)
-(-0.0855179 0.199927 0)
-(-0.029413 -0.0085088 0)
-(-0.0189524 -0.138085 0)
-(-0.0137388 -0.183792 0)
-(-0.0174596 -0.183899 0)
-(-0.00939243 -0.0299813 0)
-(-0.0484137 0.117664 0)
-(-0.0363218 0.161431 0)
-(-0.0416913 0.10208 0)
-(-0.0256862 -0.0545975 0)
-(-0.0171822 -0.00708124 0)
-(0.00130615 -0.0181004 0)
-(-0.00813366 -0.441256 0)
-(-0.0113373 -0.794453 0)
-(-0.0340011 -0.630462 0)
-(-0.0669113 -0.503886 0)
-(-0.0982418 -0.246477 0)
-(-0.0686895 0.0508848 0)
-(-0.0637725 0.131868 0)
-(-0.156454 0.366873 0)
-(-0.162305 0.60152 0)
-(-0.171395 0.653805 0)
-(-0.153303 0.586602 0)
-(-0.155853 0.403422 0)
-(-0.120163 0.261761 0)
-(-0.108468 0.119058 0)
-(-0.0625624 -0.0568941 0)
-(-0.0736803 -0.135465 0)
-(-0.0610592 -0.179465 0)
-(-0.0622254 -0.179759 0)
-(-0.0418362 -0.0338903 0)
-(-0.0215314 0.106747 0)
-(-0.021664 0.144357 0)
-(-0.0106339 0.0850826 0)
-(-0.0296184 -0.0678458 0)
-(-0.0241504 -0.0119647 0)
-(0.00994749 -0.00549684 0)
-(-0.00945753 -0.444521 0)
-(-0.00903921 -0.731621 0)
-(-0.0328939 -0.579268 0)
-(-0.0472288 -0.438279 0)
-(-0.11264 -0.223663 0)
-(-0.089146 0.0597895 0)
-(-0.0993074 0.274784 0)
-(-0.1377 0.47224 0)
-(-0.1371 0.615542 0)
-(-0.134675 0.647399 0)
-(-0.130044 0.567021 0)
-(-0.131012 0.357687 0)
-(-0.107551 0.206221 0)
-(-0.0801345 0.0558088 0)
-(-0.0828917 -0.0790453 0)
-(-0.0928677 -0.145906 0)
-(-0.082677 -0.201601 0)
-(-0.0764561 -0.214669 0)
-(-0.0580826 -0.120577 0)
-(0.00502575 0.0765223 0)
-(0.0136371 0.136203 0)
-(0.0351002 0.119449 0)
-(0.00909063 -0.0147364 0)
-(-0.0138638 -0.0940196 0)
-(0.00798782 -0.0423659 0)
-(0.00483087 -0.44105 0)
-(-0.00754343 -0.700847 0)
-(-0.0103535 -0.536983 0)
-(-0.0349301 -0.351701 0)
-(-0.0764236 -0.146783 0)
-(-0.0635204 0.0770318 0)
-(-0.058244 0.286112 0)
-(-0.0462264 0.496599 0)
-(-0.0596256 0.604872 0)
-(-0.0406096 0.628101 0)
-(-0.0427286 0.568527 0)
-(-0.0413914 0.334428 0)
-(-0.0451454 0.166826 0)
-(-0.0297369 0.0541 0)
-(-0.0694415 -0.0226136 0)
-(-0.0748563 -0.126135 0)
-(-0.0867941 -0.205791 0)
-(-0.0790539 -0.228993 0)
-(-0.0785368 -0.208842 0)
-(-0.0175675 -0.0498657 0)
-(0.0213058 0.0731548 0)
-(0.0316899 0.102643 0)
-(0.041694 0.0540022 0)
-(0.0231377 -0.0220054 0)
-(-0.022522 -0.0353829 0)
-(0.0339004 -0.431019 0)
-(0.0035798 -0.693916 0)
-(0.00575097 -0.529798 0)
-(-0.00307455 -0.326742 0)
-(-0.0136463 -0.1307 0)
-(-0.0449139 -0.011883 0)
-(0.0117614 0.242269 0)
-(0.0149358 0.485398 0)
-(0.0372402 0.59409 0)
-(0.0560233 0.606059 0)
-(0.0755244 0.571621 0)
-(0.0825096 0.401326 0)
-(0.0630843 0.200892 0)
-(0.0419961 0.101282 0)
-(0.0137639 0.0136154 0)
-(-0.00524059 -0.108115 0)
-(-0.0688746 -0.200168 0)
-(-0.10708 -0.244701 0)
-(-0.126544 -0.251069 0)
-(-0.0905762 -0.147044 0)
-(-0.0370766 0.0283424 0)
-(-0.0308911 0.0745732 0)
-(-0.0196483 0.0101632 0)
-(-0.0436184 0.0253025 0)
-(-0.0595427 -0.0680617 0)
-(0.0454473 -0.43349 0)
-(-0.000247182 -0.719786 0)
-(0.00838669 -0.537378 0)
-(0.00341359 -0.321243 0)
-(-0.00337143 -0.0698042 0)
-(-0.0259893 0.045169 0)
-(0.00906771 0.17693 0)
-(0.0791879 0.411716 0)
-(0.109752 0.512161 0)
-(0.137105 0.528732 0)
-(0.163035 0.508789 0)
-(0.181335 0.414123 0)
-(0.178958 0.28085 0)
-(0.160191 0.16842 0)
-(0.159562 0.062993 0)
-(0.142995 0.0322609 0)
-(0.112776 0.00632181 0)
-(0.0576062 -0.0888365 0)
-(0.0172642 -0.219018 0)
-(-0.0436172 -0.235461 0)
-(-0.00623148 -0.0643457 0)
-(-0.0046264 0.0782112 0)
-(-0.000443009 0.0622652 0)
-(-0.0822873 0.0587841 0)
-(-0.0395527 -0.252374 0)
-(-0.0071907 -0.445885 0)
-(-0.0105171 -0.720536 0)
-(-0.0285421 -0.540841 0)
-(-0.0495969 -0.326955 0)
-(-0.0428772 -0.157969 0)
-(-0.000868744 -0.0738137 0)
-(-0.032613 0.0113483 0)
-(0.0217245 0.262471 0)
-(0.0590134 0.444166 0)
-(0.0972226 0.465512 0)
-(0.134317 0.445024 0)
-(0.176863 0.381532 0)
-(0.194592 0.276271 0)
-(0.210406 0.15524 0)
-(0.217718 0.0515539 0)
-(0.209083 0.0103244 0)
-(0.222214 -0.0201371 0)
-(0.22857 -0.0598267 0)
-(0.206298 -0.0621933 0)
-(0.157075 -0.0820821 0)
-(0.115236 -0.0602465 0)
-(0.101372 0.0804415 0)
-(0.0807076 0.152177 0)
-(-0.0314289 0.167626 0)
-(0.00682663 -0.282176 0)
-(-0.0426736 -0.504251 0)
-(-0.0269745 -0.627012 0)
-(-0.0914098 -0.432769 0)
-(-0.17404 -0.248357 0)
-(-0.191885 -0.122077 0)
-(-0.182255 -0.00536862 0)
-(-0.197483 0.104896 0)
-(-0.167355 0.248493 0)
-(-0.111003 0.353218 0)
-(-0.0188841 0.349289 0)
-(0.056297 0.316977 0)
-(0.139111 0.27951 0)
-(0.193062 0.21655 0)
-(0.242326 0.130635 0)
-(0.276056 0.07123 0)
-(0.295915 0.0297194 0)
-(0.314165 -0.0235287 0)
-(0.321424 -0.0772776 0)
-(0.296091 -0.0978562 0)
-(0.257986 -0.0727345 0)
-(0.186805 0.029846 0)
-(0.130475 0.17157 0)
-(0.0741811 0.318109 0)
-(-0.0027529 0.25893 0)
-(0.0558028 -0.227689 0)
-(-0.024902 -0.515884 0)
-(-0.0244759 -0.482004 0)
-(-0.0652151 -0.267098 0)
-(-0.162573 -0.0758743 0)
-(-0.237181 -0.0292135 0)
-(-0.259213 0.00958625 0)
-(-0.256269 0.0543854 0)
-(-0.220738 0.117731 0)
-(-0.15044 0.124764 0)
-(-0.0561576 0.0736206 0)
-(0.0340867 0.0809769 0)
-(0.109216 0.0689617 0)
-(0.190585 0.0444365 0)
-(0.240682 -0.0188093 0)
-(0.285407 -0.0596636 0)
-(0.304524 -0.0645571 0)
-(0.29693 -0.0596631 0)
-(0.26923 -0.00820226 0)
-(0.213973 0.0824263 0)
-(0.16186 0.126001 0)
-(0.099846 0.193575 0)
-(0.0493437 0.326624 0)
-(-0.00527684 0.412709 0)
-(-0.0212279 0.229601 0)
-(0.0741937 -0.206354 0)
-(0.00758996 -0.464096 0)
-(-0.00638373 -0.43964 0)
-(-0.00873959 -0.219817 0)
-(-0.0382588 0.0634932 0)
-(-0.094645 0.116707 0)
-(-0.173019 0.0796797 0)
-(-0.20443 0.0491172 0)
-(-0.193938 0.0185246 0)
-(-0.134463 -0.0275396 0)
-(-0.0879747 -0.0654045 0)
-(-0.00808231 -0.0655328 0)
-(0.0563539 -0.0687485 0)
-(0.123718 -0.0721122 0)
-(0.160279 -0.0724736 0)
-(0.168449 -0.0534129 0)
-(0.161518 0.019943 0)
-(0.117269 0.0737887 0)
-(0.0742605 0.0982619 0)
-(0.0475406 0.13413 0)
-(0.0264541 0.191956 0)
-(-0.0192247 0.286969 0)
-(-0.0706652 0.409172 0)
-(-0.106588 0.441353 0)
-(-0.0399329 0.0512753 0)
-(0.0468015 -0.228689 0)
-(0.00195889 -0.402905 0)
-(0.00441338 -0.446866 0)
-(0.0130641 -0.243283 0)
-(0.0200353 0.0805649 0)
-(-0.0122968 0.271098 0)
-(-0.0442404 0.282837 0)
-(-0.0952864 0.119459 0)
-(-0.114869 -0.0240157 0)
-(-0.114487 -0.110129 0)
-(-0.0797233 -0.198958 0)
-(-0.0238056 -0.235138 0)
-(0.0354068 -0.220393 0)
-(0.0752814 -0.180147 0)
-(0.100511 -0.111191 0)
-(0.089732 -0.0557601 0)
-(0.0768232 0.0600091 0)
-(0.0473348 0.13096 0)
-(0.0060725 0.145315 0)
-(-0.00517386 0.199564 0)
-(-0.0464532 0.290458 0)
-(-0.095767 0.429543 0)
-(-0.136434 0.490945 0)
-(-0.133557 0.345665 0)
-(-0.0243917 -0.166363 0)
-(-0.0443889 -0.249286 0)
-(0.00549513 -0.398134 0)
-(-0.00217839 -0.477162 0)
-(0.00200214 -0.264692 0)
-(-0.00837839 0.0757573 0)
-(-0.0139887 0.249649 0)
-(0.0190361 0.273903 0)
-(0.0243254 0.211448 0)
-(0.0038123 0.0711044 0)
-(0.00522994 -0.104554 0)
-(0.0252126 -0.2646 0)
-(0.0445795 -0.319625 0)
-(0.0724582 -0.298821 0)
-(0.0852656 -0.228057 0)
-(0.0822151 -0.114058 0)
-(0.0483237 -0.0104598 0)
-(0.0256976 0.113382 0)
-(0.0083102 0.215173 0)
-(-0.0145197 0.209425 0)
-(-0.0359861 0.264432 0)
-(-0.106531 0.41087 0)
-(-0.13283 0.485385 0)
-(-0.156625 0.485253 0)
-(-0.0825803 0.211999 0)
-(0.00114434 -0.187567 0)
-(-0.0546634 -0.269723 0)
-(-0.000103809 -0.461229 0)
-(-0.0088826 -0.44498 0)
-(-0.0422454 -0.229585 0)
-(-0.036049 0.100767 0)
-(-0.0473325 0.191251 0)
-(-0.0126067 0.214174 0)
-(0.0197036 0.163584 0)
-(0.0354901 0.0373241 0)
-(0.057499 -0.139985 0)
-(0.0708144 -0.283997 0)
-(0.0679167 -0.359748 0)
-(0.0629902 -0.319942 0)
-(0.0339263 -0.229064 0)
-(-0.00440347 -0.0678066 0)
-(-0.0307507 0.0481003 0)
-(-0.0395318 0.147007 0)
-(-0.0264717 0.220144 0)
-(-0.034644 0.247571 0)
-(-0.0785572 0.402146 0)
-(-0.1349 0.51369 0)
-(-0.130908 0.529052 0)
-(-0.16681 0.399229 0)
-(-0.0513543 -0.0575074 0)
-(-0.0507788 -0.233635 0)
-(-0.00853716 -0.285726 0)
-(-0.0216824 -0.485979 0)
-(-0.00618738 -0.373833 0)
-(-0.0466986 -0.211752 0)
-(-0.0213357 0.107222 0)
-(-0.0406577 0.179485 0)
-(-0.0457251 0.127371 0)
-(-0.01008 0.0980441 0)
-(0.00998935 -0.0192561 0)
-(0.0286711 -0.181355 0)
-(0.0163512 -0.286631 0)
-(-0.0315049 -0.310414 0)
-(-0.0747321 -0.263968 0)
-(-0.106994 -0.111561 0)
-(-0.105139 0.019691 0)
-(-0.0912111 0.0533672 0)
-(-0.0745554 0.102086 0)
-(-0.0463741 0.210867 0)
-(-0.0639763 0.323273 0)
-(-0.0809978 0.476543 0)
-(-0.0927414 0.533241 0)
-(-0.0817802 0.529529 0)
-(-0.0842564 0.307821 0)
-(-0.0207394 -0.125601 0)
-(-0.0848337 -0.286324 0)
-(-0.0160712 -0.372935 0)
-(-0.00803756 -0.542753 0)
-(0.000661295 -0.332266 0)
-(-0.0248341 -0.205371 0)
-(0.00802478 0.0905487 0)
-(-0.0138493 0.228682 0)
-(-0.0660189 0.138604 0)
-(-0.0455257 0.0514042 0)
-(-0.0375393 -0.0506919 0)
-(-0.0386704 -0.141528 0)
-(-0.0943103 -0.188558 0)
-(-0.143807 -0.228424 0)
-(-0.176979 -0.213718 0)
-(-0.181054 -0.132914 0)
-(-0.149546 -0.0332506 0)
-(-0.124146 -0.0072303 0)
-(-0.114721 0.0571358 0)
-(-0.0844785 0.208492 0)
-(-0.0837437 0.321873 0)
-(-0.066615 0.45336 0)
-(-0.0408406 0.507019 0)
-(-0.0159356 0.50784 0)
-(0.0162631 0.309693 0)
-(0.0706292 -0.0416025 0)
-(0.0174008 -0.247467 0)
-(-0.0077547 -0.403622 0)
-(0.00663491 -0.561562 0)
-(-0.00241131 -0.318437 0)
-(0.00862066 -0.212381 0)
-(0.0159021 0.0336673 0)
-(0.0227526 0.353997 0)
-(-0.0676355 0.187302 0)
-(-0.0819345 0.0536886 0)
-(-0.0880494 -0.0341603 0)
-(-0.113729 -0.0812094 0)
-(-0.149277 -0.10933 0)
-(-0.192909 -0.167289 0)
-(-0.209018 -0.17937 0)
-(-0.214942 -0.142385 0)
-(-0.182388 -0.0533306 0)
-(-0.148287 0.00171622 0)
-(-0.143562 0.0321404 0)
-(-0.121911 0.151426 0)
-(-0.0981436 0.280654 0)
-(-0.0726724 0.374286 0)
-(-0.0277114 0.414466 0)
-(0.00350035 0.400433 0)
-(0.0603427 0.152085 0)
-(0.0766169 -0.0277191 0)
-(0.0649097 -0.179535 0)
-(0.0129397 -0.364303 0)
-(0.0169676 -0.547898 0)
-(0.000539339 -0.34159 0)
-(0.0230166 -0.232001 0)
-(0.0150728 -0.00136642 0)
-(0.0340591 0.420291 0)
-(-0.0216603 0.346867 0)
-(-0.0855472 0.109993 0)
-(-0.105224 -0.00490669 0)
-(-0.126908 -0.0387489 0)
-(-0.128757 -0.047338 0)
-(-0.138475 -0.0782259 0)
-(-0.182742 -0.156013 0)
-(-0.199755 -0.177724 0)
-(-0.198264 -0.161577 0)
-(-0.151292 -0.0900987 0)
-(-0.117459 0.00998191 0)
-(-0.0750318 0.110443 0)
-(-0.0276301 0.215548 0)
-(0.0297146 0.285159 0)
-(0.0776065 0.32178 0)
-(0.113088 0.315852 0)
-(0.165767 0.174617 0)
-(0.131059 -0.045947 0)
-(0.1238 -0.147063 0)
-(0.0834536 -0.314097 0)
-(0.027128 -0.50773 0)
-(-0.00640002 -0.372165 0)
-(-0.0117612 -0.258491 0)
-(-0.0304943 -0.00668444 0)
-(0.0145426 0.403685 0)
-(0.0160334 0.43392 0)
-(-0.0245237 0.235324 0)
-(-0.0478053 0.0588395 0)
-(-0.0630521 -0.0432439 0)
-(-0.0597772 -0.082151 0)
-(-0.0539114 -0.0630726 0)
-(-0.0621662 -0.0467709 0)
-(-0.0857745 -0.101541 0)
-(-0.117585 -0.15918 0)
-(-0.119666 -0.180541 0)
-(-0.0869873 -0.158768 0)
-(-0.0411484 -0.0778545 0)
-(0.0137862 0.0349159 0)
-(0.0943465 0.113205 0)
-(0.164047 0.215664 0)
-(0.198379 0.224527 0)
-(0.230619 0.166149 0)
-(0.22042 0.0995013 0)
-(0.170048 0.0356123 0)
-(0.135754 -0.137244 0)
-(0.0363462 -0.31685 0)
-(-0.0222777 -0.307635 0)
-(-0.0692958 -0.214394 0)
-(-0.0858586 -0.00753762 0)
-(-0.0324638 0.3158 0)
-(0.0333185 0.399619 0)
-(0.0454058 0.249106 0)
-(0.0609184 0.0911454 0)
-(0.0580292 0.00911912 0)
-(0.049217 -0.0521658 0)
-(0.0359809 -0.0614451 0)
-(0.0423032 -0.0775769 0)
-(0.0396083 -0.0886748 0)
-(0.0181569 -0.105499 0)
-(-0.0128982 -0.164222 0)
-(-0.0255563 -0.185305 0)
-(-0.0162336 -0.156808 0)
-(0.0199099 -0.128244 0)
-(0.0564693 -0.094351 0)
-(0.087961 0.0463015 0)
-(0.112073 0.15215 0)
-(0.122365 0.134884 0)
-(0.113548 0.116261 0)
-(0.107645 0.0540692 0)
-(0.0689118 -0.0764131 0)
-(0.0209352 -0.192546 0)
-(-0.0315332 -0.192412 0)
-(-0.0686858 -0.137452 0)
-(-0.10839 -0.0475914 0)
-(-0.0718768 0.146592 0)
-(0.00681437 0.232806 0)
-(0.0602539 0.148317 0)
-(0.0804995 0.0242004 0)
-(0.0833183 -0.0280797 0)
-(0.0811653 -0.0485993 0)
-(0.0702633 -0.0487399 0)
-(0.0733623 -0.0532095 0)
-(0.0615789 -0.0525624 0)
-(0.062682 -0.0524797 0)
-(0.0338512 -0.0844732 0)
-(0.00060668 -0.14277 0)
-(-0.0210496 -0.152216 0)
-(-0.0228933 -0.125481 0)
-(-0.042061 -0.0421874 0)
-(-0.0410915 0.0925423 0)
-(-0.00875777 0.154263 0)
-(0.00420971 0.151165 0)
-(0.0252802 0.137326 0)
-(0.0448454 0.118536 0)
-(0.0383896 0.032904 0)
-(0.0157797 -0.124157 0)
-(-0.0331419 -0.128155 0)
-(-0.067219 -0.07516 0)
-(-0.0756359 0.0128783 0)
-(-0.0529394 0.0590381 0)
-(0.0142884 0.0740224 0)
-(0.0696354 0.0487859 0)
-(0.106539 0.00822998 0)
-(0.118365 -0.0220742 0)
-(0.129231 -0.0644743 0)
-(0.128804 -0.087833 0)
-(0.131305 -0.100756 0)
-(0.124272 -0.103994 0)
-(0.123365 -0.102886 0)
-(0.111787 -0.0969681 0)
-(0.0730541 -0.108822 0)
-(0.0124598 -0.127882 0)
-(-0.0406404 -0.118333 0)
-(-0.0848876 -0.0882502 0)
-(-0.0857036 -0.0301129 0)
-(-0.0477335 0.022999 0)
-(-0.0112728 0.0465895 0)
-(0.0239885 0.02802 0)
-(0.0521362 0.0261431 0)
-(0.0701407 -0.0098629 0)
-(0.0373998 -0.0786019 0)
-(-0.00673444 -0.219765 0)
-(-0.0283845 -0.227962 0)
-(-0.0254797 -0.22985 0)
-(-0.0140949 -0.228841 0)
-(-0.0027639 -0.226439 0)
-(0.0142837 -0.238473 0)
-(0.0202837 -0.251975 0)
-(0.0284937 -0.258172 0)
-(0.0307065 -0.266238 0)
-(0.0276889 -0.265341 0)
-(0.0231221 -0.266062 0)
-(0.0170449 -0.263633 0)
-(0.0113536 -0.252913 0)
-(0.0091503 -0.225332 0)
-(0.00846185 -0.215207 0)
-(0.000598205 -0.20281 0)
-(-0.0100236 -0.199304 0)
-(-0.0151417 -0.197846 0)
-(-0.0149641 -0.215038 0)
-(-0.0181196 -0.217788 0)
-(-0.00745883 -0.207709 0)
-(-0.00119304 -0.19937 0)
-(0.00198995 -0.195376 0)
-(0.00877605 -0.184208 0)
-(0.00557262 -0.175093 0)
-(0.000951616 -0.220817 0)
-(0.000646376 -0.22906 0)
-(-0.00175829 -0.252406 0)
-(3.38655e-05 -0.261468 0)
-(0.00432832 -0.263665 0)
-(0.0113455 -0.271061 0)
-(0.0145802 -0.272081 0)
-(0.0185238 -0.267449 0)
-(0.0138388 -0.257773 0)
-(0.00775604 -0.247218 0)
-(0.000442243 -0.238152 0)
-(-0.00681317 -0.232969 0)
-(-0.012252 -0.224375 0)
-(-0.0119197 -0.215909 0)
-(-0.0108175 -0.215361 0)
-(-0.00999649 -0.207724 0)
-(-0.011915 -0.210637 0)
-(-0.0112612 -0.207572 0)
-(-0.0104211 -0.217732 0)
-(-0.0136991 -0.221705 0)
-(-0.013851 -0.220209 0)
-(-0.0140914 -0.212521 0)
-(-0.0129349 -0.214773 0)
-(-0.0118922 -0.206457 0)
-(-0.00789114 -0.203976 0)
-(0.00404495 -0.212872 0)
-(0.00855767 -0.227665 0)
-(0.0101335 -0.24553 0)
-(0.00857478 -0.253505 0)
-(0.00741543 -0.264429 0)
-(0.00663235 -0.266613 0)
-(0.00215682 -0.260369 0)
-(-0.00399891 -0.253264 0)
-(-0.00691501 -0.239346 0)
-(-0.00889254 -0.231968 0)
-(-0.00930327 -0.225252 0)
-(-0.0104286 -0.223236 0)
-(-0.0112378 -0.219375 0)
-(-0.0119237 -0.213891 0)
-(-0.0108453 -0.205467 0)
-(-0.0099554 -0.197723 0)
-(-0.00948263 -0.19721 0)
-(-0.00884061 -0.205893 0)
-(-0.00903542 -0.212123 0)
-(-0.0102278 -0.220011 0)
-(-0.0105138 -0.222248 0)
-(-0.00828646 -0.213575 0)
-(-0.00659857 -0.214629 0)
-(-0.00703332 -0.209058 0)
-(-0.00227453 -0.214454 0)
-(0.00542109 -0.245926 0)
-(0.0106032 -0.238634 0)
-(0.010854 -0.249236 0)
-(0.00876242 -0.252637 0)
-(0.00453007 -0.257966 0)
-(-0.00513822 -0.257207 0)
-(-0.0114742 -0.25599 0)
-(-0.0169037 -0.251318 0)
-(-0.020266 -0.243234 0)
-(-0.0219716 -0.237566 0)
-(-0.0226626 -0.232553 0)
-(-0.0223985 -0.22868 0)
-(-0.0231117 -0.222302 0)
-(-0.0241709 -0.217104 0)
-(-0.0231922 -0.211435 0)
-(-0.0203657 -0.20654 0)
-(-0.0166632 -0.206571 0)
-(-0.0135664 -0.21167 0)
-(-0.0117394 -0.214821 0)
-(-0.00879998 -0.220737 0)
-(-0.0086934 -0.223367 0)
-(-0.0056013 -0.220063 0)
-(-0.00484241 -0.216812 0)
-(-0.00426449 -0.216186 0)
-(-0.000432306 -0.225821 0)
-(0.00101988 -0.251804 0)
-(0.00187509 -0.238421 0)
-(0.000778526 -0.240542 0)
-(-0.00148682 -0.244043 0)
-(-0.00382411 -0.243968 0)
-(-0.00654251 -0.239868 0)
-(-0.01128 -0.235904 0)
-(-0.0163584 -0.233219 0)
-(-0.0195261 -0.231628 0)
-(-0.0199146 -0.231773 0)
-(-0.0203828 -0.229829 0)
-(-0.0191604 -0.224491 0)
-(-0.0189315 -0.219888 0)
-(-0.0181255 -0.214507 0)
-(-0.0191183 -0.211635 0)
-(-0.0190925 -0.210557 0)
-(-0.0182112 -0.209665 0)
-(-0.017022 -0.214246 0)
-(-0.0149553 -0.220472 0)
-(-0.0122531 -0.225724 0)
-(-0.00947732 -0.229517 0)
-(-0.00727246 -0.224547 0)
-(-0.00557617 -0.217101 0)
-(-0.00463186 -0.217036 0)
-(-0.00330665 -0.231921 0)
-(8.25784e-05 -0.253848 0)
-(-0.000268371 -0.238328 0)
-(-0.00301136 -0.239058 0)
-(-0.00647916 -0.241198 0)
-(-0.0103013 -0.240858 0)
-(-0.0142538 -0.235225 0)
-(-0.0182661 -0.231072 0)
-(-0.0218409 -0.229404 0)
-(-0.0241709 -0.229872 0)
-(-0.0295876 -0.230135 0)
-(-0.031001 -0.229571 0)
-(-0.0311472 -0.22868 0)
-(-0.030436 -0.223805 0)
-(-0.028412 -0.218443 0)
-(-0.0263671 -0.215328 0)
-(-0.0230363 -0.215668 0)
-(-0.0185969 -0.219311 0)
-(-0.0134096 -0.223808 0)
-(-0.00999734 -0.227542 0)
-(-0.00722822 -0.231166 0)
-(-0.00551518 -0.234186 0)
-(-0.0038587 -0.229493 0)
-(-0.00282262 -0.221443 0)
-(-0.00169673 -0.221114 0)
-(2.06447e-05 -0.237812 0)
-(0.000335563 -0.253489 0)
-(0.000865174 -0.233776 0)
-(-0.00146059 -0.230438 0)
-(-0.00415664 -0.230431 0)
-(-0.0074816 -0.229454 0)
-(-0.0108598 -0.224791 0)
-(-0.0134697 -0.220447 0)
-(-0.0156702 -0.219528 0)
-(-0.0175544 -0.22107 0)
-(-0.0177251 -0.224193 0)
-(-0.018488 -0.226349 0)
-(-0.0190037 -0.225797 0)
-(-0.0186123 -0.223764 0)
-(-0.0177092 -0.221359 0)
-(-0.0165239 -0.220859 0)
-(-0.0155522 -0.221592 0)
-(-0.015304 -0.223007 0)
-(-0.015258 -0.227688 0)
-(-0.0137041 -0.232161 0)
-(-0.0112004 -0.236991 0)
-(-0.00808428 -0.239237 0)
-(-0.00485494 -0.232308 0)
-(-0.00337747 -0.222952 0)
-(-0.00296524 -0.222727 0)
-(-0.00173884 -0.239798 0)
-(0.000349145 -0.255939 0)
-(0.00062909 -0.231933 0)
-(-0.00102054 -0.227047 0)
-(-0.00351247 -0.226384 0)
-(-0.00590736 -0.225656 0)
-(-0.00779789 -0.222142 0)
-(-0.00952763 -0.21823 0)
-(-0.0111687 -0.218456 0)
-(-0.0124815 -0.221426 0)
-(-0.0138324 -0.223488 0)
-(-0.0148053 -0.22663 0)
-(-0.0157874 -0.227884 0)
-(-0.0167273 -0.226779 0)
-(-0.0165335 -0.225205 0)
-(-0.0150848 -0.224233 0)
-(-0.0137614 -0.224532 0)
-(-0.0124251 -0.226766 0)
-(-0.0109831 -0.231256 0)
-(-0.00997552 -0.237338 0)
-(-0.00849914 -0.243503 0)
-(-0.00679257 -0.245804 0)
-(-0.0051098 -0.237961 0)
-(-0.00416329 -0.226353 0)
-(-0.00294021 -0.226083 0)
-(-0.00108501 -0.247021 0)
-(4.24721e-05 -0.256431 0)
-(0.000304516 -0.230085 0)
-(-0.000716007 -0.221956 0)
-(-0.00221302 -0.220352 0)
-(-0.00386584 -0.219108 0)
-(-0.00617184 -0.216099 0)
-(-0.00773335 -0.212464 0)
-(-0.00875962 -0.213649 0)
-(-0.00932796 -0.216741 0)
-(-0.00984951 -0.219354 0)
-(-0.0105588 -0.221952 0)
-(-0.010929 -0.223515 0)
-(-0.0109361 -0.224207 0)
-(-0.0105392 -0.224616 0)
-(-0.0107851 -0.224477 0)
-(-0.0108553 -0.225027 0)
-(-0.0104512 -0.227673 0)
-(-0.00984337 -0.232456 0)
-(-0.00898506 -0.238512 0)
-(-0.00795746 -0.245588 0)
-(-0.00587359 -0.248294 0)
-(-0.00339441 -0.239864 0)
-(-0.00227298 -0.227435 0)
-(-0.00125421 -0.226667 0)
-(-0.000871486 -0.249324 0)
-(0.000409225 -0.257839 0)
-(0.000711915 -0.230593 0)
-(0.000793968 -0.220259 0)
-(-0.000646462 -0.217923 0)
-(-0.00232665 -0.216644 0)
-(-0.00365784 -0.214334 0)
-(-0.00441468 -0.211444 0)
-(-0.0049945 -0.213907 0)
-(-0.00553195 -0.217501 0)
-(-0.00628806 -0.220309 0)
-(-0.00731288 -0.222759 0)
-(-0.00818725 -0.224717 0)
-(-0.00825911 -0.225723 0)
-(-0.00832097 -0.225249 0)
-(-0.00826081 -0.224807 0)
-(-0.00885666 -0.225891 0)
-(-0.00879977 -0.229171 0)
-(-0.00859457 -0.23418 0)
-(-0.00836958 -0.240712 0)
-(-0.00805374 -0.249818 0)
-(-0.00641033 -0.254597 0)
-(-0.00452138 -0.245245 0)
-(-0.00293515 -0.231699 0)
-(-0.00100869 -0.230221 0)
-(-0.000420315 -0.252657 0)
-(0.000118991 -0.259159 0)
-(0.00127349 -0.231302 0)
-(0.00120414 -0.219048 0)
-(0.00120771 -0.214915 0)
-(0.000153266 -0.213018 0)
-(-0.00120494 -0.21076 0)
-(-0.00246271 -0.208894 0)
-(-0.00304297 -0.211621 0)
-(-0.00366009 -0.214839 0)
-(-0.00429086 -0.217177 0)
-(-0.005503 -0.218977 0)
-(-0.00687835 -0.221664 0)
-(-0.00809126 -0.224044 0)
-(-0.00898407 -0.223781 0)
-(-0.00884368 -0.22305 0)
-(-0.00846111 -0.225394 0)
-(-0.00830692 -0.229215 0)
-(-0.00808069 -0.234377 0)
-(-0.00769128 -0.240892 0)
-(-0.00759348 -0.251233 0)
-(-0.0056055 -0.257743 0)
-(-0.00277927 -0.248055 0)
-(-0.000870318 -0.233306 0)
-(-0.000791828 -0.23114 0)
-(-0.000470737 -0.253708 0)
-(-8.97735e-05 -0.260151 0)
-(0.000271898 -0.232871 0)
-(0.000601318 -0.218756 0)
-(0.000149618 -0.213258 0)
-(-0.00113219 -0.210678 0)
-(-0.00226898 -0.208488 0)
-(-0.00300058 -0.207744 0)
-(-0.00326777 -0.210906 0)
-(-0.00370789 -0.214189 0)
-(-0.00399318 -0.21634 0)
-(-0.00399851 -0.217676 0)
-(-0.00436721 -0.220055 0)
-(-0.00449099 -0.222919 0)
-(-0.00504071 -0.223553 0)
-(-0.00596975 -0.224086 0)
-(-0.00633578 -0.225955 0)
-(-0.00676778 -0.229212 0)
-(-0.00722988 -0.234339 0)
-(-0.00704433 -0.241286 0)
-(-0.00763815 -0.25453 0)
-(-0.00597556 -0.265033 0)
-(-0.00289524 -0.256231 0)
-(0.000268022 -0.237617 0)
-(0.000444655 -0.231475 0)
-(6.80294e-05 -0.25426 0)
-(2.59183e-05 -0.260641 0)
-(0.000661372 -0.233961 0)
-(0.00124454 -0.218381 0)
-(0.00130709 -0.212078 0)
-(0.00089972 -0.208963 0)
-(0.000335812 -0.206679 0)
-(-9.93294e-05 -0.206662 0)
-(9.75277e-05 -0.210224 0)
-(-0.000192261 -0.213515 0)
-(-0.000570344 -0.216128 0)
-(-0.000943288 -0.217209 0)
-(-0.00146038 -0.218996 0)
-(-0.0026902 -0.221017 0)
-(-0.00373599 -0.221005 0)
-(-0.00485756 -0.220695 0)
-(-0.00618773 -0.222617 0)
-(-0.00729832 -0.228171 0)
-(-0.00755772 -0.233526 0)
-(-0.00804756 -0.240238 0)
-(-0.00749901 -0.255866 0)
-(-0.00685882 -0.269264 0)
-(-0.00386096 -0.261344 0)
-(-0.00127153 -0.240827 0)
-(-6.19402e-05 -0.231727 0)
-(-0.000121928 -0.254133 0)
-(-0.000334361 -0.261047 0)
-(-0.000555651 -0.235115 0)
-(8.42401e-05 -0.218828 0)
-(-0.000222396 -0.211752 0)
-(-0.00118756 -0.207355 0)
-(-0.00126687 -0.205858 0)
-(-0.000523911 -0.20684 0)
-(-2.23051e-05 -0.210451 0)
-(-0.000233338 -0.213249 0)
-(-0.000322883 -0.215214 0)
-(-0.000280016 -0.216399 0)
-(0.000265412 -0.217626 0)
-(-0.000459861 -0.21987 0)
-(-0.00117304 -0.219995 0)
-(-0.00162353 -0.219525 0)
-(-0.00186371 -0.221433 0)
-(-0.00218427 -0.226117 0)
-(-0.00363917 -0.232559 0)
-(-0.00512323 -0.240734 0)
-(-0.00583604 -0.256421 0)
-(-0.00407282 -0.274961 0)
-(-0.00187487 -0.270438 0)
-(0.000943233 -0.246013 0)
-(0.0006818 -0.231732 0)
-(0.000446002 -0.254324 0)
-(0.000105266 -0.26486 0)
-(0.000818431 -0.238008 0)
-(0.00127091 -0.2208 0)
-(0.00133659 -0.211844 0)
-(0.00282519 -0.208843 0)
-(0.00364419 -0.208005 0)
-(0.00413977 -0.208065 0)
-(0.0034536 -0.21039 0)
-(0.00375504 -0.213428 0)
-(0.00354108 -0.215622 0)
-(0.00305397 -0.216668 0)
-(0.00188273 -0.21726 0)
-(0.00120724 -0.217272 0)
-(0.000119686 -0.2183 0)
-(-4.59579e-06 -0.219973 0)
-(-0.000665124 -0.220945 0)
-(-0.00153237 -0.222927 0)
-(-0.00389897 -0.228354 0)
-(-0.00615498 -0.236754 0)
-(-0.00802537 -0.257734 0)
-(-0.00775732 -0.282832 0)
-(-0.00482873 -0.280673 0)
-(-0.0021193 -0.252462 0)
-(2.37581e-05 -0.233025 0)
-(-0.000242479 -0.256313 0)
-(-0.000410047 -0.279599 0)
-(-0.00116522 -0.250248 0)
-(-0.00056507 -0.232974 0)
-(0.000805405 -0.224412 0)
-(0.00106032 -0.219207 0)
-(0.00141604 -0.218008 0)
-(0.00189483 -0.219389 0)
-(0.0033373 -0.221184 0)
-(0.00377824 -0.222702 0)
-(0.00409683 -0.224417 0)
-(0.00440499 -0.225721 0)
-(0.0045489 -0.226336 0)
-(0.00500349 -0.227307 0)
-(0.00508704 -0.228103 0)
-(0.004584 -0.228728 0)
-(0.00343118 -0.229544 0)
-(0.00315097 -0.230804 0)
-(0.00276917 -0.234963 0)
-(0.0014301 -0.243516 0)
-(0.000212705 -0.266079 0)
-(-0.000106209 -0.302699 0)
-(-0.000436486 -0.305763 0)
-(0.00070142 -0.273148 0)
-(0.00100267 -0.246048 0)
-(0.000716707 -0.270436 0)
-(-0.000186106 -0.334395 0)
-(0.000567537 -0.304298 0)
-(0.00134348 -0.287237 0)
-(0.00200479 -0.276983 0)
-(0.00340998 -0.271015 0)
-(0.00478347 -0.269762 0)
-(0.00586136 -0.270887 0)
-(0.00653161 -0.272742 0)
-(0.00731399 -0.274183 0)
-(0.00773051 -0.274997 0)
-(0.00773219 -0.275196 0)
-(0.00739855 -0.275048 0)
-(0.00683331 -0.274963 0)
-(0.00576939 -0.274721 0)
-(0.00517722 -0.275994 0)
-(0.00461468 -0.277796 0)
-(0.00425723 -0.278949 0)
-(0.00362898 -0.282514 0)
-(0.00294761 -0.290478 0)
-(0.00135822 -0.315832 0)
-(0.000188657 -0.356588 0)
-(-0.000693362 -0.363318 0)
-(-0.000579133 -0.329156 0)
-(0.000370275 -0.295812 0)
-(0.000142979 -0.32205 0)
-(-0.000238992 -0.455357 0)
-(-0.000210256 -0.431043 0)
-(0.000603566 -0.416188 0)
-(0.00154886 -0.408621 0)
-(0.00241357 -0.403684 0)
-(0.00362173 -0.402728 0)
-(0.00459904 -0.403658 0)
-(0.00555617 -0.404891 0)
-(0.00619993 -0.406272 0)
-(0.00677634 -0.406889 0)
-(0.00754734 -0.406879 0)
-(0.00813509 -0.406534 0)
-(0.00867538 -0.406434 0)
-(0.00915111 -0.406293 0)
-(0.00924917 -0.407097 0)
-(0.00868431 -0.407916 0)
-(0.00849393 -0.408459 0)
-(0.00803176 -0.410955 0)
-(0.00711471 -0.416901 0)
-(0.00682252 -0.436721 0)
-(0.00518893 -0.473387 0)
-(0.00160235 -0.480504 0)
-(-0.00114951 -0.452469 0)
-(-0.00112515 -0.424892 0)
-(8.57628e-05 -0.446071 0)
-(-0.000315499 -0.550026 0)
-(-0.000281919 -0.530282 0)
-(0.000544145 -0.518278 0)
-(0.00157615 -0.512034 0)
-(0.0028261 -0.508069 0)
-(0.00433169 -0.50725 0)
-(0.00554652 -0.507934 0)
-(0.00666509 -0.50883 0)
-(0.00742123 -0.509938 0)
-(0.00791445 -0.510405 0)
-(0.008487 -0.510334 0)
-(0.00884806 -0.509971 0)
-(0.00920171 -0.509803 0)
-(0.00930539 -0.509652 0)
-(0.00920526 -0.510185 0)
-(0.00872766 -0.510862 0)
-(0.00878506 -0.511413 0)
-(0.00869654 -0.513432 0)
-(0.00844275 -0.518216 0)
-(0.0082082 -0.53444 0)
-(0.00632775 -0.564009 0)
-(0.00218745 -0.569417 0)
-(-0.000714079 -0.546426 0)
-(-0.000766847 -0.524811 0)
-(4.65096e-05 -0.542258 0)
-)
-;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           nonuniform List<vector>
-25
-(
-(-0.000315499 -0.550026 0)
-(-0.000281919 -0.530282 0)
-(0.000544145 -0.518278 0)
-(0.00157615 -0.512034 0)
-(0.0028261 -0.508069 0)
-(0.00433169 -0.50725 0)
-(0.00554652 -0.507934 0)
-(0.00666509 -0.50883 0)
-(0.00742123 -0.509938 0)
-(0.00791445 -0.510405 0)
-(0.008487 -0.510334 0)
-(0.00884806 -0.509971 0)
-(0.00920171 -0.509803 0)
-(0.00930539 -0.509652 0)
-(0.00920526 -0.510185 0)
-(0.00872766 -0.510862 0)
-(0.00878506 -0.511413 0)
-(0.00869654 -0.513432 0)
-(0.00844275 -0.518216 0)
-(0.0082082 -0.53444 0)
-(0.00632775 -0.564009 0)
-(0.00218745 -0.569417 0)
-(-0.000714079 -0.546426 0)
-(-0.000766847 -0.524811 0)
-(4.65096e-05 -0.542258 0)
-)
-;
-    }
-
-    walls
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha1 b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha1
deleted file mode 100644
index 1e96e58983..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha1
+++ /dev/null
@@ -1,1926 +0,0 @@
-/*--------------------------------*- 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;
-    object      alpha1;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   nonuniform List<scalar>
-1875
-(
-0.0548304
-0.0623421
-0.0794524
-0.0894836
-0.0869981
-0.0812588
-0.0751103
-0.074022
-0.0748355
-0.0763597
-0.0788793
-0.0792552
-0.0769845
-0.0688926
-0.0519894
--0.00753741
--0.0428937
--0.00611334
-0.048526
-0.0654223
-0.0534083
-0.0388266
-0.030309
-0.0906403
-0.0573169
-0.0677585
-0.0749894
-0.111227
-0.150629
-0.207244
-0.224638
-0.216721
-0.212082
-0.209764
-0.205933
-0.2054
-0.210627
-0.240833
-0.252489
-0.263075
-0.256311
-0.184737
-0.0647795
-0.0565476
-0.0705269
-0.0468687
-0.0503781
-0.447745
-0.228626
-0.0412855
-0.0765878
-0.0920896
-0.0945796
-0.0897102
-0.0908506
-0.108966
-0.11928
-0.122283
-0.129163
-0.133902
-0.148538
-0.147656
-0.208823
-0.287814
-0.392839
-0.432889
-0.179282
-0.0602057
-0.0490536
-0.06326
-0.0301004
-0.044322
-0.347753
-0.222614
-0.0580661
-0.0774311
-0.168999
-0.15296
-0.150495
-0.199711
-0.217948
-0.204586
-0.163955
-0.148388
-0.199424
-0.230525
-0.25015
-0.314607
-0.367503
-0.407244
-0.365514
-0.146976
-0.0600631
-0.0484226
-0.0589758
-0.0215465
-0.0713673
-0.383296
-0.252538
-0.084849
-0.0747927
-0.191497
-0.250551
-0.272281
-0.318538
-0.383113
-0.383273
-0.264682
-0.245327
-0.261841
-0.26286
-0.272433
-0.302876
-0.324439
-0.333574
-0.236679
-0.130168
-0.0519667
-0.0408861
-0.0403899
-0.0314694
-0.209634
-0.363462
-0.251125
-0.0990826
-0.0707352
-0.169339
-0.252151
-0.296879
-0.363435
-0.449059
-0.468992
-0.396875
-0.342303
-0.279122
-0.260497
-0.259759
-0.26695
-0.263158
-0.228365
-0.157612
-0.094658
-0.0450925
-0.0412135
-0.0406224
-0.0562977
-0.239062
-0.285406
-0.246931
-0.121172
-0.067325
-0.130564
-0.2262
-0.296236
-0.388328
-0.42684
-0.4202
-0.380098
-0.348687
-0.2758
-0.251542
-0.248472
-0.240963
-0.204851
-0.157356
-0.114521
-0.0636012
-0.0434253
-0.042109
-0.0439311
-0.0447382
-0.172608
-0.219094
-0.246152
-0.174903
-0.0710112
-0.119501
-0.215013
-0.253163
-0.339988
-0.391225
-0.391718
-0.352378
-0.321078
-0.250197
-0.217584
-0.198278
-0.149976
-0.0965145
-0.0715715
-0.0488777
-0.032089
-0.0278189
-0.0264319
-0.0373729
-0.0549931
-0.146785
-0.194982
-0.234741
-0.216862
-0.079705
-0.123036
-0.22043
-0.205523
-0.285796
-0.334684
-0.341156
-0.299131
-0.243703
-0.186723
-0.145023
-0.109432
-0.0675873
-0.0437774
-0.0351756
-0.029131
-0.0268031
-0.0263992
-0.0398214
-0.0861432
-0.186649
-0.206589
-0.184828
-0.177847
-0.216311
-0.0980646
-0.158972
-0.219526
-0.212652
-0.215522
-0.287711
-0.307771
-0.290046
-0.222114
-0.17485
-0.123933
-0.0765666
-0.049647
-0.0436035
-0.0419767
-0.0445667
-0.0455322
-0.0620655
-0.12025
-0.193307
-0.203171
-0.164683
-0.11598
-0.0515884
-0.124322
-0.122133
-0.166609
-0.187273
-0.260493
-0.156644
-0.227162
-0.264839
-0.26524
-0.220878
-0.183168
-0.141973
-0.0936408
-0.0553278
-0.0454663
-0.0444621
-0.0536388
-0.0678897
-0.0763383
-0.124482
-0.17042
-0.166777
-0.093375
-0.0531459
-0.0369463
-0.0793561
-0.135147
-0.14964
-0.130448
-0.232007
-0.152537
-0.144557
-0.21448
-0.227568
-0.210087
-0.180639
-0.151288
-0.119606
-0.0851365
-0.0636338
-0.0493
-0.0527713
-0.0651455
-0.0709015
-0.109781
-0.14225
-0.110684
-0.0638487
-0.0564369
-0.0660823
-0.0733794
-0.114427
-0.102706
-0.110863
-0.22586
-0.163777
-0.118543
-0.146743
-0.159867
-0.161461
-0.156442
-0.138646
-0.119527
-0.0931598
-0.0813179
-0.0691131
-0.0532866
-0.052539
-0.0552604
-0.0915788
-0.119602
-0.105888
-0.0744529
-0.0736707
-0.0851352
-0.0822765
-0.0935111
-0.0781043
-0.1283
-0.25283
-0.194458
-0.12161
-0.133576
-0.13755
-0.116304
-0.10647
-0.0959323
-0.0963314
-0.0859499
-0.0790304
-0.0798881
-0.0695575
-0.0468794
-0.045673
-0.0690178
-0.0987212
-0.108624
-0.115233
-0.105172
-0.0871229
-0.0928747
-0.0893538
-0.10332
-0.217173
-0.269753
-0.248991
-0.162985
-0.159579
-0.154646
-0.131756
-0.122903
-0.0967894
-0.0603195
-0.0536782
-0.0571817
-0.0700661
-0.0683329
-0.0501124
-0.0474957
-0.058922
-0.111262
-0.134974
-0.224772
-0.111677
-0.0843613
-0.0935528
-0.0966561
-0.145988
-0.238686
-0.255086
-0.298776
-0.278011
-0.267961
-0.225304
-0.192444
-0.173069
-0.150692
-0.0936343
-0.0556795
-0.0356709
-0.0357751
-0.0515386
-0.0498478
-0.0497518
-0.066669
-0.0985403
-0.167985
-0.369332
-0.132743
-0.0817724
-0.0929611
-0.09811
-0.139726
-0.223975
-0.284027
-0.343136
-0.299245
-0.300596
-0.238071
-0.214182
-0.184088
-0.149869
-0.108982
-0.0874414
-0.0491691
-0.0249572
-0.0408524
-0.0580323
-0.0612652
-0.0660238
-0.0811548
-0.331684
-0.403015
-0.168862
-0.0919107
-0.0962834
-0.0870445
-0.129929
-0.240926
-0.344756
-0.349775
-0.254159
-0.255671
-0.221588
-0.179509
-0.146754
-0.116876
-0.109119
-0.0955241
-0.0492485
-0.0267314
-0.0465165
-0.0728545
-0.0626188
-0.0637975
-0.179579
-0.587234
-0.392564
-0.170314
-0.104982
-0.101461
-0.082968
-0.138115
-0.221738
-0.359542
-0.38503
-0.230013
-0.157187
-0.126144
-0.110976
-0.110138
-0.100497
-0.107823
-0.0945146
-0.0389688
-0.0298509
-0.0547451
-0.0822809
-0.0999533
-0.251597
-0.579825
-0.545611
-0.2949
-0.155745
-0.117418
-0.105052
-0.0804842
-0.155847
-0.232088
-0.345762
-0.347085
-0.238022
-0.143914
-0.116049
-0.10605
-0.206644
-0.257038
-0.114064
-0.0612149
-0.0333713
-0.056496
-0.131705
-0.26974
-0.443914
-0.560254
-0.560335
-0.381546
-0.197076
-0.149187
-0.143069
-0.109416
-0.0749609
-0.160217
-0.199702
-0.280171
-0.152145
-0.0666199
-0.0664734
-0.246929
-0.411514
-0.232806
-0.138512
-0.0750425
-0.0472559
-0.0430703
-0.114505
-0.265859
-0.372059
-0.509452
-0.518379
-0.457894
-0.246365
-0.151931
-0.167832
-0.154085
-0.110464
-0.0735592
-0.146848
-0.116694
-0.112635
-0.0699891
-0.13673
-0.21846
-0.230052
-0.186718
-0.110921
-0.0628627
-0.0448772
-0.0383663
-0.039168
-0.0745422
-0.172378
-0.248831
-0.349149
-0.311709
-0.24349
-0.147145
-0.140529
-0.188856
-0.164601
-0.106747
-0.0790884
-0.153479
-0.0795915
-0.0781586
-0.120561
-0.181516
-0.179797
-0.121291
-0.0826141
-0.0589958
-0.0487892
-0.0403689
-0.0378203
-0.0379202
-0.0573637
-0.101884
-0.165751
-0.190452
-0.221
-0.194913
-0.133608
-0.159464
-0.203918
-0.167519
-0.101151
-0.09665
-0.210314
-0.0815409
-0.0744753
-0.116489
-0.206315
-0.208986
-0.135264
-0.0973566
-0.0747559
-0.0634323
-0.0596599
-0.0633453
-0.0828083
-0.113468
-0.145417
-0.162084
-0.163624
-0.167911
-0.144579
-0.151549
-0.169855
-0.191262
-0.161312
-0.0953067
-0.112863
-0.267305
-0.0989029
-0.0706988
-0.0990652
-0.182928
-0.212421
-0.195796
-0.165598
-0.146548
-0.143884
-0.151158
-0.142071
-0.130347
-0.116366
-0.115752
-0.124926
-0.131747
-0.125657
-0.120496
-0.172531
-0.160014
-0.148438
-0.131303
-0.0883712
-0.128229
-0.242534
-0.130967
-0.0742772
-0.0912205
-0.115682
-0.146866
-0.164485
-0.161747
-0.155232
-0.152602
-0.163635
-0.169006
-0.167986
-0.190025
-0.157539
-0.108648
-0.0985405
-0.103051
-0.131785
-0.167211
-0.142075
-0.128811
-0.111151
-0.0847732
-0.129201
-0.179547
-0.220509
-0.116071
-0.0958854
-0.0944166
-0.101064
-0.124314
-0.129561
-0.139907
-0.140398
-0.14653
-0.158682
-0.160032
-0.180787
-0.241484
-0.234778
-0.170716
-0.115324
-0.113047
-0.130376
-0.133579
-0.12739
-0.108146
-0.084428
-0.10362
-0.121922
-0.225395
-0.239289
-0.184898
-0.126716
-0.111901
-0.110005
-0.111768
-0.120903
-0.121045
-0.122699
-0.132938
-0.133927
-0.145275
-0.199037
-0.218323
-0.20341
-0.159977
-0.127579
-0.119277
-0.121591
-0.119737
-0.106927
-0.0821054
-0.0720205
-0.106533
-0.173912
-0.268948
-0.311379
-0.288807
-0.195192
-0.123459
-0.0796412
-0.0890668
-0.0922096
-0.0930014
-0.0982812
-0.0969353
-0.0980796
-0.120295
-0.151066
-0.157561
-0.152403
-0.147656
-0.130065
-0.121221
-0.116618
-0.107411
-0.0815869
-0.0676607
-0.107157
-0.0907348
-0.166579
-0.291194
-0.326016
-0.312991
-0.203253
-0.0925379
-0.0650276
-0.0614715
-0.0623592
-0.0661354
-0.0675073
-0.0754019
-0.104681
-0.122505
-0.135594
-0.156166
-0.153096
-0.138932
-0.126082
-0.115436
-0.108077
-0.0847511
-0.0743721
-0.0880376
-0.0701451
-0.0799815
-0.168513
-0.301919
-0.318485
-0.297068
-0.158781
-0.0713156
-0.0546533
-0.0561697
-0.0605606
-0.0671945
-0.0857768
-0.120043
-0.126673
-0.136642
-0.155562
-0.152807
-0.138254
-0.12699
-0.115136
-0.109868
-0.0943809
-0.0838388
-0.0792101
-0.0918152
-0.0912964
-0.101162
-0.209734
-0.299239
-0.295133
-0.242351
-0.117571
-0.0598923
-0.0525311
-0.0644173
-0.088498
-0.11878
-0.128214
-0.125473
-0.132328
-0.140341
-0.143864
-0.13048
-0.129544
-0.116245
-0.120045
-0.112124
-0.0836255
-0.0879137
-0.129468
-0.163628
-0.13205
-0.166991
-0.262016
-0.286284
-0.260528
-0.135244
-0.0622901
-0.0595454
-0.0879414
-0.118031
-0.125827
-0.120171
-0.117353
-0.11451
-0.110944
-0.118052
-0.117335
-0.126932
-0.122718
-0.130888
-0.131661
-0.0800041
-0.0946197
-0.14806
-0.362202
-0.130677
-0.118569
-0.229349
-0.257811
-0.242196
-0.130319
-0.0671586
-0.0819486
-0.115956
-0.141426
-0.11814
-0.103259
-0.106816
-0.10341
-0.108799
-0.107826
-0.104273
-0.116253
-0.165552
-0.140155
-0.140517
-0.0819721
-0.11019
-0.175134
-0.430433
-0.216516
-0.107979
-0.162629
-0.248259
-0.235117
-0.116561
-0.0626958
-0.104693
-0.137766
-0.132552
-0.111273
-0.099622
-0.105306
-0.103302
-0.11518
-0.113579
-0.104357
-0.122648
-0.176603
-0.148223
-0.14304
-0.0919238
-0.112423
-0.123886
-0.361632
-0.582615
-0.2652
-0.198887
-0.26463
-0.197837
-0.0842478
-0.0620283
-0.122689
-0.144344
-0.117382
-0.100239
-0.0937794
-0.0971306
-0.114798
-0.114548
-0.108852
-0.118169
-0.137958
-0.169438
-0.155229
-0.139919
-0.094834
-0.115104
-0.10249
-0.292801
-0.474725
-0.423076
-0.264832
-0.239504
-0.128072
-0.073392
-0.0725883
-0.131133
-0.135074
-0.103092
-0.0914723
-0.0833994
-0.07806
-0.1034
-0.112956
-0.109789
-0.131722
-0.141156
-0.142969
-0.157691
-0.123666
-0.0918485
-0.122871
-0.087835
-0.226215
-0.391053
-0.406831
-0.27239
-0.175651
-0.104971
-0.0796616
-0.106128
-0.156863
-0.130645
-0.0972547
-0.0838792
-0.0710501
-0.0627999
-0.0844029
-0.104839
-0.10565
-0.14044
-0.138959
-0.113898
-0.180972
-0.111637
-0.097422
-0.113604
-0.102632
-0.129757
-0.219307
-0.327667
-0.286688
-0.172195
-0.115668
-0.0954983
-0.142016
-0.178497
-0.134204
-0.0865106
-0.0631957
-0.057235
-0.0581712
-0.0776772
-0.0973227
-0.10738
-0.152177
-0.138453
-0.111105
-0.242982
-0.114065
-0.0982482
-0.125046
-0.136851
-0.0752342
-0.0976802
-0.248451
-0.272298
-0.200694
-0.13828
-0.120795
-0.150016
-0.178824
-0.149769
-0.0954581
-0.0738712
-0.0750659
-0.0733562
-0.0792874
-0.0922305
-0.12327
-0.158277
-0.127999
-0.136705
-0.207612
-0.129018
-0.102733
-0.151993
-0.187422
-0.113407
-0.0738066
-0.133507
-0.219951
-0.19558
-0.163204
-0.14757
-0.165432
-0.188831
-0.172178
-0.138631
-0.161668
-0.152498
-0.0774796
-0.0535821
-0.0646048
-0.113833
-0.157906
-0.133765
-0.16394
-0.112103
-0.120106
-0.102689
-0.162691
-0.2814
-0.311145
-0.154686
-0.121118
-0.184539
-0.204634
-0.193035
-0.182956
-0.186691
-0.190212
-0.187305
-0.160247
-0.164423
-0.166003
-0.149418
-0.0939451
-0.0597502
-0.0647413
-0.123263
-0.126259
-0.162135
-0.0974875
-0.0955192
-0.0952817
-0.141839
-0.312024
-0.351307
-0.290589
-0.215275
-0.206651
-0.201818
-0.188995
-0.177082
-0.177492
-0.178479
-0.173158
-0.155159
-0.154498
-0.154583
-0.156828
-0.160269
-0.118679
-0.0715912
-0.0918959
-0.118617
-0.170166
-0.179512
-0.0766929
-0.102228
-0.099936
-0.187074
-0.257043
-0.228663
-0.184211
-0.172626
-0.161297
-0.156115
-0.136871
-0.140182
-0.139453
-0.128013
-0.128491
-0.130873
-0.124411
-0.11945
-0.151349
-0.164335
-0.114861
-0.106773
-0.125989
-0.178082
-0.230365
-0.0867008
-0.104458
-0.117647
-0.0969655
-0.184994
-0.172864
-0.110369
-0.10045
-0.0894637
-0.0881788
-0.0857815
-0.0843227
-0.0866928
-0.0876044
-0.0909866
-0.109494
-0.122071
-0.139084
-0.178011
-0.16608
-0.121419
-0.128967
-0.166996
-0.14498
-0.205479
-0.130619
-0.102034
-0.167795
-0.112605
-0.156709
-0.187314
-0.111508
-0.0994387
-0.0907358
-0.0788382
-0.0753522
-0.0782186
-0.0848895
-0.0854934
-0.0885042
-0.111412
-0.135562
-0.153193
-0.172025
-0.164249
-0.150729
-0.174226
-0.144833
-0.0695522
-0.138636
-0.167467
-0.103535
-0.195937
-0.206743
-0.156178
-0.194497
-0.147236
-0.122842
-0.121623
-0.0824244
-0.0705113
-0.0885346
-0.106945
-0.103345
-0.0983153
-0.118606
-0.150526
-0.146847
-0.148472
-0.168906
-0.179927
-0.161697
-0.135224
-0.144459
-0.0956971
-0.124976
-0.107786
-0.208219
-0.296968
-0.164823
-0.187729
-0.167989
-0.137431
-0.108683
-0.0791975
-0.0805105
-0.102784
-0.183344
-0.231029
-0.160742
-0.134688
-0.148719
-0.128272
-0.153076
-0.181951
-0.184257
-0.166222
-0.136055
-0.215382
-0.140255
-0.104093
-0.109439
-0.20285
-0.275501
-0.186003
-0.170711
-0.167328
-0.134415
-0.0888649
-0.0708317
-0.0974769
-0.174393
-0.283963
-0.347231
-0.232965
-0.158663
-0.147479
-0.125899
-0.163708
-0.197109
-0.205366
-0.224018
-0.207064
-0.182863
-0.18699
-0.107881
-0.108852
-0.184169
-0.223735
-0.230926
-0.154129
-0.153713
-0.105787
-0.0738739
-0.104193
-0.178962
-0.214022
-0.244651
-0.265222
-0.206634
-0.156731
-0.147709
-0.132284
-0.18025
-0.209238
-0.217065
-0.267435
-0.339214
-0.177857
-0.163943
-0.118395
-0.101934
-0.15671
-0.221405
-0.248208
-0.148586
-0.119594
-0.104953
-0.110115
-0.176242
-0.19167
-0.181519
-0.178889
-0.183299
-0.162397
-0.153071
-0.15231
-0.163671
-0.178417
-0.208728
-0.234282
-0.254146
-0.242248
-0.223657
-0.200357
-0.119445
-0.0958487
-0.144491
-0.253086
-0.261182
-0.156351
-0.121613
-0.128773
-0.170507
-0.190858
-0.188049
-0.165656
-0.155113
-0.151492
-0.148501
-0.130312
-0.126454
-0.134026
-0.154681
-0.192332
-0.256064
-0.269837
-0.290542
-0.362155
-0.267312
-0.11689
-0.0932029
-0.169644
-0.352207
-0.319325
-0.211248
-0.139341
-0.148064
-0.176046
-0.197405
-0.216558
-0.206988
-0.151158
-0.140208
-0.139815
-0.130907
-0.126903
-0.130433
-0.135134
-0.149332
-0.215821
-0.25025
-0.31481
-0.347585
-0.265442
-0.0939545
-0.0964387
-0.236057
-0.382995
-0.38326
-0.301354
-0.222575
-0.201611
-0.196668
-0.1845
-0.197447
-0.218928
-0.208369
-0.174246
-0.143584
-0.141439
-0.157112
-0.157354
-0.163814
-0.186883
-0.226223
-0.264224
-0.317313
-0.319042
-0.239438
-0.0871377
-0.0973185
-0.242876
-0.361566
-0.377797
-0.326433
-0.293286
-0.268339
-0.271344
-0.239783
-0.216599
-0.218599
-0.23477
-0.226306
-0.151349
-0.120205
-0.117848
-0.137814
-0.193677
-0.258175
-0.25663
-0.281732
-0.295599
-0.277331
-0.177728
-0.0562367
-0.145285
-0.251732
-0.297866
-0.313549
-0.306309
-0.295189
-0.290474
-0.291793
-0.281567
-0.273813
-0.270739
-0.282995
-0.297537
-0.27172
-0.195667
-0.161762
-0.186161
-0.253705
-0.28154
-0.280162
-0.285981
-0.285637
-0.277834
-0.210687
-0.0871008
-0.784432
-0.702559
-0.641179
-0.595601
-0.584609
-0.59835
-0.648602
-0.681405
-0.740051
-0.787236
-0.820313
-0.8317
-0.852937
-0.877907
-0.869415
-0.864211
-0.846847
-0.823965
-0.74757
-0.696188
-0.660893
-0.67014
-0.682383
-0.738821
-0.77547
-0.992354
-0.991562
-0.989776
-0.989407
-0.988263
-0.99076
-0.992934
-0.994268
-0.996292
-0.99632
-0.996489
-0.996169
-0.995278
-0.993918
-0.993578
-0.992796
-0.992128
-0.99058
-0.989497
-0.988317
-0.986049
-0.985622
-0.985174
-0.985657
-0.986734
-0.9997
-0.999714
-0.999795
-0.999857
-0.999864
-0.999923
-0.999932
-0.999918
-0.999906
-0.999886
-0.999872
-0.999848
-0.999795
-0.999706
-0.999667
-0.999596
-0.999578
-0.999534
-0.999558
-0.999546
-0.999478
-0.999402
-0.999383
-0.999328
-0.99935
-0.99999
-0.999992
-0.999996
-0.999998
-0.999999
-0.999999
-0.999999
-0.999998
-0.999997
-0.999996
-0.999995
-0.999994
-0.999991
-0.999986
-0.999982
-0.999977
-0.999976
-0.999978
-0.99998
-0.999981
-0.999979
-0.999974
-0.999974
-0.999971
-0.999974
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999999
-0.999999
-0.999999
-0.999999
-0.999999
-0.999999
-0.999998
-0.999997
-0.999997
-0.999998
-0.999999
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999998
-0.999998
-0.999998
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999998
-0.999997
-0.999997
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999998
-0.999995
-0.999996
-0.999998
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999997
-0.999994
-0.999994
-0.999997
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999997
-0.999992
-0.999992
-0.999996
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999996
-0.99999
-0.999989
-0.999994
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999996
-0.999989
-0.999987
-0.999992
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999996
-0.999987
-0.999985
-0.999991
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999996
-0.999986
-0.999982
-0.999988
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999996
-0.999984
-0.999979
-0.999986
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999997
-0.999984
-0.999978
-0.999985
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999997
-0.999984
-0.999978
-0.999985
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999998
-0.999987
-0.999982
-0.999987
-0.999999
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-1
-0.999998
-0.999987
-0.999983
-0.999988
-0.999999
-1
-)
-;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 0.5;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
-    }
-
-    walls
-    {
-        type            zeroGradient;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
deleted file mode 100644
index d5ee15eb79..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- 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;
-    object      epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -3 0 0 0 0];
-
-internalField   uniform 0.1;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 0.1;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 0.1;
-        value           uniform 0.1;
-    }
-
-    walls
-    {
-        type            zeroGradient;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
deleted file mode 100644
index a791cb824f..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- 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;
-    object      k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -2 0 0 0 0];
-
-internalField   uniform 1e-8;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 1e-8;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1e-8;
-        value           uniform 1e-8;
-    }
-
-    walls
-    {
-        type            zeroGradient;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
deleted file mode 100644
index 5fffa73a19..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
+++ /dev/null
@@ -1,1926 +0,0 @@
-/*--------------------------------*- 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;
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   nonuniform List<scalar>
-1875
-(
-6296.13
-6183.25
-6130.53
-6102.97
-6085.59
-6070.83
-6056.52
-6042.12
-6032.24
-6023.39
-6020
-6019.35
-6022.8
-6035.92
-6058.4
-6096.69
-6151.53
-6194.63
-6220.36
-6227.39
-6190.28
-6200.25
-6159.79
-6145.34
-6239.45
-5932.88
-5894.83
-5896
-5896.13
-5896.42
-5893.93
-5892.58
-5888.84
-5884.44
-5877.96
-5872.77
-5864.16
-5858.72
-5859.75
-5863.29
-5874.06
-5903.63
-5933.39
-5949.13
-5948.76
-5936.64
-5920.16
-5894.61
-5887.73
-5904.59
-5829.55
-5827.28
-5827.17
-5826.79
-5820.6
-5810.48
-5802.08
-5795.34
-5787.03
-5775.04
-5773.95
-5776.62
-5774.94
-5777.31
-5779.57
-5787.46
-5807.7
-5827.9
-5860.51
-5895.43
-5910.03
-5904.37
-5908.12
-5902.27
-5915.81
-5680.23
-5677.28
-5676.59
-5674.62
-5670.55
-5664.23
-5662.59
-5662.65
-5654.98
-5651.9
-5655.82
-5654.19
-5660.21
-5667.38
-5675.59
-5686.03
-5699.99
-5707.47
-5731.06
-5747.04
-5757.95
-5746.13
-5751.94
-5752.54
-5756.48
-5596.51
-5594.34
-5595.28
-5587.93
-5584.85
-5580.19
-5581.94
-5583.69
-5581.75
-5582.87
-5588.62
-5593.54
-5600.08
-5606.28
-5613.47
-5620.91
-5626.09
-5639.9
-5656.52
-5690.9
-5692.53
-5685.55
-5691.46
-5690.28
-5692.68
-5500.77
-5499.4
-5498.12
-5490.19
-5484.73
-5481.73
-5483.39
-5482.97
-5483.81
-5486.56
-5489.45
-5492.85
-5498.29
-5502.79
-5509.32
-5513.74
-5523.43
-5538.03
-5541.75
-5560.77
-5558.05
-5558.63
-5564.38
-5561.96
-5569.11
-5429.77
-5429.37
-5425.69
-5419.15
-5415.38
-5412.85
-5412.65
-5411.07
-5410.11
-5408.78
-5409.05
-5408.7
-5412.7
-5415.54
-5421.1
-5425.72
-5431.77
-5440.25
-5439.18
-5444.29
-5457.33
-5463.86
-5472.09
-5470.76
-5481.47
-5339.81
-5337.93
-5335.2
-5328.01
-5325.1
-5320.24
-5318.66
-5315.69
-5313.67
-5312.31
-5310.7
-5311.52
-5313.88
-5317.44
-5323.51
-5333.7
-5347.39
-5349.64
-5342.77
-5322.66
-5327.03
-5336.54
-5355.71
-5357.95
-5365.12
-5251.22
-5257.02
-5245.19
-5241.32
-5235.96
-5230.82
-5224.79
-5220.71
-5215.58
-5212.63
-5208.81
-5207.86
-5209.49
-5211.23
-5215.25
-5217.38
-5227.33
-5236.75
-5234.3
-5218.38
-5221.33
-5238.35
-5270.98
-5297.32
-5285.38
-5134.78
-5141.28
-5129.11
-5125.34
-5118.41
-5113.56
-5104.26
-5098.63
-5091.73
-5085.87
-5080.29
-5076.67
-5075.57
-5074.74
-5078.38
-5083.91
-5093.59
-5100.11
-5107.38
-5107.94
-5122.84
-5155.95
-5184.47
-5216.19
-5206.06
-5029.85
-5023.59
-5029.5
-5013.09
-5006.47
-5001.87
-4991.19
-4982.46
-4973.99
-4966.68
-4961.15
-4956.84
-4956.99
-4958.22
-4962.14
-4968.3
-4976.1
-4986.28
-4991.41
-4991.3
-4995.3
-5013.36
-5037.47
-5054.9
-5054.19
-4890.06
-4882.82
-4894.45
-4873.06
-4880.32
-4867.96
-4857.91
-4849.54
-4841.6
-4834.95
-4830.57
-4826.25
-4825.98
-4826
-4828.43
-4831.83
-4833.12
-4837.79
-4826.5
-4809.86
-4805.99
-4807.58
-4826.08
-4838.35
-4849.96
-4714.62
-4711.97
-4714.51
-4705
-4712.73
-4717.07
-4710.49
-4705.38
-4701.03
-4698.8
-4697.36
-4696.05
-4695.76
-4695.5
-4695.28
-4694.77
-4692.61
-4684.45
-4666.01
-4637.19
-4617.3
-4609.3
-4624.85
-4629.39
-4642.5
-4523.06
-4524.71
-4511.18
-4518.2
-4532.12
-4535.39
-4532.36
-4536.62
-4540.76
-4541.39
-4546.94
-4550.14
-4553.57
-4554.46
-4552.79
-4548.86
-4539.3
-4524.99
-4496.6
-4460.83
-4442.56
-4425.45
-4434.71
-4439.78
-4450.38
-4371.81
-4372.7
-4361.27
-4367.5
-4369.38
-4376.32
-4375.22
-4378.42
-4383.14
-4389.68
-4398.4
-4408.96
-4416.32
-4420.86
-4420.99
-4416.68
-4401.43
-4378.84
-4354.01
-4322.2
-4302.78
-4293.71
-4296.25
-4303.54
-4305.22
-4239.77
-4240.95
-4230.58
-4241.42
-4249.56
-4255.4
-4253.65
-4259.03
-4262.5
-4269.1
-4276.6
-4286.18
-4297.58
-4303.77
-4311.08
-4299.92
-4285.78
-4267.75
-4237.04
-4223.55
-4200.59
-4202.11
-4196.31
-4204.32
-4206.45
-4146.5
-4145.49
-4139.78
-4144.33
-4155.96
-4170.77
-4169.64
-4166.97
-4162.64
-4164.54
-4168.33
-4176.24
-4182.78
-4189.55
-4185.86
-4184.88
-4173.3
-4158.6
-4140.45
-4133.47
-4115.66
-4121.51
-4116.35
-4120.3
-4121.23
-4102.95
-4103.86
-4099.71
-4102.17
-4104.47
-4111.01
-4105.54
-4100.41
-4083.36
-4078.2
-4069.78
-4064.79
-4065.88
-4070.09
-4072.82
-4073.35
-4070.25
-4064.82
-4062.31
-4042.21
-4043.05
-4042.59
-4045.18
-4046.01
-4048.13
-4032.15
-4035.14
-4028.68
-4028.22
-4014.15
-3997.14
-3996.25
-3976.92
-3959.31
-3938.8
-3934.92
-3934.92
-3946.84
-3949.95
-3958.19
-3964.72
-3973.8
-3972.13
-3963.12
-3956.34
-3965.47
-3964.16
-3969.75
-3970.48
-3972.74
-3971.33
-3971.63
-3969.38
-3967.06
-3968.39
-3943.28
-3910.35
-3884.37
-3861.89
-3837.93
-3827.63
-3826.91
-3837.33
-3850.34
-3860.21
-3865.31
-3871.77
-3866.62
-3871.02
-3875.25
-3884.01
-3887.22
-3893.04
-3893.8
-3896.7
-3917.09
-3913.8
-3913.32
-3912.68
-3912.47
-3896.81
-3850.81
-3796.7
-3778.85
-3771.98
-3774.64
-3779.2
-3787.05
-3791.83
-3794.09
-3791.58
-3795.13
-3799.01
-3801.91
-3808.11
-3808.81
-3814.53
-3815.73
-3818.71
-3819.36
-3828.46
-3820.53
-3819.93
-3814.39
-3808.93
-3766.04
-3739.6
-3724.01
-3718.07
-3712.81
-3714.72
-3721.59
-3733.84
-3739.77
-3740.59
-3734.56
-3737.28
-3743.07
-3745.23
-3751.77
-3749.9
-3751.12
-3747.66
-3749.18
-3748.73
-3723.23
-3711.43
-3717.34
-3704.45
-3691.91
-3677.36
-3662.34
-3653.8
-3648.59
-3646.73
-3652.46
-3662.08
-3676.04
-3684.36
-3684.74
-3678.21
-3672.87
-3671.25
-3667.14
-3666.07
-3660.68
-3657.48
-3655.93
-3655.47
-3655.5
-3586.18
-3578.34
-3582.86
-3572.31
-3567.65
-3550.99
-3537.87
-3525.19
-3518.27
-3514.63
-3520.79
-3525.1
-3534.78
-3538.86
-3539.29
-3543.13
-3550.55
-3556.94
-3559.06
-3560.38
-3555.81
-3556.85
-3555.01
-3557.07
-3556.94
-3476.58
-3473.6
-3467.31
-3457.76
-3442.56
-3431.12
-3420.39
-3411.43
-3407.71
-3404.13
-3401.26
-3396.55
-3393.36
-3401.61
-3406.07
-3412.62
-3422.58
-3432.15
-3440.88
-3445.51
-3446.08
-3449.24
-3451.23
-3453.74
-3454.4
-3386.34
-3401.96
-3377.92
-3367.15
-3351.35
-3343.8
-3330.12
-3321.91
-3312.27
-3306.28
-3300.42
-3296.61
-3292.69
-3293.58
-3289.36
-3294.53
-3300.53
-3308.72
-3317.27
-3322.27
-3328.25
-3333.22
-3337.59
-3341.61
-3342.04
-3270.33
-3282.79
-3257
-3254.74
-3237.46
-3236.79
-3224.97
-3223.1
-3214.92
-3209.14
-3204.8
-3201.41
-3198.47
-3196.71
-3195.02
-3193.94
-3194.86
-3199.83
-3210.11
-3216.96
-3222.33
-3226
-3228.96
-3231.36
-3231.97
-3145.06
-3139.47
-3141.64
-3132.87
-3117.15
-3108
-3107.7
-3103.41
-3104.14
-3103.49
-3103.4
-3102.11
-3100.75
-3100.69
-3100.05
-3100.91
-3102.12
-3104
-3108.52
-3112.94
-3117.37
-3120.48
-3123.25
-3125.06
-3125.64
-3039.03
-3034.71
-3044.89
-3028.17
-3014.83
-2998.54
-2991.82
-2988.31
-2990.89
-2990.76
-2992.82
-2992.71
-2992.91
-2993.55
-2993.93
-2996.52
-2998.77
-3001.81
-3003.8
-3006.3
-3008.47
-3010.71
-3013.02
-3013.98
-3014.73
-2908.73
-2907.67
-2915.01
-2902.96
-2883.11
-2870.53
-2861.82
-2861.77
-2858.11
-2866.01
-2868.24
-2871.95
-2874.15
-2877.48
-2879.23
-2881.94
-2885.54
-2888.54
-2889.22
-2891.04
-2892.59
-2894.76
-2896.72
-2897.24
-2898.08
-2743.7
-2742.01
-2738.5
-2725.55
-2717.81
-2712.86
-2711.05
-2715.87
-2724.18
-2734.62
-2743.94
-2749.05
-2753.75
-2756.91
-2760.57
-2764.19
-2768.42
-2770.96
-2772.39
-2774.26
-2775.19
-2776.7
-2779.08
-2778.79
-2779.65
-2565.53
-2560.37
-2552.02
-2536.37
-2538.07
-2543.7
-2562.95
-2577.19
-2589.69
-2603.57
-2622.53
-2629.62
-2635.93
-2638.27
-2641.85
-2646.21
-2650.1
-2652.23
-2654.12
-2654.38
-2656.38
-2656.95
-2658.31
-2658.33
-2659
-2389.07
-2379.85
-2367.53
-2354.3
-2366.15
-2384.52
-2405.82
-2433.43
-2462.89
-2488.05
-2504.2
-2511.52
-2516.4
-2518.23
-2521.69
-2525.69
-2529.22
-2531.56
-2533.69
-2534.55
-2536.77
-2538.52
-2538.07
-2539.44
-2539.43
-2273.44
-2271.89
-2265.88
-2258.46
-2270.69
-2284.82
-2303.38
-2320.92
-2344.94
-2368.77
-2388.71
-2394.95
-2400.64
-2402.63
-2405.76
-2407.81
-2409.72
-2410.94
-2410.53
-2414.6
-2417.09
-2418.33
-2418.34
-2420.27
-2419.98
-2185.65
-2185.04
-2177.85
-2185.4
-2179.64
-2198.58
-2203.6
-2217.85
-2237.88
-2261.45
-2281.47
-2286.63
-2291.77
-2295.98
-2295.29
-2295
-2293.4
-2291.66
-2293.09
-2294.87
-2299.02
-2301.11
-2301.98
-2303.28
-2302.96
-2091.49
-2091.8
-2084.97
-2086.93
-2079.18
-2084.09
-2087.53
-2100.32
-2126.33
-2149.78
-2166.81
-2172.17
-2178.09
-2182.93
-2181.73
-2179.44
-2176.5
-2174.1
-2177.42
-2178.54
-2180.89
-2182.27
-2186.01
-2185.47
-2186.4
-2019.46
-2019.6
-2015.77
-2015.14
-2013.82
-2011.58
-2012.35
-2017.51
-2024.81
-2034.17
-2042.04
-2045.58
-2054.16
-2056.02
-2060.91
-2061.06
-2061.84
-2065.31
-2067.03
-2067.91
-2068.01
-2069.22
-2074.55
-2072.99
-2075.21
-1941.72
-1942.55
-1944.6
-1944.6
-1943.14
-1940.45
-1935.96
-1930.74
-1921.85
-1910.23
-1906.16
-1907.96
-1916.47
-1922.35
-1930.54
-1936.69
-1942.73
-1948.6
-1953.45
-1955.74
-1957.09
-1958.79
-1964.58
-1962.03
-1967.35
-1859.93
-1862.27
-1867.44
-1868.49
-1871.4
-1864.79
-1856.13
-1837.86
-1816.62
-1792.52
-1776.69
-1780.67
-1786.01
-1795.7
-1805.76
-1816.65
-1826.23
-1832.42
-1841.3
-1846.17
-1853.55
-1857.44
-1862.73
-1864.65
-1867.63
-1742.2
-1743.56
-1744.86
-1750.46
-1751.86
-1752.18
-1744.94
-1730.61
-1713.95
-1693.05
-1674.63
-1672.45
-1671.49
-1678.13
-1685.56
-1695.24
-1704.8
-1715.69
-1731.89
-1744.37
-1749.79
-1759.79
-1761.02
-1770.11
-1765.85
-1624.33
-1621.69
-1621.28
-1623.55
-1629.86
-1634.84
-1629.82
-1625.27
-1615.57
-1605.67
-1593.17
-1587.41
-1583.62
-1584.26
-1588.12
-1596.64
-1605.76
-1628.49
-1642.54
-1656.53
-1655.76
-1659.92
-1648.25
-1661.23
-1652.41
-1502.84
-1498.24
-1494.11
-1489.61
-1491.48
-1495.03
-1499.24
-1513.36
-1522.63
-1525.6
-1522.69
-1517.07
-1510.85
-1506.74
-1505.54
-1505.4
-1510.6
-1521.74
-1541.45
-1558.61
-1552.85
-1551.76
-1535.75
-1530.96
-1532.7
-1438.35
-1431.98
-1423.78
-1418.2
-1414.02
-1410.95
-1421.88
-1440.09
-1454.87
-1458.63
-1455.01
-1445.78
-1434.66
-1425.7
-1419.12
-1415.68
-1415.72
-1417.64
-1423.6
-1431.4
-1433.84
-1435.92
-1428.46
-1424.99
-1425.27
-1387.36
-1391.52
-1382.5
-1371.77
-1362.64
-1361.03
-1365.55
-1375.58
-1381.01
-1381.31
-1373.07
-1361.69
-1345.78
-1330.35
-1319.62
-1310.89
-1308.23
-1306.43
-1305.91
-1307.7
-1313.27
-1327.02
-1336.01
-1327.81
-1331.15
-1271.79
-1273.08
-1271.98
-1264.17
-1251.26
-1244.99
-1245.76
-1252.42
-1257
-1256.72
-1250.08
-1237.94
-1222.68
-1208.14
-1196.98
-1192.02
-1186.21
-1184.68
-1188.51
-1191.85
-1205.01
-1215.73
-1233.25
-1224.72
-1226.75
-1127.1
-1125.64
-1124.39
-1121.85
-1113.42
-1103.67
-1098.39
-1099.57
-1105.61
-1109.52
-1106.77
-1098.48
-1089
-1080.43
-1073.92
-1073.24
-1072.25
-1071.29
-1071.75
-1074.4
-1078.62
-1085.51
-1095.53
-1095.67
-1096.26
-992.294
-991.13
-986.281
-990.794
-983.274
-976.232
-971.001
-968.971
-970.743
-974.382
-967.38
-958.104
-950.768
-948.08
-946.549
-948.871
-950.382
-951.44
-951.025
-953.739
-950.888
-963.575
-953.716
-963.393
-962.334
-890.836
-890.007
-886.517
-889.188
-888.797
-887.558
-882.258
-875.452
-866.168
-854.814
-842.425
-829.034
-823.448
-825.3
-826.065
-829.316
-832.018
-831.086
-828.139
-829.794
-822.199
-832.926
-830.89
-834.839
-836.224
-798.119
-798.959
-798.146
-794.879
-795.855
-790.952
-790.489
-782.988
-775.087
-756.826
-738.278
-726.414
-724.974
-724.246
-723.204
-723.369
-721.642
-719.099
-710.316
-697.385
-679.975
-674.28
-688.78
-688.589
-696.624
-694.405
-693.345
-698.272
-689.258
-690.501
-687.553
-687.301
-681.852
-671.592
-659.784
-649.31
-644.201
-642.081
-639.871
-634.96
-632.393
-627.156
-622.901
-613.168
-598.754
-587.397
-580.568
-587.953
-589.947
-592.531
-575.596
-574.55
-578.335
-571.262
-575.126
-570.818
-571.44
-565.333
-563.994
-557.653
-557.057
-557.073
-557.351
-557.971
-555.384
-555.633
-552.015
-548.591
-537.679
-522.905
-508.967
-504.995
-501.762
-502.865
-506.834
-448.634
-446.606
-441.379
-444.536
-445.296
-443.761
-444.059
-445.756
-447.579
-450.807
-450.866
-455.388
-461.553
-467.52
-474.518
-479.626
-477.622
-471.502
-455.883
-440.965
-425.702
-419.971
-419.591
-421.465
-426.135
-327.686
-323.738
-318.303
-321.504
-324.04
-322.727
-325.782
-330.743
-336.641
-341.885
-344.784
-352.115
-359.02
-367.046
-375.031
-383.301
-386.722
-384.298
-377.603
-369.778
-365.622
-363.641
-369.767
-373.676
-379.99
-241.456
-237.463
-233.772
-236.247
-235.733
-232.785
-232.205
-235.193
-239.329
-242.543
-242.908
-243.094
-245.917
-250.612
-255.394
-256.106
-257.516
-253.698
-252.154
-259.734
-270.969
-277.671
-284.418
-288.332
-290.567
-170.45
-169.594
-168.777
-170.885
-170.431
-166.804
-162.034
-160.137
-158.841
-159.069
-159.23
-158.955
-159.443
-159.867
-163.016
-164.058
-164.345
-161.325
-163.141
-170.599
-175.042
-179.359
-182.47
-184.371
-184.848
-69.1085
-73.6312
-78.3502
-83.8631
-83.2866
-79.7069
-70.8607
-65.196
-58.0552
-52.5698
-47.5432
-44.4013
-40.9971
-39.2168
-44.3652
-48.4222
-52.8974
-55.6685
-63.8615
-70.3526
-77.103
-79.0083
-80.6254
-78.5936
-78.1597
-5.21762
-5.54303
-6.21406
-6.5862
-6.97536
-6.04707
-5.1582
-4.67529
-3.96973
-3.91805
-3.85068
-3.97955
-4.24419
-4.60187
-4.58482
-4.73677
-4.97607
-5.56779
-5.98771
-6.44586
-7.31777
-7.4187
-7.38624
-6.79915
-6.2811
-2.60843
-2.60082
-2.59544
-2.574
-2.56327
-2.53915
-2.52407
-2.51319
-2.50267
-2.50354
-2.50313
-2.51034
-2.51996
-2.53785
-2.55085
-2.5752
-2.5913
-2.61602
-2.6272
-2.64475
-2.66551
-2.6892
-2.70386
-2.72564
-2.73192
-2.17545
-2.17432
-2.17254
-2.17118
-2.16971
-2.16884
-2.16875
-2.16917
-2.17074
-2.17198
-2.17338
-2.17488
-2.17495
-2.17499
-2.17384
-2.17487
-2.17478
-2.17659
-2.17631
-2.17759
-2.17752
-2.17913
-2.17829
-2.1787
-2.17787
-2.04089
-2.04068
-2.04118
-2.04152
-2.04136
-2.04222
-2.04304
-2.04335
-2.04473
-2.0445
-2.04444
-2.04311
-2.04132
-2.03846
-2.03706
-2.03531
-2.03452
-2.03333
-2.03303
-2.03251
-2.03159
-2.03142
-2.03102
-2.03115
-2.0311
-1.8995
-1.89922
-1.89946
-1.89964
-1.89961
-1.89979
-1.89968
-1.89943
-1.89907
-1.89835
-1.8975
-1.89651
-1.89491
-1.89377
-1.8926
-1.89154
-1.8906
-1.88973
-1.88905
-1.88848
-1.88785
-1.88711
-1.88686
-1.88627
-1.88633
-1.77653
-1.77666
-1.77687
-1.77695
-1.77713
-1.77716
-1.77724
-1.7771
-1.77697
-1.77662
-1.77613
-1.7756
-1.77522
-1.77457
-1.77389
-1.77326
-1.77257
-1.77208
-1.7714
-1.77091
-1.77041
-1.77005
-1.76976
-1.76958
-1.76941
-1.63781
-1.6378
-1.6377
-1.63767
-1.63752
-1.63738
-1.63715
-1.63682
-1.63643
-1.6359
-1.63542
-1.63483
-1.63445
-1.6338
-1.63323
-1.63265
-1.63219
-1.63165
-1.63134
-1.63099
-1.63071
-1.63038
-1.63013
-1.62993
-1.62988
-1.51282
-1.51284
-1.51282
-1.51284
-1.5128
-1.51277
-1.51267
-1.51255
-1.51241
-1.51221
-1.51213
-1.5117
-1.51131
-1.51112
-1.5109
-1.5106
-1.51038
-1.51
-1.50972
-1.50943
-1.50929
-1.50912
-1.50903
-1.50887
-1.5088
-1.37554
-1.37557
-1.37551
-1.37547
-1.37539
-1.37526
-1.37511
-1.37491
-1.37471
-1.37446
-1.37428
-1.37409
-1.37381
-1.3733
-1.37291
-1.37262
-1.37229
-1.37216
-1.37199
-1.37189
-1.37176
-1.37161
-1.37142
-1.37128
-1.37126
-1.24919
-1.24912
-1.24913
-1.24911
-1.24907
-1.24905
-1.24895
-1.2489
-1.24877
-1.24873
-1.24852
-1.24843
-1.24825
-1.24816
-1.24797
-1.24776
-1.24766
-1.24758
-1.24758
-1.24756
-1.24764
-1.2476
-1.24764
-1.2475
-1.24748
-1.11318
-1.1132
-1.1132
-1.11315
-1.1131
-1.113
-1.11293
-1.1128
-1.11269
-1.11263
-1.11246
-1.11222
-1.11212
-1.1119
-1.1119
-1.11173
-1.11166
-1.11156
-1.11144
-1.11144
-1.11139
-1.1114
-1.11126
-1.11117
-1.11112
-0.986047
-0.98605
-0.986021
-0.985994
-0.985958
-0.985953
-0.985902
-0.985882
-0.985862
-0.985753
-0.985696
-0.985757
-0.985718
-0.985741
-0.985653
-0.985684
-0.985621
-0.985668
-0.985679
-0.985742
-0.985764
-0.985816
-0.985801
-0.985722
-0.985683
-0.850852
-0.850828
-0.850842
-0.850796
-0.850764
-0.850715
-0.850595
-0.850523
-0.850386
-0.850218
-0.850163
-0.850059
-0.850021
-0.849933
-0.849904
-0.849827
-0.849897
-0.849844
-0.849967
-0.849956
-0.850129
-0.850129
-0.850119
-0.850004
-0.849993
-0.72322
-0.723219
-0.723168
-0.723188
-0.723205
-0.72319
-0.723291
-0.723312
-0.723289
-0.723364
-0.723374
-0.723393
-0.723413
-0.723427
-0.723469
-0.723464
-0.723433
-0.723435
-0.72342
-0.723495
-0.723593
-0.723675
-0.72367
-0.723614
-0.723624
-0.588544
-0.588553
-0.588524
-0.58856
-0.588456
-0.588381
-0.588228
-0.588079
-0.588023
-0.587939
-0.587933
-0.587901
-0.587847
-0.58787
-0.587778
-0.587892
-0.58775
-0.58788
-0.587929
-0.587983
-0.588115
-0.588224
-0.588247
-0.588184
-0.588176
-0.460733
-0.460707
-0.460783
-0.460706
-0.460777
-0.460789
-0.460852
-0.4609
-0.460948
-0.461034
-0.461033
-0.460993
-0.46101
-0.460953
-0.46097
-0.460876
-0.46099
-0.460862
-0.46089
-0.460867
-0.461056
-0.461141
-0.461208
-0.4611
-0.461116
-0.3263
-0.32631
-0.326259
-0.326284
-0.326204
-0.326162
-0.326065
-0.32599
-0.325944
-0.325867
-0.3258
-0.325803
-0.325782
-0.325739
-0.325783
-0.325732
-0.325814
-0.325752
-0.325748
-0.325634
-0.325831
-0.325858
-0.325945
-0.325862
-0.325925
-0.198387
-0.198387
-0.19838
-0.198379
-0.19838
-0.198385
-0.198408
-0.198401
-0.198452
-0.198453
-0.198529
-0.198519
-0.198553
-0.198528
-0.198507
-0.198412
-0.198322
-0.198197
-0.198173
-0.198015
-0.198055
-0.198112
-0.198217
-0.198335
-0.198368
-0.0639617
-0.0639706
-0.0639747
-0.0639733
-0.0639593
-0.0639489
-0.0639239
-0.0639184
-0.0638669
-0.0638353
-0.0637998
-0.0637847
-0.0637588
-0.0637369
-0.0637026
-0.063645
-0.0636016
-0.0635269
-0.06342
-0.0632935
-0.0631483
-0.0632062
-0.063256
-0.0633831
-0.0634023
-)
-;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    outlet
-    {
-        type            fixedValue;
-        value           uniform 0;
-    }
-
-    walls
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties
deleted file mode 100644
index 552ecb32c7..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- 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       dictionary;
-    location    "constant";
-    object      RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel        laminar;
-
-turbulence      off;
-
-printCoeffs     off;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
deleted file mode 100644
index e0ac2653b5..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- 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       uniformDimensionedVectorField;
-    location    "constant";
-    object      g;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -2 0 0 0 0];
-value           ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
deleted file mode 100644
index 8ab4654b46..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
+++ /dev/null
@@ -1,73 +0,0 @@
-/*--------------------------------*- 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       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 1;
-
-vertices
-(
-    (0 0 0)
-    (0.15 0 0)
-    (0.15 1 0)
-    (0 1 0)
-    (0 0 0.1)
-    (0.15 0 0.1)
-    (0.15 1 0.1)
-    (0 1 0.1)
-);
-
-blocks
-(
-    hex (0 1 2 3 4 5 6 7) (25 75 1) simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-boundary
-(
-    inlet
-    {
-        type patch;
-        faces
-        (
-            (1 5 4 0)
-        );
-    }
-    outlet
-    {
-        type patch;
-        faces
-        (
-            (3 7 6 2)
-        );
-    }
-    walls
-    {
-        type wall;
-        faces
-        (
-            (0 4 7 3)
-            (2 6 5 1)
-        );
-    }
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
deleted file mode 100644
index 56e0a545c1..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- 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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-4
-(
-    inlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3650;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          25;
-        startFace       3675;
-    }
-    walls
-    {
-        type            wall;
-        nFaces          150;
-        startFace       3700;
-    }
-    defaultFaces
-    {
-        type            empty;
-        nFaces          3750;
-        startFace       3850;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
deleted file mode 100644
index 2ddae4195c..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- 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       dictionary;
-    location    "constant";
-    object      transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-rho1            rho1 [ 1 -3 0 0 0 0 0 ] 1;
-
-rho2            rho2 [ 1 -3 0 0 0 0 0 ] 1000;
-
-nu1             nu1 [ 0 2 -1 0 0 0 0 ] 1.6e-05;
-
-nu2             nu2 [ 0 2 -1 0 0 0 0 ] 1e-06;
-
-d1              d1 [ 0 1 0 0 0 0 0 ] 0.003;
-
-d2              d2 [ 0 1 0 0 0 0 0 ] 0.0001;
-
-Cvm             Cvm [ 0 0 0 0 0 0 0 ] 0.5;
-
-Cl              Cl [ 0 0 0 0 0 0 0 ] 0;
-
-Ct              Ct [ 0 0 0 0 0 0 0 ] 1;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
deleted file mode 100644
index aa06cb9745..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
+++ /dev/null
@@ -1,49 +0,0 @@
-/*--------------------------------*- 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       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     bubbleFoam;
-
-startFrom       startTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         20;
-
-deltaT          0.002;
-
-writeControl    runTime;
-
-writeInterval   0.5;
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression uncompressed;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable yes;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
deleted file mode 100644
index 0779f1ea22..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
+++ /dev/null
@@ -1,65 +0,0 @@
-/*--------------------------------*- 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       dictionary;
-    location    "system";
-    object      fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
-    default         Euler;
-}
-
-gradSchemes
-{
-    default         Gauss linear;
-}
-
-divSchemes
-{
-    default         none;
-    div(phi1,U1)    Gauss limitedLinearV 1;
-    div(phi2,U2)    Gauss limitedLinearV 1;
-    div(phi2,k)     Gauss limitedLinear 1;
-    div(phi2,epsilon) Gauss limitedLinear 1;
-    div(phi,alpha1)  Gauss limitedLinear01 1;
-    div((-nuEff1*T(grad(U1)))) Gauss linear;
-    div((-nuEff2*T(grad(U2)))) Gauss linear;
-}
-
-laplacianSchemes
-{
-    default         none;
-    laplacian(nuEff1,U1) Gauss linear corrected;
-    laplacian(nuEff2,U2) Gauss linear corrected;
-    laplacian(Dp,p) Gauss linear corrected;
-}
-
-interpolationSchemes
-{
-    default         linear;
-}
-
-snGradSchemes
-{
-    default         corrected;
-}
-
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
deleted file mode 100644
index f9046b1447..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- 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       dictionary;
-    location    "system";
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    p
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-10;
-        relTol          0.1;
-    }
-
-    pFinal
-    {
-        $p;
-        tolerance       1e-10;
-        relTol          0;
-    }
-
-    alpha1
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-10;
-        relTol          0.1;
-    }
-
-    alpha1Final
-    {
-        $alpha1;
-        tolerance       1e-10;
-        relTol          0;
-    }
-}
-
-PIMPLE
-{
-    nCorrectors     2;
-    nNonOrthogonalCorrectors 0;
-    nAlphaCorr      2;
-    correctAlpha    no;
-    pRefCell        0;
-    pRefValue       0;
-}
-
-
-// ************************************************************************* //

From 63a406e935a4b1869159bc343e7a924e5359ff03 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:44:23 +0000
Subject: [PATCH 52/81] settlingFoam: Changed from reading alpha to reading
 Alpha to support more complex BCs for Alpha

---
 .../multiphase/settlingFoam/createFields.H        | 15 +++++++--------
 .../settlingFoam/ras/dahl/0/{alpha => Alpha}      |  2 +-
 .../ras/dahl/constant/polyMesh/boundary           |  1 +
 .../settlingFoam/ras/tank3D/0/{alpha => Alpha}    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename tutorials/multiphase/settlingFoam/ras/dahl/0/{alpha => Alpha} (98%)
 rename tutorials/multiphase/settlingFoam/ras/tank3D/0/{alpha => Alpha} (98%)

diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H
index 8d161edd82..9a9fdee2df 100644
--- a/applications/solvers/multiphase/settlingFoam/createFields.H
+++ b/applications/solvers/multiphase/settlingFoam/createFields.H
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field alpha\n" << endl;
-    volScalarField alpha
+    Info<< "Reading field Alpha\n" << endl;
+    volScalarField Alpha
     (
         IOobject
         (
-            "alpha",
+            "Alpha",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -100,21 +100,20 @@
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        (scalar(1) - alpha)*rhoc + alpha*rhod
+        rhoc/(scalar(1) + (rhoc/rhod - 1.0)*Alpha)
     );
 
-    volScalarField Alpha
+    volScalarField alpha
     (
         IOobject
         (
-            "Alpha",
+            "alpha",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        alpha*rhod/rho,
-        alpha.boundaryField().types()
+        rho*Alpha/rhod
     );
 
     #include "compressibleCreatePhi.H"
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha b/tutorials/multiphase/settlingFoam/ras/dahl/0/Alpha
similarity index 98%
rename from tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
rename to tutorials/multiphase/settlingFoam/ras/dahl/0/Alpha
index 807802b1d1..2ed64edd59 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/Alpha
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      Alpha;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
index 35adf2fb7d..f460b43a07 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
@@ -50,6 +50,7 @@ FoamFile
     frontAndBack
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          16000;
         startFace       16240;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha b/tutorials/multiphase/settlingFoam/ras/tank3D/0/Alpha
similarity index 98%
rename from tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
rename to tutorials/multiphase/settlingFoam/ras/tank3D/0/Alpha
index 67aa1fa666..6bbcf6c93b 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/Alpha
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      Alpha;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 8f45806c1d75500de665246dcbf2f63d6c7a3fbd Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:45:19 +0000
Subject: [PATCH 53/81] twoPhaseEulerFoam: Files transferred from bubbleFoam

---
 .../twoPhaseEulerFoam/createRASTurbulence.H   | 178 ++++++++++++++++++
 .../multiphase/twoPhaseEulerFoam/kEpsilon.H   |  64 +++++++
 .../twoPhaseEulerFoam/wallDissipation.H       |  50 +++++
 .../twoPhaseEulerFoam/wallFunctions.H         |  81 ++++++++
 .../twoPhaseEulerFoam/wallViscosity.H         |  36 ++++
 5 files changed, 409 insertions(+)
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/createRASTurbulence.H
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/kEpsilon.H
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/wallFunctions.H
 create mode 100644 applications/solvers/multiphase/twoPhaseEulerFoam/wallViscosity.H

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createRASTurbulence.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createRASTurbulence.H
new file mode 100644
index 0000000000..bacd835655
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createRASTurbulence.H
@@ -0,0 +1,178 @@
+    IOdictionary RASProperties
+    (
+        IOobject
+        (
+            "RASProperties",
+            runTime.constant(),
+            mesh,
+            IOobject::MUST_READ_IF_MODIFIED,
+            IOobject::NO_WRITE
+        )
+    );
+
+
+    Switch turbulence
+    (
+        RASProperties.lookup("turbulence")
+    );
+
+    dictionary kEpsilonDict
+    (
+        RASProperties.subDictPtr("kEpsilonCoeffs")
+    );
+
+    dimensionedScalar Cmu
+    (
+        dimensionedScalar::lookupOrAddToDict
+        (
+            "Cmu",
+            kEpsilonDict,
+            0.09
+        )
+    );
+
+    dimensionedScalar C1
+    (
+        dimensionedScalar::lookupOrAddToDict
+        (
+            "C1",
+            kEpsilonDict,
+            1.44
+        )
+    );
+
+    dimensionedScalar C2
+    (
+        dimensionedScalar::lookupOrAddToDict
+        (
+            "C2",
+            kEpsilonDict,
+            1.92
+        )
+    );
+
+    dimensionedScalar alpha1k
+    (
+        dimensionedScalar::lookupOrAddToDict
+        (
+            "alpha1k",
+            kEpsilonDict,
+            1.0
+        )
+    );
+
+    dimensionedScalar alpha1Eps
+    (
+        dimensionedScalar::lookupOrAddToDict
+        (
+            "alpha1Eps",
+            kEpsilonDict,
+            0.76923
+        )
+    );
+
+    dictionary wallFunctionDict
+    (
+        RASProperties.subDictPtr("wallFunctionCoeffs")
+    );
+
+    dimensionedScalar kappa
+    (
+        dimensionedScalar::lookupOrAddToDict
+        (
+            "kappa",
+            wallFunctionDict,
+            0.41
+        )
+    );
+
+    dimensionedScalar E
+    (
+        dimensionedScalar::lookupOrAddToDict
+        (
+            "E",
+            wallFunctionDict,
+            9.8
+        )
+    );
+
+    if (RASProperties.lookupOrDefault("printCoeffs", false))
+    {
+        Info<< "kEpsilonCoeffs" << kEpsilonDict << nl
+            << "wallFunctionCoeffs" << wallFunctionDict << endl;
+    }
+
+
+    nearWallDist y(mesh);
+
+
+    Info<< "Reading field k\n" << endl;
+    volScalarField k
+    (
+        IOobject
+        (
+            "k",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    Info<< "Reading field epsilon\n" << endl;
+    volScalarField epsilon
+    (
+        IOobject
+        (
+            "epsilon",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+
+    Info<< "Calculating field nut2\n" << endl;
+    volScalarField nut2
+    (
+        IOobject
+        (
+            "nut2",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        Cmu*sqr(k)/epsilon
+    );
+
+    Info<< "Calculating field nuEff1\n" << endl;
+    volScalarField nuEff1
+    (
+        IOobject
+        (
+            "nuEff1",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        sqr(Ct)*nut2 + nu1
+    );
+
+    Info<< "Calculating field nuEff2\n" << endl;
+    volScalarField nuEff2
+    (
+        IOobject
+        (
+            "nuEff2",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        nut2 + nu2
+    );
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kEpsilon.H b/applications/solvers/multiphase/twoPhaseEulerFoam/kEpsilon.H
new file mode 100644
index 0000000000..1340587ea3
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kEpsilon.H
@@ -0,0 +1,64 @@
+if (turbulence)
+{
+    if (mesh.changing())
+    {
+        y.correct();
+    }
+
+    tmp<volTensorField> tgradU2 = fvc::grad(U2);
+    volScalarField G(2*nut2*(tgradU2() && dev(symm(tgradU2()))));
+    tgradU2.clear();
+
+    #include "wallFunctions.H"
+
+    // Dissipation equation
+    fvScalarMatrix epsEqn
+    (
+        fvm::ddt(epsilon)
+      + fvm::div(phi2, epsilon)
+      - fvm::Sp(fvc::div(phi2), epsilon)
+      - fvm::laplacian
+        (
+            alpha1Eps*nuEff2, epsilon,
+            "laplacian(DepsilonEff,epsilon)"
+        )
+      ==
+         C1*G*epsilon/k
+       - fvm::Sp(C2*epsilon/k, epsilon)
+    );
+
+    #include "wallDissipation.H"
+
+    epsEqn.relax();
+    epsEqn.solve();
+
+    epsilon.max(dimensionedScalar("zero", epsilon.dimensions(), 1.0e-15));
+
+
+    // Turbulent kinetic energy equation
+    fvScalarMatrix kEqn
+    (
+        fvm::ddt(k)
+      + fvm::div(phi2, k)
+      - fvm::Sp(fvc::div(phi2), k)
+      - fvm::laplacian
+        (
+            alpha1k*nuEff2, k,
+            "laplacian(DkEff,k)"
+        )
+      ==
+        G
+      - fvm::Sp(epsilon/k, k)
+    );
+    kEqn.relax();
+    kEqn.solve();
+
+    k.max(dimensionedScalar("zero", k.dimensions(), 1.0e-8));
+
+    //- Re-calculate turbulence viscosity
+    nut2 = Cmu*sqr(k)/epsilon;
+
+    #include "wallViscosity.H"
+}
+
+nuEff2 = nut2 + nu2;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H b/applications/solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H
new file mode 100644
index 0000000000..14224fd646
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Global
+    wallDissipation
+
+Description
+    Set wall dissipation in the epsilon matrix
+
+\*---------------------------------------------------------------------------*/
+
+{
+    const fvPatchList& patches = mesh.boundary();
+
+    forAll(patches, patchi)
+    {
+        const fvPatch& p = patches[patchi];
+
+        if (isA<wallFvPatch>(p))
+        {
+            epsEqn.setValues
+            (
+                p.faceCells(),
+                epsilon.boundaryField()[patchi].patchInternalField()
+            );
+        }
+    }
+}
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/wallFunctions.H b/applications/solvers/multiphase/twoPhaseEulerFoam/wallFunctions.H
new file mode 100644
index 0000000000..c91cce9a00
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/wallFunctions.H
@@ -0,0 +1,81 @@
+{
+    labelList cellBoundaryFaceCount(epsilon.size(), 0);
+
+    scalar Cmu25 = ::pow(Cmu.value(), 0.25);
+    scalar Cmu75 = ::pow(Cmu.value(), 0.75);
+    scalar kappa_ = kappa.value();
+    scalar nu2_ = nu2.value();
+
+    const fvPatchList& patches = mesh.boundary();
+
+    //- Initialise the near-wall P field to zero
+    forAll(patches, patchi)
+    {
+        const fvPatch& currPatch = patches[patchi];
+
+        if (isA<wallFvPatch>(currPatch))
+        {
+            forAll(currPatch, facei)
+            {
+                label faceCelli = currPatch.faceCells()[facei];
+
+                epsilon[faceCelli] = 0.0;
+                G[faceCelli] = 0.0;
+            }
+        }
+    }
+
+    //- Accumulate the wall face contributions to epsilon and G
+    //  Increment cellBoundaryFaceCount for each face for averaging
+    forAll(patches, patchi)
+    {
+        const fvPatch& currPatch = patches[patchi];
+
+        if (isA<wallFvPatch>(currPatch))
+        {
+            const scalarField& nut2w = nut2.boundaryField()[patchi];
+
+            scalarField magFaceGradU(mag(U2.boundaryField()[patchi].snGrad()));
+
+            forAll(currPatch, facei)
+            {
+                label faceCelli = currPatch.faceCells()[facei];
+
+                // For corner cells (with two boundary or more faces),
+                // epsilon and G in the near-wall cell are calculated
+                // as an average
+
+                cellBoundaryFaceCount[faceCelli]++;
+
+                epsilon[faceCelli] +=
+                     Cmu75*::pow(k[faceCelli], 1.5)
+                    /(kappa_*y[patchi][facei]);
+
+                G[faceCelli] +=
+                    (nut2w[facei] + nu2_)*magFaceGradU[facei]
+                   *Cmu25*::sqrt(k[faceCelli])
+                   /(kappa_*y[patchi][facei]);
+            }
+        }
+    }
+
+
+    // perform the averaging
+
+    forAll(patches, patchi)
+    {
+        const fvPatch& curPatch = patches[patchi];
+
+        if (isA<wallFvPatch>(curPatch))
+        {
+            forAll(curPatch, facei)
+            {
+                label faceCelli = curPatch.faceCells()[facei];
+
+                epsilon[faceCelli] /= cellBoundaryFaceCount[faceCelli];
+                G[faceCelli] /= cellBoundaryFaceCount[faceCelli];
+                cellBoundaryFaceCount[faceCelli] = 1;
+            }
+        }
+    }
+}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/wallViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/wallViscosity.H
new file mode 100644
index 0000000000..bd51ed7dd1
--- /dev/null
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/wallViscosity.H
@@ -0,0 +1,36 @@
+{
+    scalar Cmu25 = ::pow(Cmu.value(), 0.25);
+    scalar kappa_ = kappa.value();
+    scalar E_ = E.value();
+    scalar nu2_ = nu2.value();
+
+    const fvPatchList& patches = mesh.boundary();
+
+    forAll(patches, patchi)
+    {
+        const fvPatch& currPatch = patches[patchi];
+
+        if (isA<wallFvPatch>(currPatch))
+        {
+            scalarField& nutw = nut2.boundaryField()[patchi];
+
+            forAll(currPatch, facei)
+            {
+                label faceCelli = currPatch.faceCells()[facei];
+
+                // calculate yPlus
+                scalar yPlus =
+                    Cmu25*y[patchi][facei]*::sqrt(k[faceCelli])/nu2_;
+
+                if (yPlus > 11.6)
+                {
+                    nutw[facei] = nu2_*(yPlus*kappa_/::log(E_*yPlus) -1);
+                }
+                else
+                {
+                    nutw[facei] = 0.0;
+                }
+            }
+        }
+    }
+}

From 06b0bac61753d83bdb88ed3f3ab534f89bf73b1a Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:46:27 +0000
Subject: [PATCH 54/81] twoPhaseEulerFoam: Files transferred from bubbleFoam

---
 applications/solvers/multiphase/twoPhaseEulerFoam/Make/options  | 1 -
 .../solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
index 1bf97d106c..f4a6229714 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
@@ -1,5 +1,4 @@
 EXE_INC = \
-    -I../bubbleFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -IturbulenceModel \
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H b/applications/solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H
index 14224fd646..207fb40a32 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/wallDissipation.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 051afeb4195066370c2d188b56440964f8ea7810 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:47:04 +0000
Subject: [PATCH 55/81] subCycle: Updated handling of the old-time field and
 timeIndex to support outer-iterations

---
 src/OpenFOAM/algorithms/subCycle/subCycle.H | 37 ++++++++++++++++-----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/algorithms/subCycle/subCycle.H b/src/OpenFOAM/algorithms/subCycle/subCycle.H
index a4a1ea1844..f0c8958dd0 100644
--- a/src/OpenFOAM/algorithms/subCycle/subCycle.H
+++ b/src/OpenFOAM/algorithms/subCycle/subCycle.H
@@ -51,8 +51,13 @@ class subCycleField
         //- Reference to the field being sub-cycled
         GeometricField& gf_;
 
+        //- Reference to the field old-time field being sub-cycled
+        //  Needed to avoid calls to oldTime() which may cause
+        //  unexpected updates of the old-time field
+        GeometricField& gf0_;
+
         //- Copy of the "real" old-time value of the field
-        GeometricField  gf0_;
+        GeometricField gf_0_;
 
 
 public:
@@ -63,19 +68,33 @@ public:
         subCycleField(GeometricField& gf)
         :
             gf_(gf),
-            gf0_(gf.oldTime())
+            gf0_(gf.oldTime()),
+            gf_0_(gf0_.name() + "_", gf0_)
         {}
 
 
     //- Destructor
     ~subCycleField()
     {
+        // Reset the old-time field
+        gf0_ = gf_0_;
+
         // Correct the time index of the field to correspond to the global time
         gf_.timeIndex() = gf_.time().timeIndex();
+        gf0_.timeIndex() = gf_.time().timeIndex();
+    }
 
-        // Reset the old-time field value
-        gf_.oldTime() = gf0_;
-        gf_.oldTime().timeIndex() = gf0_.timeIndex();
+
+    //- Correct the time index of the field to correspond to
+    //  the sub-cycling time.
+    //
+    //  The time index is incremented to protect the old-time value from
+    //  being updated at the beginning of the time-loop in the case of
+    //  outer iteration
+    void updateTimeIndex()
+    {
+        gf_.timeIndex() = gf_.time().timeIndex() + 1;
+        gf0_.timeIndex() = gf_.time().timeIndex() + 1;
     }
 };
 
@@ -106,16 +125,18 @@ public:
         //- Construct field and number of sub-cycles
         subCycle(GeometricField& gf, const label nSubCycles)
         :
-
             subCycleField<GeometricField>(gf),
             subCycleTime(const_cast<Time&>(gf.time()), nSubCycles)
-        {}
+        {
+            // Update the field time index to correspond to the sub-cycle time
+            this->updateTimeIndex();
+        }
 
 
     //- Destructor
+    //  End the subCycleTime, which restores the time state
     ~subCycle()
     {
-        // End the subCycleTime, which restores the time state
         endSubCycle();
     }
 };

From f780dcd2b6fce88dfd5f1ee8201b6b336ef145e8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:47:22 +0000
Subject: [PATCH 56/81] MRFZone: Rationalized the update of Omega for tabulated
 omega

---
 .../cfdTools/general/MRF/MRFZone.C             | 18 ++++++++++++------
 .../cfdTools/general/MRF/MRFZone.H             |  5 ++++-
 .../cfdTools/general/MRF/MRFZoneTemplates.C    |  1 +
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index d56bf6421a..f09f38d4ee 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -296,6 +296,12 @@ Foam::MRFZone::MRFZone
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+Foam::vector Foam::MRFZone::Omega() const
+{
+    return omega_->value(mesh_.time().timeOutputValue())*axis_;
+}
+
+
 void Foam::MRFZone::addCoriolis
 (
     const volVectorField& U,
@@ -312,7 +318,7 @@ void Foam::MRFZone::addCoriolis
     vectorField& ddtUc = ddtU.internalField();
     const vectorField& Uc = U.internalField();
 
-    const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_;
+    const vector Omega = this->Omega();
 
     forAll(cells, i)
     {
@@ -334,7 +340,7 @@ void Foam::MRFZone::addCoriolis(fvVectorMatrix& UEqn) const
     vectorField& Usource = UEqn.source();
     const vectorField& U = UEqn.psi();
 
-    const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_;
+    const vector Omega = this->Omega();
 
     forAll(cells, i)
     {
@@ -360,7 +366,7 @@ void Foam::MRFZone::addCoriolis
     vectorField& Usource = UEqn.source();
     const vectorField& U = UEqn.psi();
 
-    const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_;
+    const vector Omega = this->Omega();
 
     forAll(cells, i)
     {
@@ -374,7 +380,7 @@ void Foam::MRFZone::relativeVelocity(volVectorField& U) const
 {
     const volVectorField& C = mesh_.C();
 
-    const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_;
+    const vector Omega = this->Omega();
 
     const labelList& cells = mesh_.cellZones()[cellZoneID_];
 
@@ -412,7 +418,7 @@ void Foam::MRFZone::absoluteVelocity(volVectorField& U) const
 {
     const volVectorField& C = mesh_.C();
 
-    const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_;
+    const vector Omega = this->Omega();
 
     const labelList& cells = mesh_.cellZones()[cellZoneID_];
 
@@ -480,7 +486,7 @@ void Foam::MRFZone::absoluteFlux
 
 void Foam::MRFZone::correctBoundaryVelocity(volVectorField& U) const
 {
-    const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_;
+    const vector Omega = this->Omega();
 
 
     // Included patches
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 74160cf39b..5c6e05e2d3 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -47,7 +47,7 @@ SourceFiles
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
 #include "fvMatricesFwd.H"
-#include "fvMatrices.H"
+#include "mapPolyMesh.H"
 #include "DataEntry.H"
 #include "autoPtr.H"
 
@@ -164,6 +164,9 @@ public:
             //- Return const access to the MRF active flag
             inline bool active() const;
 
+            //- Return the current Omega vector
+            vector Omega() const;
+
 
         // Evaluation
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
index 872bf53a82..bc0087826c 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
@@ -27,6 +27,7 @@ License
 #include "fvMesh.H"
 #include "volFields.H"
 #include "surfaceFields.H"
+#include "fvMatrices.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

From b39ae12f8143e8deeeadc2add6b8daef801ae01f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:48:21 +0000
Subject: [PATCH 57/81] Fields: add cbrt

---
 src/OpenFOAM/dimensionSet/dimensionSet.C                    | 6 ++++++
 src/OpenFOAM/dimensionSet/dimensionSet.H                    | 1 +
 .../DimensionedScalarField/DimensionedScalarField.C         | 1 +
 .../DimensionedScalarField/DimensionedScalarField.H         | 1 +
 .../fields/FieldFields/scalarFieldField/scalarFieldField.C  | 1 +
 .../fields/FieldFields/scalarFieldField/scalarFieldField.H  | 1 +
 src/OpenFOAM/fields/Fields/scalarField/scalarField.C        | 1 +
 src/OpenFOAM/fields/Fields/scalarField/scalarField.H        | 1 +
 .../GeometricScalarField/GeometricScalarField.C             | 1 +
 .../GeometricScalarField/GeometricScalarField.H             | 1 +
 10 files changed, 15 insertions(+)

diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.C b/src/OpenFOAM/dimensionSet/dimensionSet.C
index c0da41236e..64396290eb 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.C
@@ -372,6 +372,12 @@ Foam::dimensionSet Foam::sqrt(const dimensionSet& ds)
 }
 
 
+Foam::dimensionSet Foam::cbrt(const dimensionSet& ds)
+{
+    return pow(ds, 1.0/3.0);
+}
+
+
 Foam::dimensionSet Foam::magSqr(const dimensionSet& ds)
 {
     return pow(ds, 2);
diff --git a/src/OpenFOAM/dimensionSet/dimensionSet.H b/src/OpenFOAM/dimensionSet/dimensionSet.H
index ca4c3ed2d1..6dc1219562 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSet.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSet.H
@@ -76,6 +76,7 @@ dimensionSet pow6(const dimensionSet&);
 dimensionSet pow025(const dimensionSet&);
 
 dimensionSet sqrt(const dimensionSet&);
+dimensionSet cbrt(const dimensionSet&);
 dimensionSet magSqr(const dimensionSet&);
 dimensionSet mag(const dimensionSet&);
 dimensionSet sign(const dimensionSet&);
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index 14e1030b4b..a81bad526c 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
@@ -377,6 +377,7 @@ UNARY_FUNCTION(scalar, scalar, pow5, pow5)
 UNARY_FUNCTION(scalar, scalar, pow6, pow6)
 UNARY_FUNCTION(scalar, scalar, pow025, pow025)
 UNARY_FUNCTION(scalar, scalar, sqrt, sqrt)
+UNARY_FUNCTION(scalar, scalar, cbrt, cbrt)
 UNARY_FUNCTION(scalar, scalar, sign, sign)
 UNARY_FUNCTION(scalar, scalar, pos, pos)
 UNARY_FUNCTION(scalar, scalar, neg, neg)
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
index 5c4a2b217a..12c5ed094e 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
@@ -85,6 +85,7 @@ UNARY_FUNCTION(scalar, scalar, pow5, pow5)
 UNARY_FUNCTION(scalar, scalar, pow6, pow6)
 UNARY_FUNCTION(scalar, scalar, pow025, pow025)
 UNARY_FUNCTION(scalar, scalar, sqrt, sqrt)
+UNARY_FUNCTION(scalar, scalar, cbrt, cbrt)
 UNARY_FUNCTION(scalar, scalar, sign, sign)
 UNARY_FUNCTION(scalar, scalar, pos, pos)
 UNARY_FUNCTION(scalar, scalar, neg, neg)
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
index bf58529828..9ed13e866f 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
@@ -105,6 +105,7 @@ UNARY_FUNCTION(scalar, scalar, pow5)
 UNARY_FUNCTION(scalar, scalar, pow6)
 UNARY_FUNCTION(scalar, scalar, pow025)
 UNARY_FUNCTION(scalar, scalar, sqrt)
+UNARY_FUNCTION(scalar, scalar, cbrt)
 UNARY_FUNCTION(scalar, scalar, sign)
 UNARY_FUNCTION(scalar, scalar, pos)
 UNARY_FUNCTION(scalar, scalar, neg)
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
index f2c851c0cd..45d1a423ae 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
@@ -98,6 +98,7 @@ UNARY_FUNCTION(scalar, scalar, pow5)
 UNARY_FUNCTION(scalar, scalar, pow6)
 UNARY_FUNCTION(scalar, scalar, pow025)
 UNARY_FUNCTION(scalar, scalar, sqrt)
+UNARY_FUNCTION(scalar, scalar, cbrt)
 UNARY_FUNCTION(scalar, scalar, sign)
 UNARY_FUNCTION(scalar, scalar, pos)
 UNARY_FUNCTION(scalar, scalar, neg)
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
index cd18592265..96e41d9571 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C
@@ -128,6 +128,7 @@ UNARY_FUNCTION(scalar, scalar, pow5)
 UNARY_FUNCTION(scalar, scalar, pow6)
 UNARY_FUNCTION(scalar, scalar, pow025)
 UNARY_FUNCTION(scalar, scalar, sqrt)
+UNARY_FUNCTION(scalar, scalar, cbrt)
 UNARY_FUNCTION(scalar, scalar, sign)
 UNARY_FUNCTION(scalar, scalar, pos)
 UNARY_FUNCTION(scalar, scalar, neg)
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
index d5a3b7659b..ff322d3fe4 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H
@@ -103,6 +103,7 @@ UNARY_FUNCTION(scalar, scalar, pow5)
 UNARY_FUNCTION(scalar, scalar, pow6)
 UNARY_FUNCTION(scalar, scalar, pow025)
 UNARY_FUNCTION(scalar, scalar, sqrt)
+UNARY_FUNCTION(scalar, scalar, cbrt)
 UNARY_FUNCTION(scalar, scalar, sign)
 UNARY_FUNCTION(scalar, scalar, pos)
 UNARY_FUNCTION(scalar, scalar, neg)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index 43b2f1c7f5..03bc712657 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
@@ -448,6 +448,7 @@ UNARY_FUNCTION(scalar, scalar, pow5, pow5)
 UNARY_FUNCTION(scalar, scalar, pow6, pow6)
 UNARY_FUNCTION(scalar, scalar, pow025, pow025)
 UNARY_FUNCTION(scalar, scalar, sqrt, sqrt)
+UNARY_FUNCTION(scalar, scalar, cbrt, cbrt)
 UNARY_FUNCTION(scalar, scalar, sign, sign)
 UNARY_FUNCTION(scalar, scalar, pos, pos)
 UNARY_FUNCTION(scalar, scalar, neg, neg)
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
index fa3280ce74..0f05ab675c 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
@@ -93,6 +93,7 @@ UNARY_FUNCTION(scalar, scalar, pow5, pow5)
 UNARY_FUNCTION(scalar, scalar, pow6, pow6)
 UNARY_FUNCTION(scalar, scalar, pow025, pow025)
 UNARY_FUNCTION(scalar, scalar, sqrt, sqrt)
+UNARY_FUNCTION(scalar, scalar, cbrt, cbrt)
 UNARY_FUNCTION(scalar, scalar, sign, sign)
 UNARY_FUNCTION(scalar, scalar, pos, pos)
 UNARY_FUNCTION(scalar, scalar, neg, neg)

From de3a2f01aeda65c744aed917926201d67e437b31 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:48:35 +0000
Subject: [PATCH 58/81] MRFZone: Rationalized the update of Omega for tabulated
 omega

---
 .../DimensionedScalarField/DimensionedScalarField.C             | 2 +-
 .../DimensionedScalarField/DimensionedScalarField.H             | 2 +-
 .../fields/FieldFields/scalarFieldField/scalarFieldField.C      | 2 +-
 .../fields/FieldFields/scalarFieldField/scalarFieldField.H      | 2 +-
 .../GeometricFields/GeometricScalarField/GeometricScalarField.C | 2 +-
 .../GeometricFields/GeometricScalarField/GeometricScalarField.H | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
index a81bad526c..a4296ff91b 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
index 12c5ed094e..b6e76631e0 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
index 9ed13e866f..4132ba79f3 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
index 45d1a423ae..f6fcc4c901 100644
--- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
index 03bc712657..ce78313efb 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
index 0f05ab675c..fd20e171c9 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From e968ff045905ba1f988c84736ec1a64c816a4b90 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Nov 2012 16:40:36 +0000
Subject: [PATCH 59/81] BUG: Added missing forward declarations

---
 .../CloudFunctionObject/CloudFunctionObject.H                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index 5baf0f7ae9..5130660885 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -46,6 +46,9 @@ SourceFiles
 namespace Foam
 {
 
+class polyPatch;
+class tetIndices;
+
 /*---------------------------------------------------------------------------*\
                     Class CloudFunctionObject Declaration
 \*---------------------------------------------------------------------------*/

From 09cb83c3e8cd274a097671d9d35a3b95bf78d446 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Nov 2012 16:40:57 +0000
Subject: [PATCH 60/81] STYLE: Minor code formatting

---
 .../FacePostProcessing/FacePostProcessing.C                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
index ae02927bbd..6de019f029 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ void Foam::FacePostProcessing<CloudType>::write()
         {
             OFstream& os = outputFilePtr_[zoneI];
             os  << time.timeName() << token::TAB << sumMassTotal << token::TAB
-                <<  sumMassFlowRate<< endl;
+                << sumMassFlowRate<< endl;
         }
     }
 

From 798572484649ce2706c9dce46eb04486bc434596 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Nov 2012 17:26:51 +0000
Subject: [PATCH 61/81] ENH: Added option to remove particle in cloud function
 objects

---
 .../KinematicParcel/KinematicParcel.C         | 13 +++++--
 .../CloudFunctionObject/CloudFunctionObject.C |  9 +++--
 .../CloudFunctionObject/CloudFunctionObject.H |  9 +++--
 .../CloudFunctionObjectList.C                 | 37 ++++++++++++++++---
 .../CloudFunctionObjectList.H                 |  9 +++--
 .../FacePostProcessing/FacePostProcessing.C   |  3 +-
 .../FacePostProcessing/FacePostProcessing.H   |  3 +-
 .../ParticleCollector/ParticleCollector.C     | 19 +++++++---
 .../ParticleCollector/ParticleCollector.H     |  9 ++++-
 .../ParticleErosion/ParticleErosion.C         |  3 +-
 .../ParticleErosion/ParticleErosion.H         |  3 +-
 .../ParticleTracks/ParticleTracks.C           |  3 +-
 .../ParticleTracks/ParticleTracks.H           |  3 +-
 .../ParticleTrap/ParticleTrap.C               |  3 +-
 .../ParticleTrap/ParticleTrap.H               |  3 +-
 .../PatchPostProcessing/PatchPostProcessing.C |  3 +-
 .../PatchPostProcessing/PatchPostProcessing.H |  3 +-
 .../VoidFraction/VoidFraction.C               |  5 ++-
 .../VoidFraction/VoidFraction.H               |  3 +-
 .../PairCollision/PairCollision.C             |  6 ++-
 20 files changed, 110 insertions(+), 39 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 58217adbf5..7ec52b1ee8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -326,7 +326,7 @@ bool Foam::KinematicParcel<ParcelType>::move
 
         p.age() += dt;
 
-        td.cloud().functions().postMove(p, cellI, dt);
+        td.cloud().functions().postMove(p, cellI, dt, td.keepParticle);
     }
 
     return td.keepParticle;
@@ -340,7 +340,7 @@ void Foam::KinematicParcel<ParcelType>::hitFace(TrackData& td)
     typename TrackData::cloudType::parcelType& p =
         static_cast<typename TrackData::cloudType::parcelType&>(*this);
 
-    td.cloud().functions().postFace(p, p.face());
+    td.cloud().functions().postFace(p, p.face(), td.keepParticle);
 }
 
 
@@ -364,7 +364,14 @@ bool Foam::KinematicParcel<ParcelType>::hitPatch
         static_cast<typename TrackData::cloudType::parcelType&>(*this);
 
     // Invoke post-processing model
-    td.cloud().functions().postPatch(p, pp, trackFraction, tetIs);
+    td.cloud().functions().postPatch
+    (
+        p,
+        pp,
+        trackFraction,
+        tetIs,
+        td.keepParticle
+    );
 
     // Invoke surface film model
     if (td.cloud().surfaceFilm().transferParcel(p, pp, td.keepParticle))
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
index dbc359ae9a..5a208a4ca8 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
@@ -96,7 +96,8 @@ void Foam::CloudFunctionObject<CloudType>::postMove
 (
     const typename CloudType::parcelType&,
     const label,
-    const scalar
+    const scalar,
+    bool&
 )
 {
     // do nothing
@@ -109,7 +110,8 @@ void Foam::CloudFunctionObject<CloudType>::postPatch
     const typename CloudType::parcelType&,
     const polyPatch&,
     const scalar,
-    const tetIndices&
+    const tetIndices&,
+    bool&
 )
 {
     // do nothing
@@ -120,7 +122,8 @@ template<class CloudType>
 void Foam::CloudFunctionObject<CloudType>::postFace
 (
     const typename CloudType::parcelType&,
-    const label
+    const label,
+    bool&
 )
 {
     // do nothing
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index 5130660885..976fd3867f 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -137,7 +137,8 @@ public:
             (
                 const typename CloudType::parcelType& p,
                 const label cellI,
-                const scalar dt
+                const scalar dt,
+                bool& keepParticle
             );
 
             //- Post-patch hook
@@ -146,14 +147,16 @@ public:
                 const typename CloudType::parcelType& p,
                 const polyPatch& pp,
                 const scalar trackFraction,
-                const tetIndices& testIs
+                const tetIndices& testIs,
+                bool& keepParticle
             );
 
             //- Post-face hook
             virtual void postFace
             (
                 const typename CloudType::parcelType& p,
-                const label faceI
+                const label faceI,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C
index 2f97468e36..e0d57b6057 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C
@@ -132,12 +132,18 @@ void Foam::CloudFunctionObjectList<CloudType>::postMove
 (
     const typename CloudType::parcelType& p,
     const label cellI,
-    const scalar dt
+    const scalar dt,
+    bool& keepParticle
 )
 {
     forAll(*this, i)
     {
-        this->operator[](i).postMove(p, cellI, dt);
+        this->operator[](i).postMove(p, cellI, dt, keepParticle);
+
+        if (!keepParticle)
+        {
+            return;
+        }
     }
 }
 
@@ -148,12 +154,25 @@ void Foam::CloudFunctionObjectList<CloudType>::postPatch
     const typename CloudType::parcelType& p,
     const polyPatch& pp,
     const scalar trackFraction,
-    const tetIndices& tetIs
+    const tetIndices& tetIs,
+    bool& keepParticle
 )
 {
     forAll(*this, i)
     {
-        this->operator[](i).postPatch(p, pp, trackFraction, tetIs);
+        this->operator[](i).postPatch
+        (
+            p,
+            pp,
+            trackFraction,
+            tetIs,
+            keepParticle
+        );
+
+        if (!keepParticle)
+        {
+            return;
+        }
     }
 }
 
@@ -162,12 +181,18 @@ template<class CloudType>
 void Foam::CloudFunctionObjectList<CloudType>::postFace
 (
     const typename CloudType::parcelType& p,
-    const label faceI
+    const label faceI,
+    bool& keepParticle
 )
 {
     forAll(*this, i)
     {
-        this->operator[](i).postFace(p, faceI);
+        this->operator[](i).postFace(p, faceI, keepParticle);
+
+        if (!keepParticle)
+        {
+            return;
+        }
     }
 }
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
index 5daeab9f29..de9c3afc02 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
@@ -114,7 +114,8 @@ public:
             (
                 const typename CloudType::parcelType& p,
                 const label cellI,
-                const scalar dt
+                const scalar dt,
+                bool& keepParticle
             );
 
             //- Post-patch hook
@@ -123,14 +124,16 @@ public:
                 const typename CloudType::parcelType& p,
                 const polyPatch& pp,
                 const scalar trackFraction,
-                const tetIndices& tetIs
+                const tetIndices& tetIs,
+                bool& keepParticle
             );
 
             //- Post-face hook
             virtual void postFace
             (
                 const typename CloudType::parcelType& p,
-                const label faceI
+                const label faceI,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
index 6de019f029..8c64e1b62f 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
@@ -376,7 +376,8 @@ template<class CloudType>
 void Foam::FacePostProcessing<CloudType>::postFace
 (
     const parcelType& p,
-    const label faceI
+    const label faceI,
+    bool&
 )
 {
     if
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
index 06387d234b..3195b9fc57 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
@@ -160,7 +160,8 @@ public:
             virtual void postFace
             (
                 const parcelType& p,
-                const label faceI
+                const label faceI,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index de22b5a044..06f836a3d5 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -27,6 +27,9 @@ License
 #include "Pstream.H"
 #include "surfaceWriter.H"
 #include "unitConversion.H"
+#include "Random.H"
+#include "triangle.H"
+#include "cloud.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -496,6 +499,7 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
     CloudFunctionObject<CloudType>(dict, owner, typeName),
     mode_(mtUnknown),
     parcelType_(this->coeffDict().lookupOrDefault("parcelType", -1)),
+    removeCollected_(this->coeffDict().lookup("removeCollected")),
     points_(),
     faces_(),
     faceTris_(),
@@ -573,10 +577,14 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
 )
 :
     CloudFunctionObject<CloudType>(pc),
+    mode_(pc.mode_),
     parcelType_(pc.parcelType_),
     points_(pc.points_),
     faces_(pc.faces_),
     faceTris_(pc.faceTris_),
+    nSector_(pc.nSector_),
+    radius_(pc.radius_),
+    coordSys_(pc.coordSys_),
     normal_(pc.normal_),
     negateParcelsOppositeNormal_(pc.negateParcelsOppositeNormal_),
     surfaceFormat_(pc.surfaceFormat_),
@@ -606,8 +614,8 @@ void Foam::ParticleCollector<CloudType>::postMove
 (
     const parcelType& p,
     const label cellI,
-    const scalar dt
-//    bool& keepParticle
+    const scalar dt,
+    bool& keepParticle
 )
 {
     if ((parcelType_ != -1) && (parcelType_ != p.typeId()))
@@ -658,9 +666,10 @@ void Foam::ParticleCollector<CloudType>::postMove
             mass_[faceI + 3] += m;
         }
 
-        // remove particle
-//      keepParticle = false;
-
+        if (removeCollected_)
+        {
+            keepParticle = false;
+        }
     }
 }
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
index dd166ba492..283246cfec 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
@@ -40,6 +40,9 @@ SourceFiles
 
 #include "CloudFunctionObject.H"
 #include "cylindricalCS.H"
+#include "face.H"
+#include "Switch.H"
+#include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -80,6 +83,9 @@ private:
         //- Index of parcel types to collect (-1 by default = all particles)
         const label parcelType_;
 
+        //- Flag to remove collected particles
+        Switch removeCollected_;
+
         //- List of points
         Field<point> points_;
 
@@ -226,7 +232,8 @@ public:
             (
                 const parcelType& p,
                 const label cellI,
-                const scalar dt
+                const scalar dt,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
index 81772debfe..c0683d0dbf 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
@@ -168,7 +168,8 @@ void Foam::ParticleErosion<CloudType>::postPatch
     const parcelType& p,
     const polyPatch& pp,
     const scalar trackFraction,
-    const tetIndices& tetIs
+    const tetIndices& tetIs,
+    bool&
 )
 {
     const label patchI = pp.index();
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
index c741bd4004..bedc447188 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.H
@@ -128,7 +128,8 @@ public:
                 const parcelType& p,
                 const polyPatch& pp,
                 const scalar trackFraction,
-                const tetIndices& tetIs
+                const tetIndices& tetIs,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
index 9721a5a55d..69f48bf5e0 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
@@ -112,7 +112,8 @@ template<class CloudType>
 void Foam::ParticleTracks<CloudType>::postFace
 (
     const parcelType& p,
-    const label
+    const label,
+    bool&
 )
 {
     if
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
index 9a9939dbb2..1eeda7bcb8 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
@@ -143,7 +143,8 @@ public:
             virtual void postFace
             (
                 const parcelType& p,
-                const label faceI
+                const label faceI,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
index f1b19bde59..0a5ff09123 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
@@ -104,7 +104,8 @@ void Foam::ParticleTrap<CloudType>::postMove
 (
     parcelType& p,
     const label cellI,
-    const scalar
+    const scalar,
+    bool&
 )
 {
     if (alphaPtr_->internalField()[cellI] < threshold_)
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
index 39321af3c0..43fac16c58 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H
@@ -125,7 +125,8 @@ public:
             (
                 typename CloudType::parcelType& p,
                 const label cellI,
-                const scalar dt
+                const scalar dt,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
index f66a872cfc..a267b86266 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
@@ -220,7 +220,8 @@ void Foam::PatchPostProcessing<CloudType>::postPatch
     const parcelType& p,
     const polyPatch& pp,
     const scalar,
-    const tetIndices& tetIs
+    const tetIndices& tetIs,
+    bool&
 )
 {
     const label patchI = pp.index();
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
index f7d618e6ce..cb4605e666 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
@@ -129,7 +129,8 @@ public:
                 const parcelType& p,
                 const polyPatch& pp,
                 const scalar trackFraction,
-                const tetIndices& tetIs
+                const tetIndices& tetIs,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C
index dfef9f4835..e5b64f65ca 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,8 @@ void Foam::VoidFraction<CloudType>::postMove
 (
     const parcelType& p,
     const label cellI,
-    const scalar dt
+    const scalar dt,
+    bool&
 )
 {
     volScalarField& theta = thetaPtr_();
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
index 26f0f65018..e8ed507f7d 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H
@@ -115,7 +115,8 @@ public:
             (
                 const parcelType& p,
                 const label cellI,
-                const scalar dt
+                const scalar dt,
+                bool& keepParticle
             );
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 6315eac827..8804fb6759 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -302,13 +302,15 @@ void Foam::PairCollision<CloudType>::wallInteraction()
 
                     if (particleHit)
                     {
-                        this->owner().functions().postFace(p, realFaceI);
+                        bool keep = true;
+                        this->owner().functions().postFace(p, realFaceI, keep);
                         this->owner().functions().postPatch
                         (
                             p,
                             mesh.boundaryMesh()[patchI],
                             1.0,
-                            p.currentTetIndices()
+                            p.currentTetIndices(),
+                            keep
                         );
                      }
                 }

From 1234841216b9a9a3b984c8af234e4eb7865c78a0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 15 Nov 2012 09:52:30 +0000
Subject: [PATCH 62/81] ENH: autoHexMesh: do not generate vtk files

---
 .../autoMesh/autoHexMesh/meshRefinement/meshRefinement.C   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 2890577c24..26a40327d6 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -2295,13 +2295,6 @@ void Foam::meshRefinement::dumpIntersections(const fileName& prefix) const
         }
     }
 
-    // Convert to vtk format
-    string cmd
-    (
-        "objToVTK " + prefix + "_edges.obj " + prefix + "_edges.vtk > /dev/null"
-    );
-    system(cmd.c_str());
-
     Pout<< endl;
 }
 

From 2914433a005fa467306635c660e965ce8b9422d5 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 15 Nov 2012 16:54:10 +0000
Subject: [PATCH 63/81] ENH: Updated new jump BCs

---
 .../derived/fixedJump/fixedJumpFvPatchField.C      | 14 +++++++++++++-
 .../fixedJumpAMI/fixedJumpAMIFvPatchField.C        | 14 +++++++++++++-
 .../timeVaryingMappedFixedValueFvPatchField.C      | 14 +++++++-------
 .../timeVaryingMappedFixedValueFvPatchField.H      |  2 +-
 .../energyJump/energyJumpFvPatchScalarField.C      |  4 ++++
 .../energyJumpAMIFvPatchScalarField.C              |  4 ++++
 6 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
index 9ef4be21a4..f3a7615b4a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
@@ -63,7 +63,19 @@ Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
 :
     jumpCyclicFvPatchField<Type>(p, iF),
     jump_("jump", dict, p.size())
-{}
+{
+    if (dict.found("value"))
+    {
+        fvPatchField<Type>::operator=
+        (
+            Field<Type>("value", dict, p.size())
+        );
+    }
+    else
+    {
+        this->evaluate(Pstream::blocking);
+    }
+}
 
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
index 4c3290cf2d..ad6fb925ae 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
@@ -63,7 +63,19 @@ Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
 :
     jumpCyclicAMIFvPatchField<Type>(p, iF),
     jump_("jump", dict, p.size())
-{}
+{
+    if (dict.found("value"))
+    {
+        fvPatchField<Type>::operator=
+        (
+            Field<Type>("value", dict, p.size())
+        );
+    }
+    else
+    {
+        this->evaluate(Pstream::blocking);
+    }
+}
 
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index fbfc5eb96a..29590cc051 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -53,7 +53,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(-1),
     endSampledValues_(0),
     endAverage_(pTraits<Type>::zero),
-    offSet_()
+    offset_()
 {}
 
 
@@ -79,7 +79,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(-1),
     endSampledValues_(0),
     endAverage_(pTraits<Type>::zero),
-    offSet_()
+    offset_()
 {}
 
 
@@ -104,7 +104,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(-1),
     endSampledValues_(0),
     endAverage_(pTraits<Type>::zero),
-    offSet_(DataEntry<Type>::New("offSet", dict))
+    offset_(DataEntry<Type>::New("offset", dict))
 {
     dict.readIfPresent("fieldTableName", fieldTableName_);
 
@@ -138,7 +138,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(ptf.endSampleTime_),
     endSampledValues_(ptf.endSampledValues_),
     endAverage_(ptf.endAverage_),
-    offSet_(ptf.offSet_().clone().ptr())
+    offset_(ptf.offset_().clone().ptr())
 {}
 
 
@@ -163,7 +163,7 @@ timeVaryingMappedFixedValueFvPatchField
     endSampleTime_(ptf.endSampleTime_),
     endSampledValues_(ptf.endSampledValues_),
     endAverage_(ptf.endAverage_),
-    offSet_(ptf.offSet_().clone().ptr())
+    offset_(ptf.offset_().clone().ptr())
 {}
 
 
@@ -487,7 +487,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
 
     // apply offset to mapped values
     const scalar t = this->db().time().timeOutputValue();
-    this->operator==(*this + offSet_->value(t));
+    this->operator==(*this + offset_->value(t));
 
     if (debug)
     {
@@ -512,7 +512,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
             << token::END_STATEMENT << nl;
     }
 
-    offSet_->writeData(os);
+    offset_->writeData(os);
 
     this->writeEntry("value", os);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index 01e61301eb..aec6c322b9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -132,7 +132,7 @@ class timeVaryingMappedFixedValueFvPatchField
         Type endAverage_;
 
         //- Time varying offset values to interpolated data
-        autoPtr<DataEntry<Type> > offSet_;
+        autoPtr<DataEntry<Type> > offset_;
 
 
 public:
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
index 9e5578b886..9851f44b6f 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJump/energyJumpFvPatchScalarField.C
@@ -68,6 +68,10 @@ Foam::energyJumpFvPatchScalarField::energyJumpFvPatchScalarField
             scalarField("value", dict, p.size())
         );
     }
+    else
+    {
+        evaluate(Pstream::blocking);
+    }
 }
 
 
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
index 7f6a09c181..cc8675dad9 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/energyJump/energyJumpAMI/energyJumpAMIFvPatchScalarField.C
@@ -68,6 +68,10 @@ Foam::energyJumpAMIFvPatchScalarField::energyJumpAMIFvPatchScalarField
             scalarField("value", dict, p.size())
         );
     }
+    else
+    {
+        evaluate(Pstream::blocking);
+    }
 }
 
 

From 215a32679de590653503b32526cf9cf600f46449 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 15 Nov 2012 16:57:22 +0000
Subject: [PATCH 64/81] ENH: Updated construction of he thermo boundary
 conditions from T field

---
 .../basic/heThermo/heThermo.C                 | 39 ++++++++++++++++++-
 .../basic/heThermo/heThermo.H                 |  4 ++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index bba8da1514..8efaf0f5d5 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -35,6 +35,39 @@ License
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
+template<class BasicThermo, class MixtureType>
+Foam::wordList Foam::heThermo<BasicThermo, MixtureType>::heBoundaryBaseTypes()
+{
+    const volScalarField::GeometricBoundaryField& tbf =
+        this->T_.boundaryField();
+
+    wordList hbt(tbf.size(), word::null);
+
+    forAll(tbf, patchi)
+    {
+        if (isA<fixedJumpFvPatchScalarField>(tbf[patchi]))
+        {
+            const fixedJumpFvPatchScalarField& pf =
+                dynamic_cast<const fixedJumpFvPatchScalarField&>(tbf[patchi]);
+
+            hbt[patchi] = pf.interfaceFieldType();
+        }
+        else if (isA<fixedJumpAMIFvPatchScalarField>(tbf[patchi]))
+        {
+            const fixedJumpAMIFvPatchScalarField& pf =
+                dynamic_cast<const fixedJumpAMIFvPatchScalarField&>
+                (
+                    tbf[patchi]
+                );
+
+            hbt[patchi] = pf.interfaceFieldType();
+        }
+    }
+
+    return hbt;
+}
+
+
 template<class BasicThermo, class MixtureType>
 Foam::wordList Foam::heThermo<BasicThermo, MixtureType>::heBoundaryTypes()
 {
@@ -149,7 +182,8 @@ Foam::heThermo<BasicThermo, MixtureType>::heThermo
         ),
         mesh,
         dimEnergy/dimMass,
-        this->heBoundaryTypes()
+        this->heBoundaryTypes(),
+        this->heBoundaryBaseTypes()
     )
 {
     init();
@@ -179,7 +213,8 @@ Foam::heThermo<BasicThermo, MixtureType>::heThermo
         ),
         mesh,
         dimEnergy/dimMass,
-        this->heBoundaryTypes()
+        this->heBoundaryTypes(),
+        this->heBoundaryBaseTypes()
     )
 {
     init();
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.H b/src/thermophysicalModels/basic/heThermo/heThermo.H
index 2c894eee43..ef9919a99c 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.H
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.H
@@ -68,6 +68,10 @@ protected:
             //  by interrogating the temperature field boundary types
             wordList heBoundaryTypes();
 
+            //- Return the enthalpy/internal energy field boundary base types
+            //  by interrogating the temperature field boundary types
+            wordList heBoundaryBaseTypes();
+
             //- Correct the enthalpy/internal energy field boundaries
             void heBoundaryCorrection(volScalarField& he);
 

From c6a1789b9d53b841ab5a5d68be86b5e3e7c4eb49 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 15 Nov 2012 17:00:25 +0000
Subject: [PATCH 65/81] ENH: Updated uniformJumpAMI BC

---
 .../derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
index 06f4e3c134..0670119ab0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
@@ -73,6 +73,10 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
     {
         fvPatchField<Type>::operator=(Field<Type>("value", dict, p.size()));
     }
+    else
+    {
+        this->evaluate(Pstream::blocking);
+    }
 }
 
 

From 7d72e056529d3615de2bb82aa4c8d98a657a8aec Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 13:04:56 +0000
Subject: [PATCH 66/81] ENH: Enabled setting fixed temperature constaint to a
 field

---
 .../fixedTemperatureSource.C                  | 63 +++++++++++++++++--
 .../fixedTemperatureSource.H                  | 31 ++++++++-
 2 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C b/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C
index bef68f3c4e..2d9cc96f0d 100644
--- a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C
+++ b/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C
@@ -41,8 +41,18 @@ namespace Foam
         fixedTemperatureSource,
         dictionary
     );
+
+    template<>
+    const char* NamedEnum<fixedTemperatureSource::temperatureMode, 2>::names[] =
+    {
+        "constantTemperature",
+        "lookup"
+    };
 }
 
+const Foam::NamedEnum<Foam::fixedTemperatureSource::temperatureMode, 2>
+    Foam::fixedTemperatureSource::temperatureModeNames_;
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -55,8 +65,29 @@ Foam::fixedTemperatureSource::fixedTemperatureSource
 )
 :
     basicSource(name, modelType, dict, mesh),
-    T_(readScalar(coeffs_.lookup("temperature")))
+    mode_(temperatureModeNames_.read(coeffs_.lookup("mode"))),
+    Tconstant_(0.0),
+    TName_("T")
 {
+    switch (mode_)
+    {
+        case tmConstant:
+        {
+            coeffs_.lookup("temperature") >> Tconstant_;
+            break;
+        }
+        case tmLookup:
+        {
+            TName_ = coeffs_.lookupOrDefault<word>("TName", "T");
+            break;
+        }
+        default:
+        {
+            // error handling done by NamedEnum
+        }
+    }
+
+
     fieldNames_.setSize(1, "energy");
     applied_.setSize(1, false);
 }
@@ -81,8 +112,31 @@ void Foam::fixedTemperatureSource::setValue
 
     if (eqn.psi().name() == thermo.he().name())
     {
-        const scalarField Tfield(cells_.size(), T_);
-        eqn.setValues(cells_, thermo.he(thermo.p(), Tfield, cells_));
+        switch (mode_)
+        {
+            case tmConstant:
+            {
+                scalarField Tconst(cells_.size(), Tconstant_);
+                eqn.setValues(cells_, thermo.he(thermo.p(), Tconst, cells_));
+
+                break;
+            }
+            case tmLookup:
+            {
+                const volScalarField& T =
+                    mesh().lookupObject<volScalarField>(TName_);
+
+                scalarField Tlookup(T, cells_);
+                eqn.setValues(cells_, thermo.he(thermo.p(), Tlookup, cells_));
+
+                break;
+            }
+            default:
+            {
+                // error handling done by NamedEnum
+            }
+        }
+
     }
 }
 
@@ -98,7 +152,8 @@ bool Foam::fixedTemperatureSource::read(const dictionary& dict)
 {
     if (basicSource::read(dict))
     {
-        coeffs_.readIfPresent("T", T_);
+        coeffs_.readIfPresent("temperature", Tconstant_);
+        coeffs_.readIfPresent("TName", TName_);
 
         return true;
     }
diff --git a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.H b/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.H
index 4281a38e2c..3aefdb5645 100644
--- a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.H
+++ b/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.H
@@ -33,7 +33,13 @@ Description
         fixedTemperatureSourceCoeffs
         {
             fieldNames      (h e hs);   // names of fields to apply source
+            mode            constant;   // constant or lookup
+
+            // constant option
             temperature     500;        // fixed temperature [K]
+
+            // loolup option
+            // TName        T;          // optional temperature field name
         }
 
 
@@ -46,6 +52,7 @@ SourceFiles
 #define fixedTemperatureSource_H
 
 #include "basicSource.H"
+#include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,12 +68,32 @@ class fixedTemperatureSource
     public basicSource
 {
 
+public:
+
+    //- Temperature mode
+    enum temperatureMode
+    {
+        tmConstant,
+        tmLookup
+    };
+
+
+    //- String representation of temperatureMode enums
+    static const NamedEnum<temperatureMode, 2> temperatureModeNames_;
+
+
 protected:
 
     // Protected data
 
-        //- Fixed temperature [K]
-        scalar T_;
+        //- Operation mode
+        temperatureMode mode_;
+
+        //- Constant temperature [K]
+        scalar Tconstant_;
+
+        //- Temperature field name
+        word TName_;
 
 
 private:

From 1b884d0e37f7bfc92a17d8dd52996666990df5c8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 16 Nov 2012 13:05:13 +0000
Subject: [PATCH 67/81] ENH: Time: have secondaryPurgeWrite

---
 src/OpenFOAM/db/Time/Time.C      | 30 +++++++++++------
 src/OpenFOAM/db/Time/Time.H      |  9 +++--
 src/OpenFOAM/db/Time/TimeIO.C    | 57 +++++++++++++++++++++++++++++---
 src/OpenFOAM/db/Time/TimeState.C |  2 ++
 src/OpenFOAM/db/Time/TimeState.H | 10 ++++--
 5 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 155c4c2eb4..8619e2da91 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -324,6 +324,7 @@ Foam::Time::Time
     secondaryWriteControl_(wcTimeStep),
     secondaryWriteInterval_(labelMax/10.0), // bit less to allow calculations
     purgeWrite_(0),
+    secondaryPurgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
     sigWriteNow_(true, *this),
@@ -416,6 +417,7 @@ Foam::Time::Time
     secondaryWriteControl_(wcTimeStep),
     secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
+    secondaryPurgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
     sigWriteNow_(true, *this),
@@ -511,6 +513,7 @@ Foam::Time::Time
     secondaryWriteControl_(wcTimeStep),
     secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
+    secondaryPurgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
     sigWriteNow_(true, *this),
@@ -608,6 +611,7 @@ Foam::Time::Time
     secondaryWriteControl_(wcTimeStep),
     secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
+    secondaryPurgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
 
@@ -1070,11 +1074,13 @@ Foam::Time& Foam::Time::operator++()
 
 
         outputTime_ = false;
+        primaryOutputTime_ = false;
+        secondaryOutputTime_ = false;
 
         switch (writeControl_)
         {
             case wcTimeStep:
-                outputTime_ = !(timeIndex_ % label(writeInterval_));
+                primaryOutputTime_ = !(timeIndex_ % label(writeInterval_));
             break;
 
             case wcRunTime:
@@ -1088,7 +1094,7 @@ Foam::Time& Foam::Time::operator++()
 
                 if (outputIndex > outputTimeIndex_)
                 {
-                    outputTime_ = true;
+                    primaryOutputTime_ = true;
                     outputTimeIndex_ = outputIndex;
                 }
             }
@@ -1103,7 +1109,7 @@ Foam::Time& Foam::Time::operator++()
                 );
                 if (outputIndex > outputTimeIndex_)
                 {
-                    outputTime_ = true;
+                    primaryOutputTime_ = true;
                     outputTimeIndex_ = outputIndex;
                 }
             }
@@ -1118,7 +1124,7 @@ Foam::Time& Foam::Time::operator++()
                 );
                 if (outputIndex > outputTimeIndex_)
                 {
-                    outputTime_ = true;
+                    primaryOutputTime_ = true;
                     outputTimeIndex_ = outputIndex;
                 }
             }
@@ -1130,9 +1136,8 @@ Foam::Time& Foam::Time::operator++()
         switch (secondaryWriteControl_)
         {
             case wcTimeStep:
-                outputTime_ =
-                    outputTime_
-                || !(timeIndex_ % label(secondaryWriteInterval_));
+                secondaryOutputTime_ =
+                    !(timeIndex_ % label(secondaryWriteInterval_));
             break;
 
             case wcRunTime:
@@ -1146,7 +1151,7 @@ Foam::Time& Foam::Time::operator++()
 
                 if (outputIndex > secondaryOutputTimeIndex_)
                 {
-                    outputTime_ = true;
+                    secondaryOutputTime_ = true;
                     secondaryOutputTimeIndex_ = outputIndex;
                 }
             }
@@ -1161,7 +1166,7 @@ Foam::Time& Foam::Time::operator++()
                 );
                 if (outputIndex > secondaryOutputTimeIndex_)
                 {
-                    outputTime_ = true;
+                    secondaryOutputTime_ = true;
                     secondaryOutputTimeIndex_ = outputIndex;
                 }
             }
@@ -1176,7 +1181,7 @@ Foam::Time& Foam::Time::operator++()
                 );
                 if (outputIndex > secondaryOutputTimeIndex_)
                 {
-                    outputTime_ = true;
+                    secondaryOutputTime_ = true;
                     secondaryOutputTimeIndex_ = outputIndex;
                 }
             }
@@ -1184,6 +1189,9 @@ Foam::Time& Foam::Time::operator++()
         }
 
 
+        outputTime_ = primaryOutputTime_ || secondaryOutputTime_;
+
+
         // see if endTime needs adjustment to stop at the next run()/end() check
         if (!end())
         {
@@ -1195,6 +1203,7 @@ Foam::Time& Foam::Time::operator++()
             {
                 endTime_ = value();
                 outputTime_ = true;
+                primaryOutputTime_ = true;
             }
             else if (stopAt_ == saNextWrite && outputTime_ == true)
             {
@@ -1205,6 +1214,7 @@ Foam::Time& Foam::Time::operator++()
         // Override outputTime if one-shot writing
         if (writeOnce_)
         {
+            primaryOutputTime_ = true;
             outputTime_ = true;
             writeOnce_ = false;
         }
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index 26e6b21bc7..1e761cd73e 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,10 +138,15 @@ protected:
 
             scalar secondaryWriteInterval_;
 
-
         label  purgeWrite_;
         mutable FIFOStack<word> previousOutputTimes_;
 
+        // Additional purging
+
+            label  secondaryPurgeWrite_;
+            mutable FIFOStack<word> previousSecondaryOutputTimes_;
+
+
         // One-shot writing
         bool writeOnce_;
 
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 6a80618404..1637d35bfc 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -160,6 +160,20 @@ void Foam::Time::readDict()
         }
     }
 
+    if (controlDict_.readIfPresent("secondaryPurgeWrite", secondaryPurgeWrite_))
+    {
+        if (secondaryPurgeWrite_ < 0)
+        {
+            WarningIn("Time::readDict()")
+                << "invalid value for secondaryPurgeWrite "
+                << secondaryPurgeWrite_
+                << ", should be >= 0, setting to 0"
+                << endl;
+
+            secondaryPurgeWrite_ = 0;
+        }
+    }
+
     if (controlDict_.found("timeFormat"))
     {
         const word formatName(controlDict_.lookup("timeFormat"));
@@ -347,13 +361,45 @@ bool Foam::Time::writeObject
         timeDict.regIOobject::writeObject(fmt, ver, cmp);
         bool writeOK = objectRegistry::writeObject(fmt, ver, cmp);
 
-        if (writeOK && purgeWrite_)
+        if (writeOK)
         {
-            previousOutputTimes_.push(tmName);
-
-            while (previousOutputTimes_.size() > purgeWrite_)
+            // Does primary or secondary time trigger purging?
+            // Note that primary times can only be purged by primary
+            // purging. Secondary times can be purged by either primary
+            // or secondary purging.
+            if (primaryOutputTime_ && purgeWrite_)
             {
-                rmDir(objectRegistry::path(previousOutputTimes_.pop()));
+                previousOutputTimes_.push(tmName);
+
+                while (previousOutputTimes_.size() > purgeWrite_)
+                {
+                    rmDir(objectRegistry::path(previousOutputTimes_.pop()));
+                }
+            }
+            if
+            (
+               !primaryOutputTime_
+             && secondaryOutputTime_
+             && secondaryPurgeWrite_
+            )
+            {
+                // Writing due to secondary
+                previousSecondaryOutputTimes_.push(tmName);
+
+                while
+                (
+                    previousSecondaryOutputTimes_.size()
+                  > secondaryPurgeWrite_
+                )
+                {
+                    rmDir
+                    (
+                        objectRegistry::path
+                        (
+                            previousSecondaryOutputTimes_.pop()
+                        )
+                    );
+                }
             }
         }
 
@@ -368,6 +414,7 @@ bool Foam::Time::writeObject
 
 bool Foam::Time::writeNow()
 {
+    primaryOutputTime_ = true;
     outputTime_ = true;
     return write();
 }
diff --git a/src/OpenFOAM/db/Time/TimeState.C b/src/OpenFOAM/db/Time/TimeState.C
index 500ca47d43..f3e3740107 100644
--- a/src/OpenFOAM/db/Time/TimeState.C
+++ b/src/OpenFOAM/db/Time/TimeState.C
@@ -37,7 +37,9 @@ Foam::TimeState::TimeState()
     deltaT0_(0),
     deltaTchanged_(false),
     outputTimeIndex_(0),
+    primaryOutputTime_(false),
     secondaryOutputTimeIndex_(0),
+    secondaryOutputTime_(false),
     outputTime_(false)
 {}
 
diff --git a/src/OpenFOAM/db/Time/TimeState.H b/src/OpenFOAM/db/Time/TimeState.H
index d721529480..b055d439f0 100644
--- a/src/OpenFOAM/db/Time/TimeState.H
+++ b/src/OpenFOAM/db/Time/TimeState.H
@@ -61,8 +61,14 @@ protected:
         bool deltaTchanged_;
 
         label outputTimeIndex_;
+        //- Is outputTime because of primary?
+        bool primaryOutputTime_;
+
         label secondaryOutputTimeIndex_;
-        bool  outputTime_;
+        //- Is outputTime because of secondary?
+        bool secondaryOutputTime_;
+
+        bool outputTime_;
 
 public:
 
@@ -112,7 +118,7 @@ public:
 
         // Check
 
-            //- Return true if this is an output time
+            //- Return true if this is an output time (primary or secondary)
             bool outputTime() const;
 };
 

From af35662c5c119d4a6cdc39183aa9814960569c2a Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 13:05:46 +0000
Subject: [PATCH 68/81] ENH: Tutorial update

---
 .../angledDuctExplicitFixedCoeff/constant/sourcesProperties      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
index 4386bc5250..404024507d 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
@@ -26,6 +26,7 @@ source1
 
     fixedTemperatureSourceCoeffs
     {
+        mode            constant;
         temperature     350;
     }
 }

From f9bc7f8ec09d36c9f7c6592c93060436cc40665c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 16 Nov 2012 13:07:35 +0000
Subject: [PATCH 69/81] COMP: nastran: inclusion of OSspecific

---
 .../writers/nastran/nastranSurfaceWriterTemplates.C              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
index e01429fc88..e43dc5757f 100644
--- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
+++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C
@@ -25,6 +25,7 @@ License
 
 #include "OFstream.H"
 #include "IOmanip.H"
+#include "OSspecific.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

From da4e82be43e1dabea98b410bfab7ec8ac235395e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 16 Nov 2012 13:09:16 +0000
Subject: [PATCH 70/81] COMP: surfaceWriter: unused include file

---
 src/sampling/sampledSurface/writers/surfaceWriter.H | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H
index dd54a756c6..84ca3cdf5d 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.H
@@ -35,7 +35,6 @@ SourceFiles
 #ifndef surfaceWriter_H
 #define surfaceWriter_H
 
-#include "volFields.H"
 #include "typeInfo.H"
 #include "autoPtr.H"
 #include "pointField.H"

From 46892c0a97cb4f58bc74ddcd1e9e90734733a95d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 16 Nov 2012 13:10:00 +0000
Subject: [PATCH 71/81] COMP: gnuplotWriter: surplus include file

---
 .../gnuplot/gnuplotSetWriter.C                | 141 ++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C

diff --git a/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
new file mode 100644
index 0000000000..2679e1e702
--- /dev/null
+++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C
@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "gnuplotSetWriter.H"
+#include "coordSet.H"
+#include "fileName.H"
+#include "OFstream.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::gnuplotSetWriter<Type>::gnuplotSetWriter()
+:
+    writer<Type>()
+{}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::gnuplotSetWriter<Type>::~gnuplotSetWriter()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::fileName Foam::gnuplotSetWriter<Type>::getFileName
+(
+    const coordSet& points,
+    const wordList& valueSetNames
+) const
+{
+    return this->getBaseName(points, valueSetNames) + ".gplt";
+}
+
+
+template<class Type>
+void Foam::gnuplotSetWriter<Type>::write
+(
+    const coordSet& points,
+    const wordList& valueSetNames,
+    const List<const Field<Type>*>& valueSets,
+    Ostream& os
+) const
+{
+    os  << "set term postscript color" << nl
+        << "set output \"" << points.name() << ".ps\"" << nl
+        << "plot";
+
+    forAll(valueSets, i)
+    {
+        if (i != 0)
+        {
+            os << ',';
+        }
+
+        os  << " \"-\" title \"" << valueSetNames[i] << "\" with lines";
+    }
+    os  << nl;
+
+
+    forAll(valueSets, i)
+    {
+        this->writeTable(points, *valueSets[i], os);
+        os  << "e" << nl;
+    }
+}
+
+
+template<class Type>
+void Foam::gnuplotSetWriter<Type>::write
+(
+    const bool writeTracks,
+    const PtrList<coordSet>& trackPoints,
+    const wordList& valueSetNames,
+    const List<List<Field<Type> > >& valueSets,
+    Ostream& os
+) const
+{
+    if (valueSets.size() != valueSetNames.size())
+    {
+        FatalErrorIn("gnuplotSetWriter<Type>::write(..)")
+            << "Number of variables:" << valueSetNames.size() << endl
+            << "Number of valueSets:" << valueSets.size()
+            << exit(FatalError);
+    }
+    if (trackPoints.size() > 0)
+    {
+        os  << "set term postscript color" << nl
+            << "set output \"" << trackPoints[0].name() << ".ps\"" << nl;
+
+        forAll(trackPoints, trackI)
+        {
+            os  << "plot";
+
+            forAll(valueSets, i)
+            {
+                if (i != 0)
+                {
+                    os << ',';
+                }
+
+                os  << " \"-\" title \"" << valueSetNames[i] << "\" with lines";
+            }
+            os << nl;
+
+            forAll(valueSets, i)
+            {
+                this->writeTable(trackPoints[trackI], valueSets[i][trackI], os);
+                os  << "e" << nl;
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //

From 3ac086402d4b2cdb6c8b15cfa6b867e22257faf7 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 16 Nov 2012 13:11:17 +0000
Subject: [PATCH 72/81] COMP: sampling: moved sampledSet writers to fileFormats
 library

---
 src/engine/Make/options                             |  6 ++----
 src/fileFormats/Make/files                          | 13 +++++++++++++
 src/fvMotionSolver/Make/options                     |  3 ++-
 src/lagrangian/coalCombustion/Make/options          |  6 ++----
 src/mesh/autoMesh/Make/options                      |  3 ++-
 src/meshTools/Make/options                          |  5 +++--
 src/postProcessing/functionObjects/IO/Make/options  |  6 ++----
 .../functionObjects/field/Make/options              |  2 ++
 .../functionObjects/forces/Make/options             |  4 ++--
 .../functionObjects/jobControl/Make/options         |  9 ---------
 .../functionObjects/systemCall/Make/options         |  9 ---------
 src/randomProcesses/Make/options                    |  6 ++----
 src/regionModels/regionCoupling/Make/options        |  1 -
 src/regionModels/thermoBaffleModels/Make/options    |  1 -
 src/sampling/Make/files                             | 12 ------------
 src/sampling/Make/options                           |  2 ++
 16 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/src/engine/Make/options b/src/engine/Make/options
index 6862a106f6..0929e2bc8f 100644
--- a/src/engine/Make/options
+++ b/src/engine/Make/options
@@ -2,12 +2,10 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/fvMotionSolver/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/fvMotionSolver/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -ldynamicMesh \
-    -lfvMotionSolvers \
-    -lsampling
+    -lfvMotionSolvers
diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files
index 7845ac9312..37f3bc0098 100644
--- a/src/fileFormats/Make/files
+++ b/src/fileFormats/Make/files
@@ -2,4 +2,17 @@ vtk/vtkUnstructuredReader.C
 nas/NASCore.C
 starcd/STARCDCore.C
 
+coordSet/coordSet.C
+
+setWriters = sampledSetWriters
+
+$(setWriters)/writers.C
+$(setWriters)/ensight/ensightSetWriterRunTime.C
+$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C
+$(setWriters)/jplot/jplotSetWriterRunTime.C
+$(setWriters)/raw/rawSetWriterRunTime.C
+$(setWriters)/vtk/vtkSetWriterRunTime.C
+$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C
+$(setWriters)/csv/csvSetWriterRunTime.C
+
 LIB = $(FOAM_LIBBIN)/libfileFormats
diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options
index fa13513b50..29e4469610 100644
--- a/src/fvMotionSolver/Make/options
+++ b/src/fvMotionSolver/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \
 
 LIB_LIBS = \
@@ -11,4 +11,5 @@ LIB_LIBS = \
     -lmeshTools \
     -ldynamicMesh \
     -lfiniteVolume \
+    -lfileFormats
     /*-lforces include in controlDict if needed */
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 34a2babd73..0d7eb0e13b 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -17,8 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
@@ -42,5 +41,4 @@ LIB_LIBS = \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \
-    -ldynamicFvMesh \
-    -lsampling
+    -ldynamicFvMesh
diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options
index 0ee4f07bb0..d37a26a9dd 100644
--- a/src/mesh/autoMesh/Make/options
+++ b/src/mesh/autoMesh/Make/options
@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
@@ -14,6 +14,7 @@ LIB_LIBS = \
     -lfiniteVolume \
     -llagrangian \
     -lmeshTools \
+    -lfileFormats \
     -ledgeMesh \
     -lsurfMesh \
     -ltriSurface \
diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options
index ac717c7516..1b22dab2a0 100644
--- a/src/meshTools/Make/options
+++ b/src/meshTools/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/fileFormats/lnInclude
 
 LIB_LIBS = \
-    -ltriSurface
+    -ltriSurface \
+    -lfileFormats
diff --git a/src/postProcessing/functionObjects/IO/Make/options b/src/postProcessing/functionObjects/IO/Make/options
index 5166bcc9e3..a3ae8da833 100644
--- a/src/postProcessing/functionObjects/IO/Make/options
+++ b/src/postProcessing/functionObjects/IO/Make/options
@@ -1,9 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -lmeshTools \
-    -lsampling
+    -lmeshTools
diff --git a/src/postProcessing/functionObjects/field/Make/options b/src/postProcessing/functionObjects/field/Make/options
index d7c5f944c6..e95ea37c78 100644
--- a/src/postProcessing/functionObjects/field/Make/options
+++ b/src/postProcessing/functionObjects/field/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/turbulenceModels \
@@ -11,6 +12,7 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -llagrangian \
+    -lfileFormats \
     -lsampling \
     -lincompressibleTransportModels \
     -lcompressibleTurbulenceModel \
diff --git a/src/postProcessing/functionObjects/forces/Make/options b/src/postProcessing/functionObjects/forces/Make/options
index afc10fb1aa..5952c6b6cb 100644
--- a/src/postProcessing/functionObjects/forces/Make/options
+++ b/src/postProcessing/functionObjects/forces/Make/options
@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
@@ -17,4 +17,4 @@ LIB_LIBS = \
     -lcompressibleLESModels \
     -lfiniteVolume \
     -lmeshTools \
-    -lsampling
+    -lfileFormats
diff --git a/src/postProcessing/functionObjects/jobControl/Make/options b/src/postProcessing/functionObjects/jobControl/Make/options
index 5166bcc9e3..e69de29bb2 100644
--- a/src/postProcessing/functionObjects/jobControl/Make/options
+++ b/src/postProcessing/functionObjects/jobControl/Make/options
@@ -1,9 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lsampling
diff --git a/src/postProcessing/functionObjects/systemCall/Make/options b/src/postProcessing/functionObjects/systemCall/Make/options
index 5166bcc9e3..e69de29bb2 100644
--- a/src/postProcessing/functionObjects/systemCall/Make/options
+++ b/src/postProcessing/functionObjects/systemCall/Make/options
@@ -1,9 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lsampling
diff --git a/src/randomProcesses/Make/options b/src/randomProcesses/Make/options
index 61fc018ad9..71b7873964 100644
--- a/src/randomProcesses/Make/options
+++ b/src/randomProcesses/Make/options
@@ -1,7 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
-    -lfiniteVolume \
-    -lsampling
+    -lfiniteVolume
diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options
index 4eaef77e23..28569ccda6 100644
--- a/src/regionModels/regionCoupling/Make/options
+++ b/src/regionModels/regionCoupling/Make/options
@@ -1,6 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/AMIInterpolation/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options
index 2c0e2cf57c..21a54595be 100644
--- a/src/regionModels/thermoBaffleModels/Make/options
+++ b/src/regionModels/thermoBaffleModels/Make/options
@@ -3,7 +3,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/AMIInterpolation/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index 8c5227dbf2..ef0415f0f2 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -5,7 +5,6 @@ probes/probesFunctionObject/probesFunctionObject.C
 
 sampledSet/circle/circleSet.C
 sampledSet/cloud/cloudSet.C
-sampledSet/coordSet/coordSet.C
 sampledSet/patchCloud/patchCloudSet.C
 sampledSet/polyLine/polyLineSet.C
 sampledSet/face/faceOnlySet.C
@@ -20,17 +19,6 @@ sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
 sampledSet/uniform/uniformSet.C
 sampledSet/array/arraySet.C
 
-setWriters = sampledSet/writers
-
-$(setWriters)/writers.C
-$(setWriters)/ensight/ensightSetWriterRunTime.C
-$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C
-$(setWriters)/jplot/jplotSetWriterRunTime.C
-$(setWriters)/raw/rawSetWriterRunTime.C
-$(setWriters)/vtk/vtkSetWriterRunTime.C
-$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C
-$(setWriters)/csv/csvSetWriterRunTime.C
-
 cuttingPlane/cuttingPlane.C
 
 sampledSurface/sampledPatch/sampledPatch.C
diff --git a/src/sampling/Make/options b/src/sampling/Make/options
index 3fbc509d54..23e6bc81a7 100644
--- a/src/sampling/Make/options
+++ b/src/sampling/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/conversion/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
@@ -10,6 +11,7 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsurfMesh \
+    -lfileFormats \
     -ltriSurface \
     -llagrangian \
     -lconversion

From e65512be4ebf5b1f29ab9e1ac3893acb167e3fd4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 16 Nov 2012 13:13:39 +0000
Subject: [PATCH 73/81] COMP: sampling: moved sampledSet writing to fileFormats

---
 applications/solvers/DNS/dnsFoam/Make/options |   7 +-
 .../solvers/combustion/PDRFoam/Make/options   |   1 -
 .../solvers/combustion/XiFoam/Make/options    |   6 +-
 .../combustion/coldEngineFoam/Make/options    |   3 -
 .../incompressible/icoFoam/Make/options       |   6 +-
 .../mesh/generation/cvMesh/Make/options       |   4 +-
 .../cvMesh/conformalVoronoiMesh/Make/options  |   3 +-
 .../cvMesh/cvMeshBackgroundMesh/Make/options  |   6 +-
 .../cvMesh/cvMeshSurfaceSimplify/Make/options |   4 +-
 .../generation/snappyHexMesh/Make/options     |   4 +-
 .../dataConversion/foamToGMV/Make/options     |   6 -
 .../lagrangian/particleTracks/Make/options    |   4 +-
 .../sampling/sample/Make/options              |   2 +
 .../velocityField/Pe/Make/options             |   3 +-
 .../preProcessing/boxTurb/Make/options        |   5 +-
 .../coordSet/coordSet.C                       |   2 +-
 .../coordSet/coordSet.H                       |   2 +-
 .../sampledSetWriters}/csv/csvSetWriter.C     |   2 +-
 .../sampledSetWriters}/csv/csvSetWriter.H     |   2 +-
 .../csv/csvSetWriterRunTime.C                 |   2 +-
 .../ensight/ensightSetWriter.C                |   2 +-
 .../ensight/ensightSetWriter.H                |   2 +-
 .../ensight/ensightSetWriterRunTime.C         |   2 +-
 .../gnuplot/gnuplotSetWriter.H                |   2 +-
 .../gnuplot/gnuplotSetWriterRunTime.C         |   2 +-
 .../sampledSetWriters}/jplot/jplotSetWriter.C |   2 +-
 .../sampledSetWriters}/jplot/jplotSetWriter.H |   2 +-
 .../jplot/jplotSetWriterRunTime.C             |   2 +-
 .../sampledSetWriters}/raw/rawSetWriter.C     |   2 +-
 .../sampledSetWriters}/raw/rawSetWriter.H     |   2 +-
 .../raw/rawSetWriterRunTime.C                 |   2 +-
 .../sampledSetWriters}/vtk/vtkSetWriter.C     |   2 +-
 .../sampledSetWriters}/vtk/vtkSetWriter.H     |   2 +-
 .../vtk/vtkSetWriterRunTime.C                 |   2 +-
 .../sampledSetWriters}/writer.C               |   1 -
 .../sampledSetWriters}/writer.H               |   0
 .../sampledSetWriters}/writers.C              |   2 +-
 .../sampledSetWriters}/writers.H              |   2 +-
 .../xmgrace/xmgraceSetWriter.C                |   2 +-
 .../xmgrace/xmgraceSetWriter.H                |   2 +-
 .../xmgrace/xmgraceSetWriterRunTime.C         |   2 +-
 .../writers/gnuplot/gnuplotSetWriter.C        | 142 ------------------
 42 files changed, 51 insertions(+), 204 deletions(-)
 rename src/{sampling/sampledSet => fileFormats}/coordSet/coordSet.C (97%)
 rename src/{sampling/sampledSet => fileFormats}/coordSet/coordSet.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/csv/csvSetWriter.C (98%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/csv/csvSetWriter.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/csv/csvSetWriterRunTime.C (94%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/ensight/ensightSetWriter.C (99%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/ensight/ensightSetWriter.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/ensight/ensightSetWriterRunTime.C (94%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/gnuplot/gnuplotSetWriter.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/gnuplot/gnuplotSetWriterRunTime.C (94%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/jplot/jplotSetWriter.C (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/jplot/jplotSetWriter.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/jplot/jplotSetWriterRunTime.C (94%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/raw/rawSetWriter.C (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/raw/rawSetWriter.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/raw/rawSetWriterRunTime.C (94%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/vtk/vtkSetWriter.C (98%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/vtk/vtkSetWriter.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/vtk/vtkSetWriterRunTime.C (94%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/writer.C (99%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/writer.H (100%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/writers.C (96%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/writers.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/xmgrace/xmgraceSetWriter.C (98%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/xmgrace/xmgraceSetWriter.H (97%)
 rename src/{sampling/sampledSet/writers => fileFormats/sampledSetWriters}/xmgrace/xmgraceSetWriterRunTime.C (94%)
 delete mode 100644 src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C

diff --git a/applications/solvers/DNS/dnsFoam/Make/options b/applications/solvers/DNS/dnsFoam/Make/options
index 34c3503a51..e0e7a30d72 100644
--- a/applications/solvers/DNS/dnsFoam/Make/options
+++ b/applications/solvers/DNS/dnsFoam/Make/options
@@ -1,10 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/randomProcesses/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/randomProcesses/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
-    -lrandomProcesses \
-    -lsampling \
-    -lmeshTools
+    -lrandomProcesses
diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options
index 135659c276..b6c6398fde 100644
--- a/applications/solvers/combustion/PDRFoam/Make/options
+++ b/applications/solvers/combustion/PDRFoam/Make/options
@@ -5,7 +5,6 @@ EXE_INC = \
     -IPDRModels/dragModels/PDRDragModel \
     -IlaminarFlameSpeed/SCOPE \
     -I$(LIB_SRC)/engine/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options
index 0812df5e3b..3a07a7de58 100644
--- a/applications/solvers/combustion/XiFoam/Make/options
+++ b/applications/solvers/combustion/XiFoam/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
@@ -17,5 +17,5 @@ EXE_LIBS = \
     -lreactionThermophysicalModels \
     -lspecie \
     -llaminarFlameSpeedModels \
-    -lfiniteVolume \
-    -lmeshTools
+    -lmeshTools \
+    -lfiniteVolume
diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index 25217ab23f..7e8eb378be 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -9,7 +9,6 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fieldSources/lnInclude
 
 EXE_LIBS = \
@@ -20,6 +19,4 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lfiniteVolume \
-    -lsampling \
-    -lmeshTools \
     -lfieldSources
diff --git a/applications/solvers/incompressible/icoFoam/Make/options b/applications/solvers/incompressible/icoFoam/Make/options
index fa15f12452..d38cd8b180 100644
--- a/applications/solvers/incompressible/icoFoam/Make/options
+++ b/applications/solvers/incompressible/icoFoam/Make/options
@@ -1,5 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lsampling
diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index 2228fc2b12..27241b2965 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -17,7 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
@@ -30,6 +30,6 @@ EXE_LIBS = \
     -ldecompositionMethods \
     -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
     -ledgeMesh \
-    -lsampling \
+    -lfileFormats \
     -ltriSurface \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
index 62649cf232..2082f88ff0 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options
@@ -17,7 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I../vectorTools
@@ -25,5 +25,6 @@ EXE_INC = \
 EXE_LIBS = \
     -lmeshTools \
     -ledgeMesh \
+    -lfileFormats \
     -ltriSurface \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
index 2d1ad7bfda..ed71a80029 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options
@@ -11,10 +11,11 @@ EXE_INC = \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
 EXE_LIBS = \
@@ -24,8 +25,9 @@ EXE_LIBS = \
     -lconformalVoronoiMesh \
     -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
     -ledgeMesh \
-    -lsampling \
     -ltriSurface \
     -lmeshTools \
+    -lfileFormats \
+    -lsampling \
     -ldynamicMesh \
     -lfiniteVolume
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
index 35c90b1f48..7bd92a24ab 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options
@@ -9,7 +9,7 @@ EXE_INC = \
     -I$(FASTDUALOCTREE_SRC_PATH) \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
@@ -22,7 +22,7 @@ EXE_LIBS = \
     -lconformalVoronoiMesh \
     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \
     -ledgeMesh \
-    -lsampling \
+    -lfileFormats \
     -ltriSurface \
     -lmeshTools \
     -ldynamicMesh
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index 94ff17ee99..af056ec7cb 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
@@ -14,6 +14,6 @@ EXE_LIBS = \
     -ldecompositionMethods \
     -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \
     -lmeshTools \
-    -lsampling \
+    -lfileFormats \
     -ldynamicMesh \
     -lautoMesh
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options
index 5c515d8f95..87b4324810 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options
@@ -1,15 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/lagrangian/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-    -I$(LIB_SRC)/browser/lnInclude \
-    -I$(LIB_SRC)/foam/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 EXE_LIBS = \
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
index 3bcea78b3b..b653926f93 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
@@ -1,12 +1,12 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lsampling \
+    -lfileFormats \
     -lgenericPatchFields \
     -llagrangian
diff --git a/applications/utilities/postProcessing/sampling/sample/Make/options b/applications/utilities/postProcessing/sampling/sample/Make/options
index 88c6039b4e..4de726a20f 100644
--- a/applications/utilities/postProcessing/sampling/sample/Make/options
+++ b/applications/utilities/postProcessing/sampling/sample/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
@@ -9,6 +10,7 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lmeshTools \
+    -lfileFormats \
     -lsampling \
     -lsurfMesh \
     -llagrangian
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options
index 29d9b4d8c3..1d984aa9b5 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Make/options
+++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options
@@ -5,8 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
diff --git a/applications/utilities/preProcessing/boxTurb/Make/options b/applications/utilities/preProcessing/boxTurb/Make/options
index 749a3d5124..e24cee9cb9 100644
--- a/applications/utilities/preProcessing/boxTurb/Make/options
+++ b/applications/utilities/preProcessing/boxTurb/Make/options
@@ -1,10 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/randomProcesses/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lrandomProcesses \
-    -lsampling \
-    -lmeshTools \
     -lfiniteVolume
diff --git a/src/sampling/sampledSet/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C
similarity index 97%
rename from src/sampling/sampledSet/coordSet/coordSet.C
rename to src/fileFormats/coordSet/coordSet.C
index fed58fc86f..d8b37c5fdd 100644
--- a/src/sampling/sampledSet/coordSet/coordSet.C
+++ b/src/fileFormats/coordSet/coordSet.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/coordSet/coordSet.H b/src/fileFormats/coordSet/coordSet.H
similarity index 97%
rename from src/sampling/sampledSet/coordSet/coordSet.H
rename to src/fileFormats/coordSet/coordSet.H
index 8629f78bbe..5492f37b43 100644
--- a/src/sampling/sampledSet/coordSet/coordSet.H
+++ b/src/fileFormats/coordSet/coordSet.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
similarity index 98%
rename from src/sampling/sampledSet/writers/csv/csvSetWriter.C
rename to src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
index 4cbb51a597..c1ed54b1cd 100644
--- a/src/sampling/sampledSet/writers/csv/csvSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.H b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
similarity index 97%
rename from src/sampling/sampledSet/writers/csv/csvSetWriter.H
rename to src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
index 9c494320cb..8e4b9c7d70 100644
--- a/src/sampling/sampledSet/writers/csv/csvSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C
similarity index 94%
rename from src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C
rename to src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C
index 2d326f8efa..ac588e3957 100644
--- a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
similarity index 99%
rename from src/sampling/sampledSet/writers/ensight/ensightSetWriter.C
rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C
index d481a41532..4b874e201d 100644
--- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
similarity index 97%
rename from src/sampling/sampledSet/writers/ensight/ensightSetWriter.H
rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
index 5118c85faa..14a735b2ed 100644
--- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C
similarity index 94%
rename from src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C
rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C
index b987035b33..c529cb02e4 100644
--- a/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C
+++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
similarity index 97%
rename from src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H
rename to src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
index 88e9414c85..74688771e8 100644
--- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C
similarity index 94%
rename from src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C
rename to src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C
index 90ee219888..4e57426359 100644
--- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C
+++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C
similarity index 97%
rename from src/sampling/sampledSet/writers/jplot/jplotSetWriter.C
rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C
index 98dc34bad9..d71d860a26 100644
--- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
similarity index 97%
rename from src/sampling/sampledSet/writers/jplot/jplotSetWriter.H
rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
index bd7bc8c783..5b09456642 100644
--- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C
similarity index 94%
rename from src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C
rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C
index e0e9ac2b52..7e54146fe7 100644
--- a/src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C
+++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.C b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C
similarity index 97%
rename from src/sampling/sampledSet/writers/raw/rawSetWriter.C
rename to src/fileFormats/sampledSetWriters/raw/rawSetWriter.C
index e259c78eaa..403b9e7111 100644
--- a/src/sampling/sampledSet/writers/raw/rawSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.H b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
similarity index 97%
rename from src/sampling/sampledSet/writers/raw/rawSetWriter.H
rename to src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
index 418549d01b..89c857d779 100644
--- a/src/sampling/sampledSet/writers/raw/rawSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C
similarity index 94%
rename from src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C
rename to src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C
index c4376c9140..92a8a83354 100644
--- a/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C
+++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
similarity index 98%
rename from src/sampling/sampledSet/writers/vtk/vtkSetWriter.C
rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C
index b865e704d4..3ab2736175 100644
--- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
similarity index 97%
rename from src/sampling/sampledSet/writers/vtk/vtkSetWriter.H
rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
index 9507fd1dc7..21bd80ef1e 100644
--- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C
similarity index 94%
rename from src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C
rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C
index 3c30764d86..e9320e5b55 100644
--- a/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C
+++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/writer.C b/src/fileFormats/sampledSetWriters/writer.C
similarity index 99%
rename from src/sampling/sampledSet/writers/writer.C
rename to src/fileFormats/sampledSetWriters/writer.C
index 69dbdec6fe..e031615ff6 100644
--- a/src/sampling/sampledSet/writers/writer.C
+++ b/src/fileFormats/sampledSetWriters/writer.C
@@ -166,7 +166,6 @@ void Foam::writer<Type>::write
     {
         valueSetPtrs[i] = &valueSets[i];
     }
-    
     write(points, valueSetNames, valueSetPtrs, os);
 }
 
diff --git a/src/sampling/sampledSet/writers/writer.H b/src/fileFormats/sampledSetWriters/writer.H
similarity index 100%
rename from src/sampling/sampledSet/writers/writer.H
rename to src/fileFormats/sampledSetWriters/writer.H
diff --git a/src/sampling/sampledSet/writers/writers.C b/src/fileFormats/sampledSetWriters/writers.C
similarity index 96%
rename from src/sampling/sampledSet/writers/writers.C
rename to src/fileFormats/sampledSetWriters/writers.C
index 2815bcda03..4bcc1b39b2 100644
--- a/src/sampling/sampledSet/writers/writers.C
+++ b/src/fileFormats/sampledSetWriters/writers.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/writers.H b/src/fileFormats/sampledSetWriters/writers.H
similarity index 97%
rename from src/sampling/sampledSet/writers/writers.H
rename to src/fileFormats/sampledSetWriters/writers.H
index 3adaab13fa..601e7bcd16 100644
--- a/src/sampling/sampledSet/writers/writers.H
+++ b/src/fileFormats/sampledSetWriters/writers.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C
similarity index 98%
rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C
rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C
index 9cc44a10c3..3825868196 100644
--- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
similarity index 97%
rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H
rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
index 8e8dc67ead..47c3628936 100644
--- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H
+++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C
similarity index 94%
rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C
rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C
index 8e7ab61c8e..583855fc83 100644
--- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C
+++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C
deleted file mode 100644
index f6198d3f5a..0000000000
--- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C
+++ /dev/null
@@ -1,142 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "gnuplotSetWriter.H"
-#include "clock.H"
-#include "coordSet.H"
-#include "fileName.H"
-#include "OFstream.H"
-#include "addToRunTimeSelectionTable.H"
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::gnuplotSetWriter<Type>::gnuplotSetWriter()
-:
-    writer<Type>()
-{}
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::gnuplotSetWriter<Type>::~gnuplotSetWriter()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::fileName Foam::gnuplotSetWriter<Type>::getFileName
-(
-    const coordSet& points,
-    const wordList& valueSetNames
-) const
-{
-    return this->getBaseName(points, valueSetNames) + ".gplt";
-}
-
-
-template<class Type>
-void Foam::gnuplotSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& valueSets,
-    Ostream& os
-) const
-{
-    os  << "set term postscript color" << nl
-        << "set output \"" << points.name() << ".ps\"" << nl
-        << "plot";
-
-    forAll(valueSets, i)
-    {
-        if (i != 0)
-        {
-            os << ',';
-        }
-
-        os  << " \"-\" title \"" << valueSetNames[i] << "\" with lines";
-    }
-    os  << nl;
-
-
-    forAll(valueSets, i)
-    {
-        this->writeTable(points, *valueSets[i], os);
-        os  << "e" << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::gnuplotSetWriter<Type>::write
-(
-    const bool writeTracks,
-    const PtrList<coordSet>& trackPoints,
-    const wordList& valueSetNames,
-    const List<List<Field<Type> > >& valueSets,
-    Ostream& os
-) const
-{
-    if (valueSets.size() != valueSetNames.size())
-    {
-        FatalErrorIn("gnuplotSetWriter<Type>::write(..)")
-            << "Number of variables:" << valueSetNames.size() << endl
-            << "Number of valueSets:" << valueSets.size()
-            << exit(FatalError);
-    }
-    if (trackPoints.size() > 0)
-    {
-        os  << "set term postscript color" << nl
-            << "set output \"" << trackPoints[0].name() << ".ps\"" << nl;
-
-        forAll(trackPoints, trackI)
-        {
-            os  << "plot";
-
-            forAll(valueSets, i)
-            {
-                if (i != 0)
-                {
-                    os << ',';
-                }
-
-                os  << " \"-\" title \"" << valueSetNames[i] << "\" with lines";
-            }
-            os << nl;
-
-            forAll(valueSets, i)
-            {
-                this->writeTable(trackPoints[trackI], valueSets[i][trackI], os);
-                os  << "e" << nl;
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //

From 00da60e51c119dd1584ec6e6cee1f4675f0ee434 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 13:25:19 +0000
Subject: [PATCH 74/81] ENH: Updated scope for NamedEnum

---
 .../outputFilterOutputControl.C                          | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
index 34b9da0da1..e282ff8c21 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,11 +30,8 @@ License
 namespace Foam
 {
     template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::outputFilterOutputControl::outputControls,
-        2
-    >::names[] =
+    const char* NamedEnum<outputFilterOutputControl::outputControls, 2>::
+    names[] =
     {
         "timeStep",
         "outputTime"

From 707ba5221c3d937d716e29e492edfc060a43ae04 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 16 Nov 2012 14:41:13 +0000
Subject: [PATCH 75/81] COMP: coldenginefoam: library linkage

---
 applications/solvers/combustion/coldEngineFoam/Make/options | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options
index 7e8eb378be..2eaea744b0 100644
--- a/applications/solvers/combustion/coldEngineFoam/Make/options
+++ b/applications/solvers/combustion/coldEngineFoam/Make/options
@@ -9,6 +9,7 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fieldSources/lnInclude
 
 EXE_LIBS = \
@@ -19,4 +20,5 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lfiniteVolume \
+    -lmeshTools \
     -lfieldSources

From 4e693b88e0515fa8afc126a74ce87ee7ccd18d36 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 14:50:10 +0000
Subject: [PATCH 76/81] STYLE: Renamed constantTemperature -> constant

---
 .../derived/fixedTemperatureSource/fixedTemperatureSource.C     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C b/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C
index 2d9cc96f0d..34db0a7e3e 100644
--- a/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C
+++ b/src/fieldSources/derived/fixedTemperatureSource/fixedTemperatureSource.C
@@ -45,7 +45,7 @@ namespace Foam
     template<>
     const char* NamedEnum<fixedTemperatureSource::temperatureMode, 2>::names[] =
     {
-        "constantTemperature",
+        "constant",
         "lookup"
     };
 }

From acc5bb0fc7b73f53ecb0c279004a50a14614e181 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 14:50:28 +0000
Subject: [PATCH 77/81] ENH: Tutorial updates

---
 .../rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties | 2 ++
 .../angledDuctImplicit/constant/sourcesProperties               | 1 +
 .../simplifiedSiwek/constant/sourcesProperties                  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties
index 3782a377cd..c4c20f18d0 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties
@@ -19,6 +19,8 @@ zone1
 {
     cellZone    rotor;
 
+    active      on;
+
     // Fixed patches (by default they 'move' with the MRF zone)
     nonRotatingPatches ();
 
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/sourcesProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/sourcesProperties
index 4386bc5250..404024507d 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/sourcesProperties
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/sourcesProperties
@@ -26,6 +26,7 @@ source1
 
     fixedTemperatureSourceCoeffs
     {
+        mode            constant;
         temperature     350;
     }
 }
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
index 715f0ebdd9..f3eac3d8de 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/sourcesProperties
@@ -26,6 +26,7 @@ source1
 
     fixedTemperatureSourceCoeffs
     {
+        mode            constant;
         temperature     2000;
     }
 }

From e9721c7632db6b481e3b0d7989b7e585cad2e0c5 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 14:55:13 +0000
Subject: [PATCH 78/81] STYLE: Limit code to 80 chars

---
 .../regionModelFunctionObjectNew.C                     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
index 08e451fab2..11371b1f79 100644
--- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
+++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C
@@ -59,7 +59,15 @@ Foam::regionModels::regionModelFunctionObject::New
             << exit(FatalError);
     }
 
-    return autoPtr<regionModelFunctionObject>(cstrIter()(dict.subDict(modelName), owner));
+    return
+        autoPtr<regionModelFunctionObject>
+        (
+            cstrIter()
+            (
+                dict.subDict(modelName),
+                owner
+            )
+        );
 }
 
 

From 533f75b1d9416d80ab5cccf1bf64c141bf0a4599 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 17:26:12 +0000
Subject: [PATCH 79/81] ENH: Removed unused header #include file

---
 applications/solvers/combustion/fireFoam/fireFoam.C | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index 9f97843a96..021ed3c6f0 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -30,7 +30,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistribute.H"
 #include "fvCFD.H"
 #include "turbulenceModel.H"
 #include "basicReactingCloud.H"

From edd7242fbec40f91349a784149da203beacebaf7 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 17:52:08 +0000
Subject: [PATCH 80/81] ENH: Tutorial updates

---
 .../system/heater/changeDictionaryDict        | 31 -------------------
 .../system/leftSolid/changeDictionaryDict     | 30 ------------------
 .../system/rightSolid/changeDictionaryDict    | 30 ------------------
 .../system/heater/changeDictionaryDict        | 31 -------------------
 .../system/leftSolid/changeDictionaryDict     | 30 ------------------
 .../system/rightSolid/changeDictionaryDict    | 30 ------------------
 .../system/heater/changeDictionaryDict        | 31 -------------------
 .../system/leftSolid/changeDictionaryDict     | 30 ------------------
 .../system/rightSolid/changeDictionaryDict    | 30 ------------------
 .../system/heater/changeDictionaryDict        | 30 ------------------
 .../system/leftSolid/changeDictionaryDict     | 30 ------------------
 .../system/rightSolid/changeDictionaryDict    | 30 ------------------
 12 files changed, 363 deletions(-)

diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index 0f936407a4..c92d4511d0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -58,37 +58,6 @@ dictionaryReplacement
             }
         }
     }
-
-    pmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    char
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
-
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 4deb0d8e1b..8c75b7e4bd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -49,36 +49,6 @@ dictionaryReplacement
             }
         }
     }
-
-    pmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    char
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index c97bbad50f..9c9b20e5ed 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -49,36 +49,6 @@ dictionaryReplacement
             }
         }
     }
-
-    pmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    char
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index 1222482e8f..c92d4511d0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -58,37 +58,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
-
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index c70f5391f6..8c75b7e4bd 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -49,36 +49,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index 913adcf784..9c9b20e5ed 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -49,36 +49,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
index 1222482e8f..c92d4511d0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -58,37 +58,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
-
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index c70f5391f6..8c75b7e4bd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -49,36 +49,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index 913adcf784..9c9b20e5ed 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -49,36 +49,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
index 1a680f09a2..024770648c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
@@ -81,36 +81,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
-
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
index 59116a041a..b3ef4c896e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
@@ -72,36 +72,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
index 4f01822608..741624e3d1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@@ -72,36 +72,6 @@ dictionaryReplacement
             }
         }
     }
-
-    Ypmma
-    {
-        internalField   uniform 0.5;
-
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-
-    }
-
-    Ychar
-    {
-        internalField   uniform 0.5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0.5;
-            }
-        }
-    }
 }
 
 // ************************************************************************* //

From d460b3484b330db014f5f23f9875b31778660ab4 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 16 Nov 2012 18:26:19 +0000
Subject: [PATCH 81/81] ENH: Updated info/error messages

---
 .../GeometricField/GeometricBoundaryField.C   | 75 +++++++++++++------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 5117f8cb23..20d15fbe81 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -47,7 +47,7 @@ GeometricBoundaryField
         Info<< "GeometricField<Type, PatchField, GeoMesh>::"
                "GeometricBoundaryField::"
                "GeometricBoundaryField(const BoundaryMesh&, "
-               "const Field<Type>&, const word&)"
+               "const DimensionedField<Type>&, const word&)"
             << endl;
     }
 
@@ -84,8 +84,13 @@ GeometricBoundaryField
     {
         Info<< "GeometricField<Type, PatchField, GeoMesh>::"
                "GeometricBoundaryField::"
-               "GeometricBoundaryField(const BoundaryMesh&, "
-               "const Field<Type>&, const wordList&, const wordList&)"
+               "GeometricBoundaryField"
+               "("
+                    "const BoundaryMesh&, "
+                    "const DimensionedField<Type>&, "
+                    "const wordList&, "
+                    "const wordList&"
+                ")"
             << endl;
     }
 
@@ -99,8 +104,13 @@ GeometricBoundaryField
         (
             "GeometricField<Type, PatchField, GeoMesh>::"
             "GeometricBoundaryField::"
-            "GeometricBoundaryField(const BoundaryMesh&, "
-            "const Field<Type>&, const wordList&, const wordList&)"
+            "GeometricBoundaryField"
+            "("
+                "const BoundaryMesh&, "
+                "const DimensionedField<Type>&, "
+                "const wordList&, "
+                "const wordList&"
+            ")"
         )   << "Incorrect number of patch type specifications given" << nl
             << "    Number of patches in mesh = " << bmesh.size()
             << " number of patch type specifications = "
@@ -160,8 +170,12 @@ GeometricBoundaryField
     {
         Info<< "GeometricField<Type, PatchField, GeoMesh>::"
                "GeometricBoundaryField::"
-               "GeometricBoundaryField(const BoundaryMesh&, "
-               "const Field<Type>&, const PatchField<Type>List&)"
+               "GeometricBoundaryField"
+               "("
+                    "const BoundaryMesh&, "
+                    "const DimensionedField<Type, GeoMesh>&, "
+                    "const PtrLIst<PatchField<Type> >&"
+               ")"
             << endl;
     }
 
@@ -188,8 +202,12 @@ GeometricBoundaryField
     {
         Info<< "GeometricField<Type, PatchField, GeoMesh>::"
                "GeometricBoundaryField::"
-               "GeometricBoundaryField(const GeometricBoundaryField<Type, "
-               "PatchField, BoundaryMesh>&)"
+               "GeometricBoundaryField"
+               "("
+                   "const DimensionedField<Type, GeoMesh>&, "
+                   "const typename GeometricField<Type, PatchField, GeoMesh>::"
+                   "GeometricBoundaryField&"
+               ")"
             << endl;
     }
 
@@ -220,8 +238,11 @@ GeometricBoundaryField
     {
         Info<< "GeometricField<Type, PatchField, GeoMesh>::"
                "GeometricBoundaryField::"
-               "GeometricBoundaryField(const GeometricBoundaryField<Type, "
-               "PatchField, BoundaryMesh>&)"
+               "GeometricBoundaryField"
+               "("
+                   "const GeometricField<Type, PatchField, GeoMesh>::"
+                   "GeometricBoundaryField&"
+               ")"
             << endl;
     }
 }
@@ -244,7 +265,11 @@ GeometricBoundaryField
         Info<< "GeometricField<Type, PatchField, GeoMesh>::"
                "GeometricBoundaryField::"
                "GeometricBoundaryField"
-               "(const BoundaryMesh&, const Field<Type>&, const dictionary&)"
+               "("
+                   "const BoundaryMesh&, "
+                   "const DimensionedField<Type, GeoMesh>&, "
+                   "const dictionary&"
+                ")"
             << endl;
     }
 
@@ -326,12 +351,13 @@ GeometricBoundaryField
             {
                 FatalIOErrorIn
                 (
-                    "GeometricField<Type, PatchField, GeoMesh>::\n"
-                    "GeometricBoundaryField::GeometricBoundaryField\n"
-                    "(\n"
-                    "    const BoundaryMesh&,\n"
-                    "    const DimensionedField<Type, GeoMesh>&,\n"
-                    "    const dictionary&\n"
+                    "GeometricField<Type, PatchField, GeoMesh>::"
+                    "GeometricBoundaryField::"
+                    "GeometricBoundaryField"
+                    "("
+                        "const BoundaryMesh&, "
+                        "const DimensionedField<Type, GeoMesh>&, "
+                        "const dictionary&"
                     ")",
                     dict
                 )   << "Cannot find patchField entry for cyclic "
@@ -344,12 +370,13 @@ GeometricBoundaryField
             {
                 FatalIOErrorIn
                 (
-                    "GeometricField<Type, PatchField, GeoMesh>::\n"
-                    "GeometricBoundaryField::GeometricBoundaryField\n"
-                    "(\n"
-                    "    const BoundaryMesh&,\n"
-                    "    const DimensionedField<Type, GeoMesh>&,\n"
-                    "    const dictionary&\n"
+                    "GeometricField<Type, PatchField, GeoMesh>::"
+                    "GeometricBoundaryField::"
+                    "GeometricBoundaryField"
+                    "("
+                        "const BoundaryMesh&, "
+                        "const DimensionedField<Type, GeoMesh>&, "
+                        "const dictionary&"
                     ")",
                     dict
                 )   << "Cannot find patchField entry for "