From 51fc45400d843fa073ae518b404bf0b5f1531aef Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 14 Jan 2011 12:00:15 +0000
Subject: [PATCH 01/19] Bug fix: cyclic debug

---
 .../constraint/cyclic/cyclicPolyPatch.C       | 90 ++++++++++---------
 1 file changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index a9084a23f..21907baea 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -260,26 +260,30 @@ void Foam::cyclicPolyPatch::calcTransforms()
         // Dump transformed first half
         if (debug)
         {
-            fileName fvPath(boundaryMesh().mesh().time().path()/"VTK");
-
-            pointField transformPoints = half0.localPoints();
-
-            forAll (transformPoints, pointI)
+            if (reverseT_.size() > 0)
             {
-                 transformPoints[pointI] =
-                     Foam::transform(reverseT_[0], transformPoints[pointI]);
+                fileName fvPath(boundaryMesh().mesh().time().path()/"VTK");
+
+                pointField transformPoints = half0.localPoints();
+
+                forAll (transformPoints, pointI)
+                {
+                    transformPoints[pointI] =
+                        Foam::transform(reverseT_[0], transformPoints[pointI]);
+                }
+
+                standAlonePatch transformHalf0
+                (
+                    half0.localFaces(),
+                    transformPoints
+                );
+
+                fileName nm2(fvPath/name() + "_transform_half0_faces");
+                Pout<< "cyclicPolyPatch::calcTransforms : Writing "
+                    << "transform_half0 faces to file " << nm2 << endl;
+
+                transformHalf0.writeVTK(nm2, transformHalf0, transformPoints);
             }
-
-            standAlonePatch transformHalf0
-            (
-                half0.localFaces(),
-                transformPoints
-            );
-
-            fileName nm2(fvPath/name() + "_transform_half0_faces");
-            Pout<< "cyclicPolyPatch::calcTransforms : Writing transform_half0"
-                << " faces to file " << nm2 << endl;
-            transformHalf0.writeVTK(nm2, transformHalf0, transformPoints);
         }
 
         // Check for error in face matching
@@ -354,31 +358,33 @@ void Foam::cyclicPolyPatch::calcTransforms()
                 }
                 else
                 {
-                    maxDistance =
-                        Foam::max
-                        (
-                            maxDistance,
-                            mag
-                            (
-                                half0Ctrs[faceI]
-                              - half1Ctrs[faceI]
-                            )
-                        );
+                    // Disable checking for translational distance
+                    // HJ, 13/Jan/2011
+//                     maxDistance =
+//                         Foam::max
+//                         (
+//                             maxDistance,
+//                             mag
+//                             (
+//                                 half0Ctrs[faceI]
+//                               - half1Ctrs[faceI]
+//                             )
+//                         );
 
-                    maxRelDistance =
-                        Foam::max
-                        (
-                            maxRelDistance,
-                            mag
-                            (
-                                half0Ctrs[faceI]
-                              - half1Ctrs[faceI]
-                            )
-                           /(
-                               mag(half1Ctrs[faceI] - half0Ctrs[faceI])
-                             + SMALL
-                            )
-                        );
+//                     maxRelDistance =
+//                         Foam::max
+//                         (
+//                             maxRelDistance,
+//                             mag
+//                             (
+//                                 half0Ctrs[faceI]
+//                               - half1Ctrs[faceI]
+//                             )
+//                            /(
+//                                mag(half1Ctrs[faceI] - half0Ctrs[faceI])
+//                              + SMALL
+//                             )
+//                         );
                 }
             }
 

From 8d901495fb8c2a83b63cd0e5d4c65b1365c5cfd4 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 14 Jan 2011 12:00:55 +0000
Subject: [PATCH 02/19] Formatting

---
 .../directMappedPatchBase.C                   | 65 +++++++++++--------
 .../directMappedPatchBase.H                   |  2 +-
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
index a3595bab6..721ca9f8f 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
@@ -98,7 +98,9 @@ void Foam::directMappedPatchBase::collectSamples
     labelListList globalFaces(Pstream::nProcs());
 
     globalFc[Pstream::myProcNo()] = patch_.faceCentres();
-    globalSamples[Pstream::myProcNo()] = globalFc[Pstream::myProcNo()]+offsets_;
+    globalSamples[Pstream::myProcNo()] =
+        globalFc[Pstream::myProcNo()] + offsets_;
+
     globalFaces[Pstream::myProcNo()] = identity(patch_.size());
 
     // Distribute to all processors
@@ -115,11 +117,13 @@ void Foam::directMappedPatchBase::collectSamples
         globalSamples,
         accessOp<pointField>()
     );
+
     patchFaces = ListListOps::combine<labelList>
     (
         globalFaces,
         accessOp<labelList>()
     );
+
     patchFc = ListListOps::combine<pointField>
     (
         globalFc,
@@ -135,8 +139,9 @@ void Foam::directMappedPatchBase::collectSamples
             accessOp<labelList>()
         )
     );
+
     label sampleI = 0;
-    forAll(nPerProc, procI)
+    forAll (nPerProc, procI)
     {
         for (label i = 0; i < nPerProc[procI]; i++)
         {
@@ -173,13 +178,14 @@ void Foam::directMappedPatchBase::findSamples
                     "directMappedPatchBase::findSamples(const pointField&,"
                     " labelList&, labelList&, pointField&) const"
                 )   << "No need to supply a patch name when in "
-                    << sampleModeNames_[mode_] << " mode." << exit(FatalError);
+                    << sampleModeNames_[mode_] << " mode."
+                    << abort(FatalError);
             }
 
             // Octree based search engine
             meshSearch meshSearchEngine(mesh, false);
 
-            forAll(samples, sampleI)
+            forAll (samples, sampleI)
             {
                 const point& sample = samples[sampleI];
 
@@ -200,7 +206,7 @@ void Foam::directMappedPatchBase::findSamples
                         cc,
                         cellI
                     );
-                    nearest[sampleI].second().first() = magSqr(cc-sample);
+                    nearest[sampleI].second().first() = magSqr(cc - sample);
                     nearest[sampleI].second().second() = Pstream::myProcNo();
                 }
             }
@@ -215,7 +221,7 @@ void Foam::directMappedPatchBase::findSamples
 
             if (pp.empty())
             {
-                forAll(samples, sampleI)
+                forAll (samples, sampleI)
                 {
                     nearest[sampleI].second().first() = Foam::sqr(GREAT);
                     nearest[sampleI].second().second() = Pstream::myProcNo();
@@ -251,7 +257,7 @@ void Foam::directMappedPatchBase::findSamples
                     3.0             // duplicity
                 );
 
-                forAll(samples, sampleI)
+                forAll (samples, sampleI)
                 {
                     const point& sample = samples[sampleI];
 
@@ -290,13 +296,14 @@ void Foam::directMappedPatchBase::findSamples
                     "directMappedPatchBase::findSamples(const pointField&,"
                     " labelList&, labelList&, pointField&) const"
                 )   << "No need to supply a patch name when in "
-                    << sampleModeNames_[mode_] << " mode." << exit(FatalError);
+                    << sampleModeNames_[mode_] << " mode."
+                    << abort(FatalError);
             }
 
             // Octree based search engine
             meshSearch meshSearchEngine(mesh, false);
 
-            forAll(samples, sampleI)
+            forAll (samples, sampleI)
             {
                 const point& sample = samples[sampleI];
 
@@ -340,20 +347,21 @@ void Foam::directMappedPatchBase::findSamples
     {
         Info<< "directMappedPatchBase::findSamples on mesh " << sampleRegion_
             << " : " << endl;
-        forAll(nearest, sampleI)
+
+        forAll (nearest, sampleI)
         {
             label procI = nearest[sampleI].second().second();
             label localI = nearest[sampleI].first().index();
 
-            Info<< "    " << sampleI << " coord:"<< samples[sampleI]
-                << " found on processor:" << procI
-                << " in local cell/face:" << localI
-                << " with cc:" << nearest[sampleI].first().rawPoint() << endl;
+            Info<< "    " << sampleI << " coord: "<< samples[sampleI]
+                << " found on processor: " << procI
+                << " in local cell/face: " << localI
+                << " with cc: " << nearest[sampleI].first().rawPoint() << endl;
         }
     }
 
     // Check for samples not being found
-    forAll(nearest, sampleI)
+    forAll (nearest, sampleI)
     {
         if (!nearest[sampleI].first().hit())
         {
@@ -363,8 +371,8 @@ void Foam::directMappedPatchBase::findSamples
                 "(const pointField&, labelList&"
                 ", labelList&, pointField&)"
             )   << "Did not find sample " << samples[sampleI]
-                << " on any processor of region" << sampleRegion_
-                << exit(FatalError);
+                << " on any processor of region " << sampleRegion_
+                << abort(FatalError);
         }
     }
 
@@ -374,7 +382,7 @@ void Foam::directMappedPatchBase::findSamples
     sampleIndices.setSize(samples.size());
     sampleLocations.setSize(samples.size());
 
