Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C

@@ -102,17 +102,10 @@ JohnsonJacksonParticleSlipFvPatchVectorField
             << abort(FatalError);
     }
 
-    if (dict.found("value"))
+    fvPatchVectorField::operator=
-    {
+    (
-        fvPatchVectorField::operator=
+        vectorField("value", dict, p.size())
-        (
+    );
-            vectorField("value", dict, p.size())
-        );
-    }
-    else
-    {
-        partialSlipFvPatchVectorField::evaluate();
-    }
 }
 
 

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C

@@ -129,17 +129,10 @@ JohnsonJacksonParticleThetaFvPatchScalarField
             << abort(FatalError);
     }
 
-    if (dict.found("value"))
+    fvPatchScalarField::operator=
-    {
+    (
-        fvPatchScalarField::operator=
+        scalarField("value", dict, p.size())
-        (
+    );
-            scalarField("value", dict, p.size())
-        );
-    }
-    else
-    {
-        evaluate();
-    }
 }
 
 

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C

@@ -466,7 +466,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
               + fvm::div(alphaRhoPhi, Theta_)
               - fvc::Sp(fvc::ddt(alpha, rho) + fvc::div(alphaRhoPhi), Theta_)
             )
-          - fvm::laplacian(kappa_, Theta_, "laplacian(kappa, Theta)")
+          - fvm::laplacian(kappa_, Theta_, "laplacian(kappa,Theta)")
          ==
             fvm::SuSp(-((PsCoeff*I) && gradU), Theta_)
           + (tau && gradU)

applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -496,10 +496,16 @@ void getInterfaceSizes
             }
             interfaceSizes[nInterfaces] = infoIter();
 
-            Map<label> zoneAndInterface;
+            if (regionsToInterface.found(e))
-            zoneAndInterface.insert(zoneID, nInterfaces);
+            {
-            regionsToInterface.insert(e, zoneAndInterface);
+                regionsToInterface[e].insert(zoneID, nInterfaces);
-
+            }
+            else
+            {
+                Map<label> zoneAndInterface;
+                zoneAndInterface.insert(zoneID, nInterfaces);
+                regionsToInterface.insert(e, zoneAndInterface);
+            }
             nInterfaces++;
         }
     }

applications/utilities/surface/surfaceCheck/surfaceCheck.C

@@ -31,12 +31,10 @@ Description
 
 #include "triangle.H"
 #include "triSurface.H"
-#include "triSurfaceTools.H"
 #include "triSurfaceSearch.H"
 #include "argList.H"
 #include "OFstream.H"
 #include "OBJstream.H"
-#include "surfaceIntersection.H"
 #include "SortableList.H"
 #include "PatchTools.H"
 #include "vtkSurfaceWriter.H"
@@ -223,7 +221,7 @@ int main(int argc, char *argv[])
     // write bounding box corners
     if (args.optionFound("blockMesh"))
     {
-        pointField cornerPts(boundBox(surf.points()).points());
+        pointField cornerPts(boundBox(surf.points(), false).points());
 
         Info<<"// blockMeshDict info" << nl
             <<"vertices\n(" << nl;

src/lagrangian/basic/Cloud/Cloud.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -413,6 +413,12 @@ void Foam::Cloud<ParticleType>::autoMap
 //    polyMesh_.clearCellTree();
     cellWallFacesPtr_.clear();
 
+    // Ask for the tetBasePtIs to trigger all processors to build
+    // them, otherwise, if some processors have no particles then
+    // there is a comms mismatch.
+    polyMesh_.tetBasePtIs();
+
+
     forAllIter(typename Cloud<ParticleType>, *this, pIter)
     {
         ParticleType& p = pIter();