Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -68,10 +68,10 @@ int main(int argc, char *argv[])
 
         #include "chemistry.H"
         #include "rhoEqn.H"
-        #include "UEqn.H"
 
         for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
         {
+            #include "UEqn.H"
             #include "YEqn.H"
 
             #define Db turbulence->alphaEff()

applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C

@@ -167,6 +167,16 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     forAll (oldPatches, patchI)
     {
         const polyPatch& curPatch = oldPatches[patchI];
+
+        if (curPatch.coupled())
+        {
+            WarningIn("mirrorFvMesh::mirrorFvMesh(const IOobject&)")
+                << "Found coupled patch " << curPatch.name() << endl
+                << "    Mirroring faces on coupled patches destroys"
+                << " the ordering. This might be fixed by running a dummy"
+                << " createPatch afterwards." << endl;
+        }
+
         boolList& curInsBouFace = insertedBouFace[patchI];
 
         curInsBouFace.setSize(curPatch.size());

applications/utilities/parallelProcessing/decomposePar/decomposePar.C

@@ -237,23 +237,28 @@ int main(int argc, char *argv[])
 
         if (writeCellDist)
         {
+            const labelList& procIds = mesh.cellToProc();
+
             // Write the decomposition as labelList for use with 'manual'
             // decomposition method.
-
+            labelIOList cellDecomposition
-            // FIXME: may attempt to write to a non-existent "region0/"
-            OFstream os
             (
-                runTime.path()
+                IOobject
-              / mesh.facesInstance()
+                (
-              / regionName
+                    "cellDecomposition",
-              / "cellDecomposition"
+                    mesh.facesInstance(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                procIds
             );
-
+            cellDecomposition.write();
-            os << mesh.cellToProc();
 
             Info<< nl << "Wrote decomposition to "
-                << os.name() << " for use in manual decomposition."
+                << cellDecomposition.objectPath()
-                << endl;
+                << " for use in manual decomposition." << endl;
 
             // Write as volScalarField for postprocessing.
             volScalarField cellDist
@@ -271,7 +276,6 @@ int main(int argc, char *argv[])
                 zeroGradientFvPatchScalarField::typeName
             );
 
-            const labelList& procIds = mesh.cellToProc();
             forAll(procIds, celli)
             {
                cellDist[celli] = procIds[celli];

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H

@@ -191,7 +191,7 @@ void Foam::vtkPV3Foam::convertPointField
     pointData->SetNumberOfTuples(nPoints + addPointCellLabels.size());
     pointData->SetNumberOfComponents(nComp);
     pointData->Allocate(nComp*(nPoints + addPointCellLabels.size()));
-    pointData->SetName(tf.name().c_str());
+    pointData->SetName(ptf.name().c_str());
 
     if (debug)
     {

src/finiteVolume/fvMesh/fvPatches/derived/directMapped/directMappedWallFvPatch.H

@@ -36,7 +36,7 @@ SourceFiles
 #ifndef directMappedWallFvPatch_H
 #define directMappedWallFvPatch_H
 
-#include "fvPatch.H"
+#include "wallFvPatch.H"
 #include "directMappedWallPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,12 +45,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class directMappedWallFvPatch Declaration
+                   Class directMappedWallFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
 class directMappedWallFvPatch
 :
-    public fvPatch
+    public wallFvPatch
 {
 
 public:
@@ -68,7 +68,7 @@ public:
             const fvBoundaryMesh& bm
         )
         :
-            fvPatch(patch, bm)
+            wallFvPatch(patch, bm)
         {}
 };
 

src/meshTools/directMapped/directMappedPointPatch/directMappedWallPointPatch.H

@@ -36,7 +36,7 @@ SourceFiles
 #ifndef directMappedWallPointPatch_H
 #define directMappedWallPointPatch_H
 
-#include "facePointPatch.H"
+#include "wallPointPatch.H"
 #include "directMappedWallPolyPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,7 +50,7 @@ namespace Foam
 
 class directMappedWallPointPatch
 :
-    public facePointPatch
+    public wallPointPatch
 {
 
 public:
@@ -68,7 +68,7 @@ public:
             const pointBoundaryMesh& bm
         )
         :
-            facePointPatch(patch, bm)
+            wallPointPatch(patch, bm)
         {}
 };