-    forAll(nearest, sampleI)
+    forAll (nearest, sampleI)
     {
         sampleProcs[sampleI] = nearest[sampleI].second().second();
         sampleIndices[sampleI] = nearest[sampleI].first().index();
@@ -388,7 +396,8 @@ void Foam::directMappedPatchBase::calcMapping() const
     if (mapPtr_.valid())
     {
         FatalErrorIn("directMappedPatchBase::calcMapping() const")
-            << "Mapping already calculated" << exit(FatalError);
+            << "Mapping already calculated"
+            << abort(FatalError);
     }
 
     if
@@ -415,7 +424,7 @@ void Foam::directMappedPatchBase::calcMapping() const
     }
 
 
-    // Get global list of all samples and the processor and face they come from.
+    // Get global list of all samples and the processor and face they come from
     pointField samples;
     labelList patchFaceProcs;
     labelList patchFaces;
@@ -435,7 +444,7 @@ void Foam::directMappedPatchBase::calcMapping() const
     // - cell/face sample is in (so source when mapping)
     //   sampleIndices, sampleProcs.
 
-    //forAll(samples, i)
+    //forAll (samples, i)
     //{
     //    Info<< i << " need data in region "
     //        << patch_.boundaryMesh().mesh().name()
@@ -464,7 +473,7 @@ void Foam::directMappedPatchBase::calcMapping() const
 
         label vertI = 0;
 
-        forAll(patchFc, i)
+        forAll (patchFc, i)
         {
             meshTools::writeOBJ(str, patchFc[i]);
             vertI++;
@@ -482,7 +491,7 @@ void Foam::directMappedPatchBase::calcMapping() const
     //    const scalarField magOffset(mag(sampleLocations - patchFc));
     //    const scalar avgOffset(average(magOffset));
     //
-    //    forAll(magOffset, sampleI)
+    //    forAll (magOffset, sampleI)
     //    {
     //        if
     //        (
@@ -518,7 +527,7 @@ void Foam::directMappedPatchBase::calcMapping() const
     labelListList& subMap = mapPtr_().subMap();
     labelListList& constructMap = mapPtr_().constructMap();
 
-    forAll(subMap, procI)
+    forAll (subMap, procI)
     {
         subMap[procI] = UIndirectList<label>
         (
@@ -547,11 +556,11 @@ void Foam::directMappedPatchBase::calcMapping() const
     {
         // Check that all elements get a value.
         PackedBoolList used(patch_.size());
-        forAll(constructMap, procI)
+        forAll (constructMap, procI)
         {
             const labelList& map = constructMap[procI];
 
-            forAll(map, i)
+            forAll (map, i)
             {
                 label faceI = map[i];
 
@@ -569,7 +578,7 @@ void Foam::directMappedPatchBase::calcMapping() const
                 }
             }
         }
-        forAll(used, faceI)
+        forAll (used, faceI)
         {
             if (used[faceI] == 0)
             {
@@ -734,7 +743,7 @@ const Foam::polyPatch& Foam::directMappedPatchBase::samplePolyPatch() const
             << "Cannot find patch " << samplePatch_
             << " in region " << sampleRegion_ << endl
             << "Valid patches are " << nbrMesh.boundaryMesh().names()
-            << exit(FatalError);
+            << abort(FatalError);
     }
 
     return nbrMesh.boundaryMesh()[patchI];
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
index 17f8feda1..07ba358be 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
@@ -30,7 +30,7 @@ Description
     centres and processors they're on.
 
 Note
-    Storage is not optimal. It temporary collects all (patch)face centres
+    Storage is not optimal. It temporary collects all (patch) face centres
     on all processors to keep the addressing calculation simple.
 
 SourceFiles

From 2704c298bcd1e9a49c447ca658da206e67ed48ca Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 17 Jan 2011 10:42:45 +0000
Subject: [PATCH 03/19] Harmonic interpolation for all variables

---
 .../schemes/harmonic/harmonic.C               | 10 +--
 .../schemes/harmonic/harmonic.H               | 74 ++++++++++++++-----
 2 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.C
index 16d36fdd6..364fbff66 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.C
@@ -34,15 +34,7 @@ Description
 
 namespace Foam
 {
-
-defineTypeNameAndDebug(harmonic, 0);
-
-surfaceInterpolationScheme<scalar>::addMeshFluxConstructorToTable<harmonic>
-    addharmonicScalarMeshFluxConstructorToTable_;
-
-surfaceInterpolationScheme<scalar>::addMeshConstructorToTable<harmonic>
-    addharmonicScalarMeshConstructorToTable_;
-
+    makeSurfaceInterpolationScheme(harmonic)
 }
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
index ba6e591f8..b7d2e5df5 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
@@ -42,7 +42,6 @@ SourceFiles
 #include "surfaceInterpolationScheme.H"
 #include "volFields.H"
 #include "surfaceFields.H"
-#include "reverseLinear.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,9 +52,10 @@ namespace Foam
                            Class harmonic Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class Type>
 class harmonic
 :
-    public surfaceInterpolationScheme<scalar>
+    public surfaceInterpolationScheme<Type>
 {
     // Private Member Functions
 
@@ -74,10 +74,10 @@ public:
         //- Construct from mesh
         harmonic(const fvMesh& mesh)
         :
-            surfaceInterpolationScheme<scalar>(mesh)
+            surfaceInterpolationScheme<Type>(mesh)
         {}
 
-        //- Construct from Istream. 
+        //- Construct from Istream
         //  The name of the flux field is read from the Istream and looked-up
         //  from the mesh objectRegistry
         harmonic
@@ -86,7 +86,7 @@ public:
             Istream& is
         )
         :
-            surfaceInterpolationScheme<scalar>(mesh)
+            surfaceInterpolationScheme<Type>(mesh)
         {}
 
         //- Construct from faceFlux and Istream
@@ -97,7 +97,7 @@ public:
             Istream& is
         )
         :
-            surfaceInterpolationScheme<scalar>(mesh)
+            surfaceInterpolationScheme<Type>(mesh)
         {}
 
 
@@ -106,26 +106,60 @@ public:
         //- Return the interpolation weighting factors
         virtual tmp<surfaceScalarField> weights
         (
-            const GeometricField<scalar, fvPatchField, volMesh>&
+            const GeometricField<Type, fvPatchField, volMesh>& phi
         ) const
         {
-            notImplemented
+            tmp<surfaceScalarField> tw
             (
-                "harmonic::weights"
-                "(const GeometricField<scalar, fvPatchField, volMesh>&)"
+                new surfaceScalarField
+                (
+                    IOobject
+                    (
+                        "harmonicWeightingFactors" + phi.name(),
+                        this->mesh().time().timeName(),
+                        this->mesh()
+                    ),
+                    this->mesh() ,
+                    dimless
+                )
             );
 
-            return tmp<surfaceScalarField>(NULL);
-        }
+            surfaceScalarField& w = tw();
 
-        //- Return the face-interpolate of the given cell field
-        virtual tmp<GeometricField<scalar, fvsPatchField, surfaceMesh> >
-        interpolate
-        (
-            const GeometricField<scalar, fvPatchField, volMesh>& vf
-        ) const
-        {
-            return 1.0/(reverseLinear<scalar>(vf.mesh()).interpolate(1.0/vf));
+            const unallocLabelList& owner = this->mesh().owner();
+            const unallocLabelList& neighbour = this->mesh().neighbour();
+
+            scalarField magPhi = mag(phi);
+
+            // Initialise weights to 0.5 for uniform field (den = 0)
+            scalarField& wIn = w.internalField();
+            wIn = 0.5;
+
+            // Calculate internal weights using field magnitude
+            scalar mOwn, mNei, den, mean;
+
+            forAll (owner, faceI)
+            {
+                mOwn = magPhi[owner[faceI]];
+                mNei = magPhi[neighbour[faceI]];
+
+                mean = 2*(mOwn*mNei)/(mOwn + mNei + SMALL);
+                den = mOwn - mNei;
+
+                if (mag(den) > SMALL)
+                {
+                    wIn[faceI] = (mean - mNei)/den;
+                }
+                else
+                {
+                    // Use 0.5 weights
+                }
+            }
+
+            // Boundary weights are 1
+            w.boundaryField() = 1;
+
+            return tw;
         }
 };
 

From e61cf650244aa607218c6269e4af0590b7534336 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 17 Jan 2011 11:52:09 +0000
Subject: [PATCH 04/19] Formatting

---
 .../buoyantSimpleRadiationFoam.C              | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index ece28f7b1..98f2c5ddb 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -41,13 +41,13 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "readGravitationalAcceleration.H"
-    #include "createFields.H"
-    #include "createRadiationModel.H"
-    #include "initContinuityErrs.H"
+#   include "setRootCase.H"
+#   include "createTime.H"
+#   include "createMesh.H"
+#   include "readGravitationalAcceleration.H"
+#   include "createFields.H"
+#   include "createRadiationModel.H"
+#   include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,17 +57,17 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        #include "readSIMPLEControls.H"
-        #include "initConvergenceCheck.H"
+#       include "readSIMPLEControls.H"
+#       include "initConvergenceCheck.H"
 
         p.storePrevIter();
         rho.storePrevIter();
 
         // Pressure-velocity SIMPLE corrector
         {
-            #include "UEqn.H"
-            #include "hEqn.H"
-            #include "pEqn.H"
+#           include "UEqn.H"
+#           include "hEqn.H"
+#           include "pEqn.H"
         }
 
         turbulence->correct();
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
 
-        #include "convergenceCheck.H"
+#       include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;

From a0bbd9d9d92b44c321c51e0f978f240dbac47439 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 17 Jan 2011 11:54:03 +0000
Subject: [PATCH 05/19] Formatting

---
 src/thermophysicalModels/radiation/radiationModel/P1/P1.C | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/radiation/radiationModel/P1/P1.C b/src/thermophysicalModels/radiation/radiationModel/P1/P1.C
index cec6eca56..0ff2685f5 100644
--- a/src/thermophysicalModels/radiation/radiationModel/P1/P1.C
+++ b/src/thermophysicalModels/radiation/radiationModel/P1/P1.C
@@ -191,12 +191,14 @@ Foam::radiation::P1::Ru() const
 {
     const DimensionedField<scalar, volMesh>& G =
         G_.dimensionedInternalField();
+
     const DimensionedField<scalar, volMesh> E =
         absorptionEmission_->ECont()().dimensionedInternalField();
+
     const DimensionedField<scalar, volMesh> a =
         absorptionEmission_->aCont()().dimensionedInternalField();
 
-    return  a*G - 4.0*E;
+    return a*G - 4.0*E;
 }
 
 

From 5461f5965133ef10322e28d3e26d040693b05224 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 18 Jan 2011 10:37:55 +0000
Subject: [PATCH 06/19] icoFsiFoam tutorial

---
 .../icoFsiFoam/flappingConsoleSmall/Allclean  |  17 +++
 .../icoFsiFoam/flappingConsoleSmall/Allrun    |  27 +++++
 .../icoFsiFoam/flappingConsoleSmall/fluid/0/U |  56 ++++++++++
 .../flappingConsoleSmall/fluid/0/motionU      |  63 +++++++++++
 .../icoFsiFoam/flappingConsoleSmall/fluid/0/p |  59 +++++++++++
 .../fluid/constant/couplingProperties         |  25 +++++
 .../fluid/constant/dynamicMeshDict            |  35 ++++++
 .../fluid/constant/polyMesh/blockMeshDict     | 100 ++++++++++++++++++
 .../fluid/constant/polyMesh/boundary          |  58 ++++++++++
 .../fluid/constant/transportProperties        |  24 +++++
 .../fluid/system/controlDict                  |  54 ++++++++++
 .../fluid/system/fvSchemes                    |  67 ++++++++++++
 .../fluid/system/fvSolution                   |  49 +++++++++
 .../fluid/system/sampleDict                   |  42 ++++++++
 .../fluid/system/tetFemSolution               |  32 ++++++
 .../icoFsiFoam/flappingConsoleSmall/solid/0/U |  49 +++++++++
 .../solid/constant/mechanicalProperties       |  28 +++++
 .../solid/constant/polyMesh/blockMeshDict     |  66 ++++++++++++
 .../solid/constant/polyMesh/boundary          |  40 +++++++
 .../solid/system/controlDict                  |  52 +++++++++
 .../solid/system/fvSchemes                    |  62 +++++++++++
 .../solid/system/fvSolution                   |  38 +++++++
 22 files changed, 1043 insertions(+)
 create mode 100755 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/Allclean
 create mode 100755 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/Allrun
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/U
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/motionU
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/p
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/couplingProperties
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/blockMeshDict
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/boundary
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/transportProperties
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/controlDict
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSchemes
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSolution
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/sampleDict
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/tetFemSolution
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/0/U
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/mechanicalProperties
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/polyMesh/blockMeshDict
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/polyMesh/boundary
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/controlDict
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/fvSchemes
 create mode 100644 tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/fvSolution

diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/Allclean b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/Allclean
new file mode 100755
index 000000000..84388e708
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/Allclean
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cases="fluid solid"
+
+for case in $cases
+do
+    cd $case
+    cleanCase $case
+    cd ..
+done
+
+cd fluid
+rm -f constant/solid system/solid 0/solid
+cd ..
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/Allrun b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/Allrun
new file mode 100755
index 000000000..f5d393a44
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/Allrun
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name from directory
+application=icoFsiFoam
+
+cd fluid
+runApplication blockMesh
+cd constant
+ln -s ../../solid/constant solid
+cd ..
+cd 0
+ln -s ../../solid/0 solid
+cd ..
+cd ..
+
+cd solid
+runApplication blockMesh
+cd ..
+pwd
+
+makeFsiCaseLinks fluid solid
+cd fluid
+runApplication $application
+cd ..
+makeFsiResultsLinks fluid solid
\ No newline at end of file
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/U b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/U
new file mode 100644
index 000000000..812914109
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/U
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version 2.0;
+    format ascii;
+    class volVectorField;
+    object U;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    consoleFluid
+    {
+        type            movingWallVelocity;
+        value           uniform (0 0 0);
+    }
+    topWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    bottomWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    outlet
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform (4 0 0);
+    }
+    frontAndBackPlanes
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/motionU b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/motionU
new file mode 100644
index 000000000..f17ec265e
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/motionU
@@ -0,0 +1,63 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           tetPointVectorField;
+    object          motionU;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+
+consoleFluid
+{
+    type fixedValue;    
+    value uniform (0 0 0);
+}
+
+topWall
+{
+    type slip;    
+}
+
+bottomWall
+{
+    type slip;    
+}
+
+outlet
+{
+    type fixedValue;    
+    value uniform (0 0 0);
+}
+
+inlet
+{
+    type fixedValue;    
+    value uniform (0 0 0);
+}
+
+frontAndBackPlanes
+{
+    type empty;
+}
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/p b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/p
new file mode 100644
index 000000000..2b6cc045c
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/0/p
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version 2.0;
+    format ascii;
+    class volScalarField;
+    object p;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    consoleFluid
+    {
+        type            zeroGradient;
+    }
+    topWall
+    {
+        type            zeroGradient;
+    }
+    bottomWall
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            totalPressure;
+        p0              uniform 0;
+        U               U;
+        phi             phi;
+        rho             none;
+        psi             none;
+        gamma           1;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            zeroGradient;
+    }
+    frontAndBackPlanes
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/couplingProperties b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/couplingProperties
new file mode 100644
index 000000000..7175148ab
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/couplingProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          couplingProperties;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solidPatch      consoleSolid;
+
+fluidPatch      consoleFluid;
+
+movingRegion    region0;
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict
new file mode 100644
index 000000000..e7f6bcd45
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict
@@ -0,0 +1,35 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          motionProperties;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh dynamicMotionSolverFvMesh;
+
+twoDMotion      yes;
+
+solver          laplaceFaceDecomposition;
+
+diffusivity     quadratic;
+
+frozenDiffusion on;
+
+distancePatches 
+(
+    consoleFluid
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/blockMeshDict
new file mode 100644
index 000000000..c3a05af63
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/blockMeshDict
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          blockMeshDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+convertToMeters 1;
+
+vertices
+(
+    (-2   0    -0.1)
+    (0    0    -0.1)
+    (0.05 0    -0.1)
+    (4    0    -0.1)
+    (-2   0.6  -0.1)
+    (0    0.6  -0.1)
+    (0.05 0.6  -0.1)
+    (4    0.6  -0.1)
+    (-2   1    -0.1)
+    (0    1    -0.1)
+    (0.05 1    -0.1)
+    (4    1    -0.1)
+
+    (-2   0     0.1)
+    (0    0     0.1)
+    (0.05 0     0.1)
+    (4    0     0.1)
+    (-2   0.6   0.1)
+    (0    0.6   0.1)
+    (0.05 0.6   0.1)
+    (4    0.6   0.1)
+    (-2   1     0.1)
+    (0    1     0.1)
+    (0.05 1     0.1)
+    (4    1     0.1)
+);
+
+blocks
+(
+    hex (0 1 5 4 12 13 17 16) (40 20 1) simpleGrading (0.1 0.2 1)
+    hex (2 3 7 6 14 15 19 18) (80 20 1) simpleGrading (10 0.2 1)
+    hex (4 5 9 8 16 17 21 20) (40 20 1) simpleGrading (0.1 2 1)
+    hex (5 6 10 9 17 18 22 21) (5 20 1) simpleGrading (1 2 1)
+    hex (6 7 11 10 18 19 23 22) (80 20 1) simpleGrading (10 2 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    patch consoleFluid
+    (
+        (1 13 17 5)
+        (5 17 18 6)
+        (6 18 14 2)
+    )
+    wall topWall
+    (
+        (8 20 21 9)
+        (9 21 22 10)
+        (10 22 23 11)
+    )
+    wall bottomWall
+    (
+        (0 1 13 12)
+        (2 3 15 14)
+    )
+    patch outlet
+    (
+        (3 7 19 15)
+        (7 11 23 19)
+    )
+    wall inlet
+    (
+        (0 12 16 4)
+        (4 16 20 8)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/boundary b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/boundary
new file mode 100644
index 000000000..1b133b412
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/boundary
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+6
+(
+    consoleFluid
+    {
+        type            patch;
+        nFaces          45;
+        startFace       9615;
+    }
+    topWall
+    {
+        type            wall;
+        nFaces          125;
+        startFace       9660;
+    }
+    bottomWall
+    {
+        type            wall;
+        nFaces          120;
+        startFace       9785;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          40;
+        startFace       9905;
+    }
+    inlet
+    {
+        type            wall;
+        nFaces          40;
+        startFace       9945;
+    }
+    defaultFaces
+    {
+        type            empty;
+        nFaces          9800;
+        startFace       9985;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/transportProperties b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/transportProperties
new file mode 100644
index 000000000..d09afada0
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/transportProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          transportProperties;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu              nu [0 2 -1 0 0 0 0] 0.001;
+
+rho             rho [1 -3 0 0 0 0 0] 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/controlDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/controlDict
new file mode 100644
index 000000000..3070ac74e
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/controlDict
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          controlDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application icoFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         50;
+
+deltaT          0.0003;
+
+writeControl    timeStep;
+
+writeInterval   20;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression compressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep    no;
+
+maxCo             0.5;
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSchemes b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSchemes
new file mode 100644
index 000000000..1b9403487
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSchemes
@@ -0,0 +1,67 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          fvSchemes;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+d2dt2Schemes
+{
+    d2dt2(U)        Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phiNet,U)      Gauss limitedLinearV 1;
+    div(phi,U)      Gauss limitedLinearV 1;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian(nu,U) Gauss linear corrected;
+    laplacian((1|A(U)),p) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+    interpolate(HbyA) linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSolution b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSolution
new file mode 100644
index 000000000..b5afb24cb
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/fvSolution
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          fvSolution;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver           CG;
+        preconditioner   Cholesky;
+
+        tolerance        1e-06;
+        relTol           0;
+    }
+
+    U
+    {
+        solver           BiCGStab;
+        preconditioner   Cholesky;
+
+        tolerance        1e-05;
+        relTol           0;
+    }
+}
+
+PISO
+{
+    nCorrectors     4;
+    nNonOrthogonalCorrectors 1;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/sampleDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/sampleDict
new file mode 100644
index 000000000..9cfa18c98
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/sampleDict
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          sampleDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+interpolationScheme cellPoint;
+
+writeFormat     raw;
+
+sampleSets      
+(
+    uniform 
+    {
+        name            cutLine;
+        axis            distance;
+        start           (0 0.05 0.0005);
+        end             (0.1 0.05 0.0005);
+        nPoints         100;
+    }
+);
+
+fields
+(
+    p
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/tetFemSolution b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/tetFemSolution
new file mode 100644
index 000000000..1549afc0c
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/tetFemSolution
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          tetFemSolution;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    motionU
+    {
+        solver           CG;
+        preconditioner   Cholesky;
+
+        tolerance        1e-06;
+        relTol           0;
+    };
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/0/U b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/0/U
new file mode 100644
index 000000000..bebba6840
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/0/U
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           volVectorField;
+    object          U;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions      [0 1 0 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+
+consoleSolid
+{
+    type            tractionDisplacement;
+    traction        uniform (0 0 0);
+    pressure        uniform 0;
+    value           uniform (0 0 0);
+}
+
+consoleFixed
+{
+    type    fixedValue;
+    value uniform (0 0 0);
+}
+
+frontAndBackPlanes
+{
+    type empty;
+}
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/mechanicalProperties b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/mechanicalProperties
new file mode 100644
index 000000000..68cb51fff
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/mechanicalProperties
@@ -0,0 +1,28 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          mechanicalProperties;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+rho             rho [1 -3 0 0 0 0 0] 1000;
+
+nu              nu [0 0 0 0 0 0 0] 0.3;
+
+E               E [1 -1 -2 0 0 0 0] 2e+6;
+
+planeStress     yes;
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/polyMesh/blockMeshDict
new file mode 100644
index 000000000..feae4394d
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/polyMesh/blockMeshDict
@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          blockMeshDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (0 0 -0.1)
+    (0.05 0 -0.1)
+    (0.05 0.6 -0.1)
+    (0 0.6 -0.1)
+    (0 0 0.1)
+    (0.05 0 0.1)
+    (0.05 0.6 0.1)
+    (0 0.6 0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (10 45 1) simpleGrading (1 1 1)
+);
+
+edges           
+(
+);
+
+patches
+(
+    patch consoleSolid
+    (
+        (3 7 6 2)
+        (0 4 7 3)
+        (2 6 5 1)
+    )
+    patch consoleFixed
+    (
+        (1 5 4 0)
+    )
+    empty frontAndBackPlanes
+    (
+        (0 3 2 1)
+        (4 5 6 7)
+    )
+);
+
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/polyMesh/boundary b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/polyMesh/boundary
new file mode 100644
index 000000000..0253e420d
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/constant/polyMesh/boundary
@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
+|  \\    /   O peration     | Version:  1.6-ext                               |
+|   \\  /    A nd           | Web:      www.extend-project.de                 |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+3
+(
+    consoleSolid
+    {
+        type            patch;
+        nFaces          100;
+        startFace       845;
+    }
+    consoleFixed
+    {
+        type            patch;
+        nFaces          10;
+        startFace       945;
+    }
+    frontAndBackPlanes
+    {
+        type            empty;
+        nFaces          900;
+        startFace       955;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/controlDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/controlDict
new file mode 100644
index 000000000..318dc5292
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/controlDict
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          controlDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         50;
+
+deltaT          0.0003;
+
+writeControl    timeStep;
+
+writeInterval   20;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression compressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep    no;
+
+maxCo             0.5;
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/fvSchemes b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/fvSchemes
new file mode 100644
index 000000000..3e4a149ae
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/fvSchemes
@@ -0,0 +1,62 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          fvSchemes;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+d2dt2Schemes
+{
+    default     Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(U)         Gauss linear;
+    grad(T)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(sigma)      Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian(DU,U) Gauss linear corrected;
+    laplacian(DT,T) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    U;
+    T;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/fvSolution b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/fvSolution
new file mode 100644
index 000000000..b36becd8f
--- /dev/null
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/solid/system/fvSolution
@@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.3                                   |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          fvSolution;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    U
+    {
+        solver           CG;
+        preconditioner   Cholesky;
+
+        tolerance        1e-06;
+        relTol           0;
+    }
+}
+
+stressedFoam
+{
+    nCorrectors     50;
+    U               1e-07;
+}
+
+
+// ************************************************************************* //

From f68dee507a9afe797d9b2eba7e4a8b8ee1de74f5 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:47:45 +0000
Subject: [PATCH 07/19] Removed unused functions

---
 .../constraint/regionCouple/regionCouplePolyPatch.H      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.H
index a4600f373..562acd41f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.H
@@ -239,15 +239,6 @@ public:
         //- Attach regions
         void detach() const;
 
-        //- Is this the master side?
-        bool master() const;
-
-        //- Is this the slave side?
-        bool slave() const
-        {
-            return !master();
-        }
-
         //- Return shadow patch
         const regionCouplePolyPatch& shadow() const;
 

From b59b86bd1e82417b632681dffbe7eb753a1c9723 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:48:55 +0000
Subject: [PATCH 08/19] Updates on behaviour of limiters.  Oliver Borm.

---
 .../limitedSchemes/LimitedScheme/NVDTVD.H                | 9 +++++++--
 .../limitedSchemes/LimitedScheme/NVDVTVDV.H              | 9 +++++++--
 .../surfaceInterpolation/limitedSchemes/upwind/upwind.H  | 2 +-
 .../limitedSchemes/vanAlbada/vanAlbada.H                 | 6 +++++-
 .../surfaceInterpolation/schemes/linear/linear.H         | 2 +-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDTVD.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDTVD.H
index b622447d0..af5fd4738 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDTVD.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDTVD.H
@@ -113,9 +113,14 @@ public:
             }
 
             // Stabilise for division
-            gradf = stabilise(gradf, VSMALL);
+            // Changed to SMALL to prevent FPE.  OB, 14/Jan/2011
+            gradf = stabilise(gradf, SMALL);
 
-            return 2*(gradcf/gradf) - 1;
+            // New formulation.  Oliver Borm and Aleks Jemcov
+            // HJ, 13/Jan/2011
+            return max(2*(gradcf/gradf) - 1, 0);
+
+//             return 2*(gradcf/gradf) - 1;
         }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDVTVDV.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDVTVDV.H
index e052b9019..287788a2c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDVTVDV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/NVDVTVDV.H
@@ -114,9 +114,14 @@ public:
             }
 
             // Stabilise for division
-            gradf = stabilise(gradf, VSMALL);
+            //Changed to SMALL to prevent FPE.  OB, 14/Jan/2011
+            gradf = stabilise(gradf, SMALL);
 
-            return 2*(gradcf/gradf) - 1;
+            // New formulation.  Oliver Borm and Aleks Jemcov
+            // HJ, 13/Jan/2011
+            return max(2*(gradcf/gradf) - 1, 0);
+
+//             return 2*(gradcf/gradf) - 1;
         }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
index 1c4ea7048..7cb10c0fd 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/upwind/upwind.H
@@ -121,7 +121,7 @@ public:
                         this->mesh()
                     ),
                     this->mesh(),
-                    dimensionedScalar("upwindLimiter", dimless, 0.0)
+                    dimless
                 )
             );
         }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanAlbada/vanAlbada.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanAlbada/vanAlbada.H
index e3d7556f1..14524c01c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanAlbada/vanAlbada.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanAlbada/vanAlbada.H
@@ -78,7 +78,11 @@ public:
             faceFlux, phiP, phiN, gradcP, gradcN, d
         );
 
-        return r*(r + 1)/(sqr(r) + 1);
+        // New formulation.  Oliver Borm and Aleks Jemcov
+        // HJ, 13/Jan/2011
+        return (r + 1)/(r + 1/stabilise(r, VSMALL));
+
+//         return r*(r + 1)/(sqr(r) + 1);
     }
 };
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
index e458af55b..4ffabe77f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linear/linear.H
@@ -120,7 +120,7 @@ template<class Type>
 tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
 linearInterpolate(const tmp<GeometricField<Type, fvPatchField, volMesh> >& tvf)
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tinterp = 
+    tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tinterp =
         linearInterpolate(tvf());
     tvf.clear();
     return tinterp;

From a0162ece8a3005fd1b5ac1cd1a81b06095183c8d Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:49:41 +0000
Subject: [PATCH 09/19] Hack clean-up: Vector<bool>

---
 .../Fields/symmTensorField/symmTensorField.C  | 26 ++++++++---------
 .../fields/Fields/tensorField/tensorField.C   | 28 ++++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index bfd09b417..f2e7beff4 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -61,45 +61,45 @@ void inv(Field<symmTensor>& tf, const UList<symmTensor>& tf1)
     }
 
     scalar scale = magSqr(tf1[0]);
-    Vector<bool> removeCmpts
-    (
-        magSqr(tf1[0].xx())/scale < SMALL,
-        magSqr(tf1[0].yy())/scale < SMALL,
-        magSqr(tf1[0].zz())/scale < SMALL
-    );
 
-    if (removeCmpts.x() || removeCmpts.y() || removeCmpts.z())
+    // Fixed terrible hack.  HJ, 20/Jan/2011
+    boolList removeCmpts(3);
+    removeCmpts[0] =  magSqr(tf1[0].xx())/scale < SMALL;
+    removeCmpts[1] =  magSqr(tf1[0].yy())/scale < SMALL;
+    removeCmpts[2] =  magSqr(tf1[0].zz())/scale < SMALL;
+
+    if (removeCmpts[0] || removeCmpts[1] || removeCmpts[2])
     {
         symmTensorField tf1Plus(tf1);
 
-        if (removeCmpts.x())
+        if (removeCmpts[0])
         {
             tf1Plus += symmTensor(1,0,0,0,0,0);
         }
 
-        if (removeCmpts.y())
+        if (removeCmpts[1])
         {
             tf1Plus += symmTensor(0,0,0,1,0,0);
         }
 
-        if (removeCmpts.z())
+        if (removeCmpts[2])
         {
             tf1Plus += symmTensor(0,0,0,0,0,1);
         }
 
         TFOR_ALL_F_OP_FUNC_F(symmTensor, tf, =, inv, symmTensor, tf1Plus)
 
-        if (removeCmpts.x())
+        if (removeCmpts[0])
         {
             tf -= symmTensor(1,0,0,0,0,0);
         }
 
-        if (removeCmpts.y())
+        if (removeCmpts[1])
         {
             tf -= symmTensor(0,0,0,1,0,0);
         }
 
-        if (removeCmpts.z())
+        if (removeCmpts[2])
         {
             tf -= symmTensor(0,0,0,0,0,1);
         }
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index 5b3a0c10b..2878746b3 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -26,6 +26,7 @@ License
 
 #include "tensorField.H"
 #include "transformField.H"
+#include "boolList.H"
 
 #define TEMPLATE
 #include "FieldFunctionsM.C"
@@ -61,45 +62,46 @@ void inv(Field<tensor>& tf, const UList<tensor>& tf1)
     }
 
     scalar scale = magSqr(tf1[0]);
-    Vector<bool> removeCmpts
-    (
-        magSqr(tf1[0].xx())/scale < SMALL,
-        magSqr(tf1[0].yy())/scale < SMALL,
-        magSqr(tf1[0].zz())/scale < SMALL
-    );
 
-    if (removeCmpts.x() || removeCmpts.y() || removeCmpts.z())
+    // Fixed terrible hack.  HJ, 20/Jan/2011
+    boolList removeCmpts(3);
+    removeCmpts[0] = magSqr(tf1[0].xx())/scale < SMALL;
+    removeCmpts[1] = magSqr(tf1[0].yy())/scale < SMALL;
+    removeCmpts[2] = magSqr(tf1[0].zz())/scale < SMALL;
+
+
+    if (removeCmpts[0] || removeCmpts[1] || removeCmpts[2])
     {
         tensorField tf1Plus(tf1);
 
-        if (removeCmpts.x())
+        if (removeCmpts[0])
         {
             tf1Plus += tensor(1,0,0,0,0,0,0,0,0);
         }
 
-        if (removeCmpts.y())
+        if (removeCmpts[1])
         {
             tf1Plus += tensor(0,0,0,0,1,0,0,0,0);
         }
 
-        if (removeCmpts.z())
+        if (removeCmpts[2])
         {
             tf1Plus += tensor(0,0,0,0,0,0,0,0,1);
         }
 
         TFOR_ALL_F_OP_FUNC_F(tensor, tf, =, inv, tensor, tf1Plus)
 
-        if (removeCmpts.x())
+        if (removeCmpts[0])
         {
             tf -= tensor(1,0,0,0,0,0,0,0,0);
         }
 
-        if (removeCmpts.y())
+        if (removeCmpts[1])
         {
             tf -= tensor(0,0,0,0,1,0,0,0,0);
         }
 
-        if (removeCmpts.z())
+        if (removeCmpts[2])
         {
             tf -= tensor(0,0,0,0,0,0,0,0,1);
         }

From 2d71d2f308b696d621615482068f9b40c72e70d0 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:51:01 +0000
Subject: [PATCH 10/19] Face zone issues, attach/detach

---
 .../attachDetach/attachInterface.C            | 10 ++++----
 .../attachDetach/detachInterface.C            | 25 ++++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachInterface.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachInterface.C
index c2e6073ac..2a0a75963 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachInterface.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachInterface.C
@@ -109,7 +109,7 @@ void Foam::attachDetach::attachInterface
                 polyModifyFace
                 (
                     faces[masterPatchStart + faceI], // modified face
-                    masterPatchStart + faceI,    // label of face being modified
+                    masterPatchStart + faceI,   // label of face being modified
                     masterFaceCells[faceI],          // owner
                     slaveFaceCells[faceI],           // neighbour
                     false,                           // face flip
@@ -128,7 +128,7 @@ void Foam::attachDetach::attachInterface
                 polyModifyFace
                 (
                     faces[masterPatchStart + faceI].reverseFace(), // mod face
-                    masterPatchStart + faceI,    // label of face being modified
+                    masterPatchStart + faceI,   // label of face being modified
                     slaveFaceCells[faceI],        // owner
                     masterFaceCells[faceI],       // neighbour
                     true,                         // face flip
@@ -204,7 +204,7 @@ void Foam::attachDetach::attachInterface
                     mesh.faceZones()[modifiedFaceZone].whichFace(curFaceID)
                 ];
         }
-            
+
         // Modify the face
         label curNeighbour = -1;
 
@@ -222,7 +222,7 @@ void Foam::attachDetach::attachInterface
                 own[curFaceID],         // owner
                 curNeighbour,           // neighbour
                 false,                  // face flip
-                mesh.boundaryMesh().whichPatch(curFaceID),// patch for face
+                mesh.boundaryMesh().whichPatch(curFaceID), // patch for face
                 false,                  // remove from zone
                 modifiedFaceZone,       // zone for face
                 modifiedFaceZoneFlip    // face flip in zone
@@ -251,7 +251,7 @@ void Foam::attachDetach::modifyMotionPoints
 
     if (debug)
     {
-        Pout<< "void attachDetach::modifyMotionPoints(" 
+        Pout<< "void attachDetach::modifyMotionPoints("
             << "pointField& motionPoints) const "
             << " for object " << name() << " : "
             << "Adjusting motion points." << endl;
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/detachInterface.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/detachInterface.C
index e663508fc..ff60278f2 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/detachInterface.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/detachInterface.C
@@ -42,9 +42,9 @@ void Foam::attachDetach::detachInterface
     // 2. Modify all faces of the master zone, by putting them into the master
     //    patch (look for orientation) and their renumbered mirror images
     //    into the slave patch
-    // 3. Create a point renumbering list, giving a new point index for original
-    //    points in the face patch
-    // 4. Grab all faces in cells on the master side and renumber them 
+    // 3. Create a point renumbering list, giving a new point index for
+    //    original points in the face patch
+    // 4. Grab all faces in cells on the master side and renumber them
     //    using the point renumbering list.  Exclude the ones that belong to
     //    the master face zone
     //
@@ -70,7 +70,9 @@ void Foam::attachDetach::detachInterface
     const polyMesh& mesh = topoChanger().mesh();
     const faceZoneMesh& zoneMesh = mesh.faceZones();
 
-    const primitiveFacePatch& masterFaceLayer = zoneMesh[faceZoneID_.index()]();
+    const primitiveFacePatch& masterFaceLayer =
+        zoneMesh[faceZoneID_.index()]();
+
     const pointField& points = mesh.points();
     const labelListList& meshEdgeFaces = mesh.edgeFaces();
 
@@ -88,7 +90,12 @@ void Foam::attachDetach::detachInterface
     // with their original labels to stop duplication
     label nIntEdges = masterFaceLayer.nInternalEdges();
 
-    for (label curEdgeID = nIntEdges; curEdgeID < meshEdges.size(); curEdgeID++)
+    for
+    (
+        label curEdgeID = nIntEdges;
+        curEdgeID < meshEdges.size();
+        curEdgeID++
+    )
     {
         const labelList& curFaces = meshEdgeFaces[meshEdges[curEdgeID]];
 
@@ -389,7 +396,7 @@ void Foam::attachDetach::detachInterface
                         false,                      // flip flux
                         -1,                         // patch for face
                         false,                      // remove from zone
-                        -1,                         // zone for face
+                        zoneMesh.whichZone(curFaceID), // zone for face
                         false                       // face zone flip
                     )
                 );
@@ -408,12 +415,12 @@ void Foam::attachDetach::detachInterface
                         false,                       // flip flux
                         mesh.boundaryMesh().whichPatch(curFaceID), // patch
                         false,                        // remove from zone
-                        -1,                           // zone for face
+                        zoneMesh.whichZone(curFaceID),  // zone for face
                         false                         // face zone flip
                     )
-                );   
+                );
 // Pout << "modifying stick-out face. Boundary Old face: " << oldFace << " new face: " << newFace << " own: " << own[curFaceID] << " patch: " << mesh.boundaryMesh().whichPatch(curFaceID) << endl;
-            }                                                  
+            }
         }
     }
 

From 5d53ccb002bda953be0f3887ca46b5924a71105c Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:51:33 +0000
Subject: [PATCH 11/19] Experimental combine-reduce

---
 .../derived/global/GlobalPointPatchField.C    | 109 ++++++++++++++----
 1 file changed, 87 insertions(+), 22 deletions(-)

diff --git a/src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C b/src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C
index 0f4dac775..05dcfccfc 100644
--- a/src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C
+++ b/src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C
@@ -30,6 +30,8 @@ License
 #include "constraints.H"
 #include "PstreamCombineReduceOps.H"
 
+#define OLD_COMBINE_REDUCE 1
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -65,31 +67,59 @@ tmp<Field<Type2> > GlobalPointPatchField
     // Create the global list and insert local values
     if (globalPointPatch_.globalPointSize() > 0)
     {
+        // Get addressing
+        const labelList& sharedPointAddr =
+            globalPointPatch_.sharedPointAddr();
+
+        const Field<Type2>& pField = tpField();
+
+        // Prepare result
+        tmp<Field<Type2> > tlpf(new Field<Type2>(sharedPointAddr.size()));
+        Field<Type2>& lpf = tlpf();
+
+#       ifdef OLD_COMBINE_REDUCE
+
         Field<Type2> gpf
         (
             globalPointPatch_.globalPointSize(),
             pTraits<Type2>::zero
         );
 
-        const labelList& addr = globalPointPatch_.sharedPointAddr();
-        const Field<Type2>& pField = tpField();
-
-        forAll (addr, i)
+        forAll (sharedPointAddr, i)
         {
-            gpf[addr[i]] = pField[i];
+            gpf[sharedPointAddr[i]] = pField[i];
         }
 
         combineReduce(gpf, plusEqOp<Field<Type2> >());
 
         // Extract local data
-        tmp<Field<Type2> > tlpf(new Field<Type2>(addr.size()));
-        Field<Type2>& lpf = tlpf();
-
-        forAll (addr, i)
+        forAll (sharedPointAddr, i)
         {
-            lpf[i] = gpf[addr[i]];
+            lpf[i] = gpf[sharedPointAddr[i]];
         }
 
+#       else
+
+        // Pack data into a map
+        Map<Type2> dataMap;
+
+        forAll (sharedPointAddr, i)
+        {
+            dataMap.insert(sharedPointAddr[i], pField[i]);
+        }
+
+        // Communicate map
+        Pstream::mapCombineGather(dataMap, plusEqOp<Type2>());
+        Pstream::mapCombineScatter(dataMap);
+
+        // Extract local data
+        forAll (sharedPointAddr, i)
+        {
+            lpf[i] = dataMap[sharedPointAddr[i]];
+        }
+
+#       endif
+
         return tlpf;
     }
     else
@@ -126,6 +156,19 @@ tmp<Field<Type2> > GlobalPointPatchField
 {
     if (globalPointPatch_.globalEdgeSize() > 0)
     {
+        // Bug fix: use map-based communication.  HJ, 18/Nov/2010
+
+        const labelList& sharedEdgeAddr =
+            globalPointPatch_.sharedEdgeAddr();
+
+        const Field<Type2>& eField = teField();
+
+        // Prepare result
+        tmp<Field<Type2> > tlef(new Field<Type2>(sharedEdgeAddr.size()));
+        Field<Type2>& lef = tlef();
+
+#       ifdef OLD_COMBINE_REDUCE
+
         // Create the global list and insert local values
         Field<Type2> gef
         (
@@ -133,25 +176,41 @@ tmp<Field<Type2> > GlobalPointPatchField
             pTraits<Type2>::zero
         );
 
-        const labelList& addr = globalPointPatch_.sharedEdgeAddr();
-        const Field<Type2>& eField = teField();
-
-        forAll (addr, i)
+        forAll (sharedEdgeAddr, i)
         {
-            gef[addr[i]] = eField[i];
+            gef[sharedEdgeAddr[i]] = eField[i];
         }
 
         combineReduce(gef, plusEqOp<Field<Type2> >());
 
         // Extract local data
-        tmp<Field<Type2> > tlef(new Field<Type2>(addr.size()));
-        Field<Type2>& lef = tlef();
-
-        forAll (addr, i)
+        forAll (sharedEdgeAddr, i)
         {
-            lef[i] = gef[addr[i]];
+            lef[i] = gef[sharedEdgeAddr[i]];
         }
 
+#       else
+
+        // Pack data into a map
+        Map<Type2> dataMap;
+
+        forAll (sharedEdgeAddr, i)
+        {
+            dataMap.insert(sharedEdgeAddr[i], eField[i]);
+        }
+
+        // Communicate map
+        Pstream::mapCombineGather(dataMap, plusEqOp<Type2>());
+        Pstream::mapCombineScatter(dataMap);
+
+        // Extract local data
+        forAll (sharedEdgeAddr, i)
+        {
+            lef[i] = dataMap[sharedEdgeAddr[i]];
+        }
+
+#       endif
+
         return tlef;
     }
     else
@@ -189,6 +248,7 @@ void GlobalPointPatchField
     // Set the values from the global sum
     tmp<Field<Type2> > trpf =
         reduceExtractPoint<Type2>(patchInternalField(pField));
+
     Field<Type2>& rpf = trpf();
 
     // Get addressing
@@ -526,6 +586,8 @@ void GlobalPointPatchField
             }
 
             // Communicate map
+            // Note: Cannot use reduceExtract, because it uses plusEqOp
+            // HJ, 14/Jan/2011
             Pstream::mapCombineGather(dataMap, eqOp<Type>());
             Pstream::mapCombineScatter(dataMap);
 
@@ -1063,7 +1125,8 @@ void GlobalPointPatchField
         {
             // Owner side
             localMult[doubleCutOwner[edgeI]] +=
-                cutMask[coeffI]*coeffs[coeffI]*psiInternal[U[doubleCut[edgeI]]];
+                cutMask[coeffI]*coeffs[coeffI]*
+                psiInternal[U[doubleCut[edgeI]]];
 
             sumOffDiag[doubleCutOwner[edgeI]] +=
                 cutMask[coeffI]*coeffs[coeffI];
@@ -1072,7 +1135,8 @@ void GlobalPointPatchField
 
             // Neighbour side
             localMult[doubleCutNeighbour[edgeI]] +=
-                cutMask[coeffI]*coeffs[coeffI]*psiInternal[L[doubleCut[edgeI]]];
+                cutMask[coeffI]*coeffs[coeffI]*
+                psiInternal[L[doubleCut[edgeI]]];
 
             sumOffDiag[doubleCutNeighbour[edgeI]] +=
                 cutMask[coeffI]*coeffs[coeffI];
@@ -1085,6 +1149,7 @@ void GlobalPointPatchField
 
     tmp<Field<scalar> > trpf =
         reduceExtractPoint<scalar>(localMult);
+
     Field<scalar>& rpf = trpf();
 
     // Get addressing

From 5f666b17bedc64584b907c99b1bf594ead89b639 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:51:59 +0000
Subject: [PATCH 12/19] Formatting

---
 src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
index 9e6418dd5..5b6a23728 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
@@ -99,7 +99,7 @@ Foam::label Foam::cell::opposingFaceLabel
                 {
                     // There has already been an opposite face.
                     // Non-prismatic cell
-                    Info<< "Multiple faces not sharing vertex: " 
+                    Info<< "Multiple faces not sharing vertex: "
                         << oppositeFaceLabel << " and "
                         << curFaceLabels[faceI] << endl;
                     return -1;

From 4e18893e1ae2a80ab894df8b7897742c87a6c128 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:53:04 +0000
Subject: [PATCH 13/19] Formatting

---
 src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H b/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
index 892cb4b2f..241000237 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/oppositeFace.H
@@ -76,7 +76,6 @@ public:
             face(f),
             masterIndex_(masterIndex),
             oppositeIndex_(oppositeIndex)
-            
         {}
 
 

From 30b3a8a2bdbcf847a4f1db2d84c11844de2c08b6 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:57:08 +0000
Subject: [PATCH 14/19] Updated header and footer to correct copyright

---
 doc/Doxygen/FoamFooter.html |  4 +++-
 doc/Doxygen/FoamHeader.html | 20 ++++----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/doc/Doxygen/FoamFooter.html b/doc/Doxygen/FoamFooter.html
index 352a32682..3f193433c 100644
--- a/doc/Doxygen/FoamFooter.html
+++ b/doc/Doxygen/FoamFooter.html
@@ -1,4 +1,6 @@
-Copyright&#x00A0;&#169;&#x00A0;2000-2009&#x00A0;OpenCFD Ltd
+Copyright&#x00A0;&#169;&#x00A0;1993-2000&#x00A0;Henry Weller and Hrvoje Jasak
+Copyright&#x00A0;&#169;&#x00A0;2000-2006&#x00A0;Programmers manual for FOAM, a product of Nabla Ltd.
+Copyright&#x00A0;&#169;&#x00A0;2009-2011&#x00A0;OpenFOAM Extend Project
 </td></tr>
 </table>
 </body>
diff --git a/doc/Doxygen/FoamHeader.html b/doc/Doxygen/FoamHeader.html
index 3314d3dd6..e83fe4801 100644
--- a/doc/Doxygen/FoamHeader.html
+++ b/doc/Doxygen/FoamHeader.html
@@ -12,8 +12,8 @@
 <meta name="date" content="2007-04-12 00:02:00">
 <link rel="stylesheet" type="text/css" href="../Doxygen.css">
 <link rel="stylesheet" type="text/css" href="../tabs.css">
-<meta name="keywords" content="computational fluid dynamics, CFD, OpenCFD, OpenFOAM, open source CFD, open source">
-<meta name="description" content="OpenCFD Ltd, leaders in open source Computational Fluid Dynamics (CFD), the developers and maintainers of OpenFOAM: the open source CFD toolbox. We supply support and contracted developments for OpenFOAM">
+<meta name="keywords" content="computational fluid dynamics, CFD, OpenFOAM, open source CFD, open source">
+<meta name="description" content="OpenFOAM-Extend Project: Open Source Development of High Quality CFD Tools">
 </head>
 <body>
 <a id="openfoam"> </a>
@@ -45,20 +45,8 @@ horizontal-align: left; ">
     class=menuLefton >Source Guide</a>
     </td>
     <td class=topmenu>
-    <a href="http://www.opencfd.co.uk/index.html"
-    class=menuTopoff >OpenCFD</a>
-    </td>
-    <td class=topmenu>
-    <a href="http://www.opencfd.co.uk/solutions/index.html"
-    class=menuTopoff >Solutions</a>
-    </td>
-    <td class=topmenu>
-    <a href="http://www.opencfd.co.uk/contact/index.html"
-    class=menuTopoff >Contact</a>
-    </td>
-    <td class=topmenu>
-    <a href="http://www.opencfd.co.uk/openfoam/index.html"
-    class=menuTopoff >OpenFOAM</a>
+    <a href="http://www.extend-project.de"
+    class=menuTopoff >OpenFOAM-Extend Project</a>
     </td>
     </tr>
     <tr>

From 9879c2e62139f958d1b7e594f003836004ef88f8 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 00:57:58 +0000
Subject: [PATCH 15/19] Formatting

---
 src/OpenFOAM/containers/Lists/UList/UList.H        |  2 ++
 src/OpenFOAM/containers/NamedEnum/NamedEnum.C      |  2 +-
 src/OpenFOAM/include/OSspecific.H                  | 14 +++++++-------
 .../regionCouple/regionCoupleFvPatchField.C        |  5 +++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 184cee2df..5d3c41346 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -95,11 +95,13 @@ public:
         //- Declare friendship with the SubList class
         friend class SubList<T>;
 
+
     // Static Member Functions
 
         //- Return a null UList
         inline static const UList<T>& null();
 
+
     // Public classes
 
         //- Less function class that can be used for sorting
diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
index 552d5593a..69c28ff5c 100644
--- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
+++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
@@ -72,7 +72,7 @@ Enum Foam::NamedEnum<Enum, nEnum>::read(Istream& is) const
         (
             "NamedEnum<Enum, nEnum>::read(Istream& is) const",
             is
-        ) << name << " is not in enumeration " << toc()
+        )   << name << " is not in enumeration " << toc()
             << exit(FatalIOError);
     }
 
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index 136294f5f..045768e18 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -103,11 +103,11 @@ bool chDir(const fileName& dir);
 //
 //  @return the full path name or fileName() if the name cannot be found
 //  Optionally abort if the file cannot be found
-fileName findEtcFile(const fileName&, bool mandatory=false);
+fileName findEtcFile(const fileName&, bool mandatory = false);
 
 //- Make a directory and return an error if it could not be created
 //  and does not already exist
-bool mkDir(const fileName&, mode_t=0777);
+bool mkDir(const fileName&, mode_t = 0777);
 
 //- Set the file mode
 bool chMod(const fileName&, const mode_t);
@@ -120,14 +120,14 @@ fileName::Type type(const fileName&);
 
 //- Does the name exist (as DIRECTORY or FILE) in the file system?
 //  Optionally enable/disable check for gzip file.
-bool exists(const fileName&, const bool checkGzip=true);
+bool exists(const fileName&, const bool checkGzip = true);
 
 //- Does the name exist as a DIRECTORY in the file system?
 bool isDir(const fileName&);
 
 //- Does the name exist as a FILE in the file system?
 //  Optionally enable/disable check for gzip file.
-bool isFile(const fileName&, const bool checkGzip=true);
+bool isFile(const fileName&, const bool checkGzip = true);
 
 //- Return size of file
 off_t fileSize(const fileName&);
@@ -139,8 +139,8 @@ time_t lastModified(const fileName&);
 fileNameList readDir
 (
     const fileName&,
-    const fileName::Type=fileName::FILE,
-    const bool filtergz=true
+    const fileName::Type = fileName::FILE,
+    const bool filtergz = true
 );
 
 //- Copy, recursively if necessary, the source to the destination
@@ -172,7 +172,7 @@ void fdClose(const int);
 bool ping(const word&, const label port, const label timeOut);
 
 //- Check if machine is up by pinging port 22 (ssh) and 222 (rsh)
-bool ping(const word&, const label timeOut=10);
+bool ping(const word&, const label timeOut = 10);
 
 //- Execute the specified command
 int system(const string& command);
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/regionCouple/regionCoupleFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/regionCouple/regionCoupleFvPatchField.C
index 08a8cec38..e306ccf23 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/regionCouple/regionCoupleFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/regionCouple/regionCoupleFvPatchField.C
@@ -168,7 +168,8 @@ void regionCoupleFvPatchField<Type>::evaluate
     const Pstream::commsTypes
 )
 {
-    // Implement weights-based stabilised harmonic interpolation using magnitude
+    // Implement weights-based stabilised harmonic interpolation using
+    // magnitude of type
     // Algorithm:
     // 1) calculate magnitude of internal field and neighbour field
     // 2) calculate harmonic mean magnitude
@@ -189,7 +190,7 @@ void regionCoupleFvPatchField<Type>::evaluate
 
     forAll (weights, faceI)
     {
-        den = (mOwn[faceI] - mNei[faceI]);
+        den = mOwn[faceI] - mNei[faceI];
 
         if (mag(den) > SMALL)
         {

From da5726b2625c7c990a948b42e0b74dedc30a0aa4 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 20 Jan 2011 14:04:25 +0000
Subject: [PATCH 16/19] Bug fixes, Henrik Rusche

---
 .../attachDetach/attachDetach.C               |  2 +-
 .../attachDetach/detachInterface.C            | 35 ++++++++++++++++---
 .../layerAdditionRemoval.C                    | 12 +++++++
 .../layerAdditionRemoval.H                    |  6 ++++
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachDetach.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachDetach.C
index a4f270e2a..a02b01f85 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/attachDetach.C
@@ -238,7 +238,7 @@ void Foam::attachDetach::checkDefinition()
         {
             FatalErrorIn("void attachDetach::checkDefinition()")
                 << "Master and slave patch share " << nSharedPoints
-                << " point.  This is not allowed." << nl 
+                << " point.  This is not allowed." << nl
                 << "Please check mesh for topological errors."
                 << abort(FatalError);
         }
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/detachInterface.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/detachInterface.C
index ff60278f2..aade9cc7b 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/detachInterface.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/attachDetach/detachInterface.C
@@ -381,6 +381,33 @@ void Foam::attachDetach::detachInterface
         // If the face has changed, create a modification entry
         if (changed)
         {
+            // Get zone ID and flipMap for the face
+            // Bug fix. Henrik Rusche, 20/Jan/2011
+            const label oldZoneID = zoneMesh.whichZone(curFaceID);
+            bool oldFlip = false;
+
+            if (oldZoneID > -1)
+            {
+                const label oldFaceInZoneID =
+                    zoneMesh[oldZoneID].whichFace(curFaceID);
+
+                if (oldFaceInZoneID > -1)
+                {
+                    oldFlip = zoneMesh[oldZoneID].flipMap()[oldFaceInZoneID];
+                }
+                else
+                {
+                    FatalErrorIn
+                    (
+                        "attachDetach::detachInterface\n"
+                        "(\n"
+                        "    polyTopoChange& ref\n"
+                        ") const\n"
+                    )   << "Error in zone access."
+                        << abort(FatalError);
+                }
+            }
+
             if (mesh.isInternalFace(curFaceID))
             {
                 // No need to check for nei index: internal face.
@@ -396,8 +423,8 @@ void Foam::attachDetach::detachInterface
                         false,                      // flip flux
                         -1,                         // patch for face
                         false,                      // remove from zone
-                        zoneMesh.whichZone(curFaceID), // zone for face
-                        false                       // face zone flip
+                        oldZoneID,                  // zone for face
+                        oldFlip                     // face zone flip
                     )
                 );
 // Pout << "modifying stick-out face. Internal Old face: " << oldFace << " new face: " << newFace << " own: " << own[curFaceID] << " nei: " << nei[curFaceID] << endl;
@@ -415,8 +442,8 @@ void Foam::attachDetach::detachInterface
                         false,                       // flip flux
                         mesh.boundaryMesh().whichPatch(curFaceID), // patch
                         false,                        // remove from zone
-                        zoneMesh.whichZone(curFaceID),  // zone for face
-                        false                         // face zone flip
+                        oldZoneID,                    // zone for face
+                        oldFlip                      // face zone flip
                     )
                 );
 // Pout << "modifying stick-out face. Boundary Old face: " << oldFace << " new face: " << newFace << " own: " << own[curFaceID] << " patch: " << mesh.boundaryMesh().whichPatch(curFaceID) << endl;
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.C
index 436bd1d90..163f367c4 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.C
@@ -217,6 +217,18 @@ Foam::layerAdditionRemoval::~layerAdditionRemoval()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void  Foam::layerAdditionRemoval::setRemoval()
+{
+    triggerRemoval_ = topoChanger().morphIndex();
+}
+
+
+void  Foam::layerAdditionRemoval::setAddition()
+{
+    triggerAddition_ = topoChanger().morphIndex();
+}
+
+
 bool Foam::layerAdditionRemoval::changeTopology() const
 {
     // Protect from multiple calculation in the same time-step
diff --git a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.H b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.H
index ce55d0d18..1e932ffff 100644
--- a/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.H
+++ b/src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/layerAdditionRemoval.H
@@ -170,6 +170,12 @@ public:
 
     // Member Functions
 
+        //- Set layer removal
+        void setRemoval();
+
+        //- Set addition
+        void setAddition();
+
         //- Check for topology change
         virtual bool changeTopology() const;
 

From 71885adc91d1bfa926772e55e01563f5ca7f14a4 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 24 Jan 2011 21:48:14 +0000
Subject: [PATCH 17/19] Removed unnecessary comment and includes

---
 src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C |  2 --
 src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H |  4 ++--
 src/finiteVolume/fvMesh/fvMesh.C                       | 10 +---------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index a8a68269f..9bec21322 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -217,8 +217,6 @@ void Foam::faceZone::calcCellLayers() const
             mc[faceI] = curMc;
             sc[faceI] = curSc;
         }
-        //Info << "masterCells: " << mc << endl;
-        //Info << "slaveCells: " << sc << endl;
     }
 }
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index b32c43ce8..174d282db 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -263,8 +263,8 @@ public:
         }
 
         //- Map storing the local face index for every global face index.
-        //  Used to find out the index of face in the zone from the known global
-        //  face index.  If the face is not in the zone, returns -1
+        //  Used to find out the index of face in the zone from the known
+        //   global face index.  If the face is not in the zone, returns -1
         label whichFace(const label globalFaceID) const;
 
         //- Return reference to primitive patch
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 556f93363..86d303a7a 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -39,20 +39,12 @@ License
 #include "mapClouds.H"
 
 #include "volPointInterpolation.H"
-#include "extendedLeastSquaresVectors.H"
-#include "extendedLeastSquaresVectors.H"
-#include "leastSquaresVectors.H"
-#include "CentredFitData.H"
-#include "linearFitPolynomial.H"
-#include "quadraticFitPolynomial.H"
-#include "quadraticLinearFitPolynomial.H"
-//#include "quadraticFitSnGradData.H"
-#include "skewCorrectionVectors.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 defineTypeNameAndDebug(Foam::fvMesh, 0);
 
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::fvMesh::clearGeomNotOldVol()

From f7034cc482fe1498549a734d387b5b01347eab8a Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 24 Jan 2011 21:48:37 +0000
Subject: [PATCH 18/19] Tutorial update

---
 .../aachenBomb/constant/polyMesh/boundary        |  2 +-
 .../dieselFoam/aachenBomb/system/fvSchemes       | 16 ++++++++--------
 .../dieselFoam/aachenBomb/system/fvSolution      |  6 ++++--
 .../constant/polyMesh/boundary                   |  2 +-
 .../fluid/constant/dynamicMeshDict               |  2 +-
 .../fluid/system/tetFemSolution                  |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
index 434ce0e9d..2e8296d12 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
@@ -1,6 +1,6 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM Extend Project: Open Source CFD        |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
 |  \\    /   O peration     | Version:  1.6-ext                               |
 |   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
index 19491f4de..d299e2a93 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
@@ -29,17 +29,17 @@ gradSchemes
 divSchemes
 {
     default         none;
-    div(phi,rho)    Gauss limitedLinear 1;
-    div(phi,U)      Gauss limitedLinearV 1;
+    div(phi,rho)    Gauss vanLeer;
+    div(phi,U)      Gauss linearUpwind Gauss linear;
     div(phiU,p)     Gauss linear;
-    div(phi,k)      Gauss limitedLinear 1;
-    div(phi,epsilon) Gauss limitedLinear 1;
-    div(phi,Yi_h)   Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(phi,Yi_h)   Gauss vanLeer;
     div(phi,fu_ft_h) Gauss multivariateSelection
     {
-        fu limitedLinear 1;
-        ft limitedLinear 1;
-        hs limitedLinear 1;
+        fu vanLeer;
+        ft vanLeer;
+        hs vanLeer;
     };
     div((muEff*dev2(grad(U).T()))) Gauss linear;
 }
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
index a558adcbf..f607fb7a4 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
@@ -23,6 +23,7 @@ solvers
         preconditioner  DIC;
         tolerance       1e-09;
         relTol          0;
+        minIter         1;
     }
 
     rho
@@ -35,14 +36,15 @@ solvers
     {
         solver          PBiCG;
         preconditioner  DILU;
-        tolerance       1e-06;
+        tolerance       1e-08;
         relTol          0;
+        minIter         1;
     }
 }
 
 PISO
 {
-    nCorrectors     2;
+    nCorrectors     4;
     nNonOrthogonalCorrectors 0;
 }
 
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
index a66cf1dd0..fb91bc8f1 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
@@ -1,6 +1,6 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM Extend Project: Open Source CFD        |
+| \\      /  F ield         | OpenFOAM Extend Project: Open source CFD        |
 |  \\    /   O peration     | Version:  1.6-ext                               |
 |   \\  /    A nd           | Web:      www.extend-project.de                 |
 |    \\/     M anipulation  |                                                 |
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict
index e7f6bcd45..3a8f95e55 100644
--- a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/dynamicMeshDict
@@ -26,7 +26,7 @@ diffusivity     quadratic;
 
 frozenDiffusion on;
 
-distancePatches 
+distancePatches
 (
     consoleFluid
 );
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/tetFemSolution b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/tetFemSolution
index 1549afc0c..3e429ce96 100644
--- a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/tetFemSolution
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/system/tetFemSolution
@@ -25,7 +25,7 @@ solvers
 
         tolerance        1e-06;
         relTol           0;
-    };
+    }
 }
 
 

From f9d3f6c220ffbd51e1bd09e3a935aa83017f6189 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 24 Jan 2011 21:49:27 +0000
Subject: [PATCH 19/19] Clean-up

---
 etc/controlDict | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/etc/controlDict b/etc/controlDict
index b5a25f98b..9106caabc 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -904,8 +904,7 @@ Tolerances
     primitiveMeshFaceFlatnessThreshold 0.8;
 
     // Geometric matching tolerances
-    cyclicMatchTol      1e-4;
-    processorMatchTol   1e-4;
+    patchFaceMatchTol   1e-4;
 
     // Volumetric closed domain
     closedDomainTol     1e-10;