Merge branch 'master' into splitCyclic

Conflicts:
	applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
	applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
	applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
	src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
	src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C
	src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
	src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
	src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
	src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
	src/edgeMesh/edgeFormats/vtk/VTKedgeFormat.H
	src/mesh/blockMesh/curvedEdges/spline.H
	src/meshTools/PointEdgeWave/PointEdgeWave.C
	src/meshTools/sets/topoSets/faceSet.C

applications/utilities/mesh/generation/blockMesh/blockMeshApp.C

@@ -42,7 +42,7 @@ Usage
     @param -region \<name\> \n
     Specify an alternative mesh region.
 
-    @param -dict \<dictionary\> \n
+    @param -dict \<filename\> \n
     Specify an alternative dictionary for the block mesh description.
 
 \*---------------------------------------------------------------------------*/
@@ -72,8 +72,18 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validOptions.insert("blockTopology", "");
-    argList::validOptions.insert("dict", "dictionary");
+    argList::addBoolOption
+    (
+        "blockTopology",
+        "write block edges and centres as .obj files"
+    );
+    argList::addOption
+    (
+        "dict",
+        "file",
+        "specify an alternative dictionary for the blockMesh description"
+    );
+
 #   include "addRegionOption.H"
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -83,10 +93,9 @@ int main(int argc, char *argv[])
     word regionName;
     fileName polyMeshDir;
 
-    if (args.optionFound("region"))
+    if (args.optionReadIfPresent("region", regionName, polyMesh::defaultRegion))
     {
         // constant/<region>/polyMesh/blockMeshDict
-        regionName  = args.option("region");
         polyMeshDir = regionName/polyMesh::meshSubDir;
 
         Info<< nl << "Generating mesh for region " << regionName << endl;
@@ -94,7 +103,6 @@ int main(int argc, char *argv[])
     else
     {
         // constant/polyMesh/blockMeshDict
-        regionName  = polyMesh::defaultRegion;
         polyMeshDir = polyMesh::meshSubDir;
     }
 
@@ -363,7 +371,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< nl << "End" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }

applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H

@@ -7,7 +7,7 @@
             List<faceZone*> fz(3*mergePatchPairs.size());
             List<cellZone*> cz(0);
 
-            forAll (mergePatchPairs, pairI)
+            forAll(mergePatchPairs, pairI)
             {
                 const word mergeName
                 (
@@ -34,7 +34,7 @@
 
                 labelList isf(masterPatch.size());
 
-                forAll (isf, i)
+                forAll(isf, i)
                 {
                     isf[i] = masterPatch.start() + i;
                 }
@@ -58,7 +58,7 @@
 
                 labelList osf(slavePatch.size());
 
-                forAll (osf, i)
+                forAll(osf, i)
                 {
                     osf[i] = slavePatch.start() + i;
                 }
@@ -83,15 +83,15 @@
                 );
             }  // end of all merge pairs
 
-            Info << "Adding point and face zones" << endl;
+            Info<< "Adding point and face zones" << endl;
             mesh.addZones(pz, fz, cz);
 
 
-            Info << "Creating attachPolyTopoChanger" << endl;
+            Info<< "Creating attachPolyTopoChanger" << endl;
             attachPolyTopoChanger polyMeshAttacher(mesh);
             polyMeshAttacher.setSize(mergePatchPairs.size());
 
-            forAll (mergePatchPairs, pairI)
+            forAll(mergePatchPairs, pairI)
             {
                 const word mergeName
                 (

applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C

@@ -58,7 +58,7 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::validArgs.append("thickness");
-    argList::validOptions.insert("overwrite", "");
+    argList::addBoolOption("overwrite");
 #   include "setRootCase.H"
 #   include "createTime.H"
     runTime.functionObjects().off();
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
     // ~~~~~~~~~~~~~~~~~~~~~~
 
     scalar minRange = GREAT;
-    direction extrudeDir = -1;
+    direction extrudeDir = 4;   //illegal value.
 
     for (direction dir = 0; dir < 3; dir++)
     {

applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C

@@ -418,8 +418,8 @@ int main(int argc, char *argv[])
         frontPatchFaces.setSize(layerFaces.size());
         forAll(backPatchFaces, i)
         {
-            backPatchFaces[i] = layerFaces[i][0];
-            frontPatchFaces[i] = layerFaces[i][layerFaces[i].size()-1];
+            backPatchFaces[i]  = layerFaces[i].first();
+            frontPatchFaces[i] = layerFaces[i].last();
         }
 
         // Create dummy fvSchemes, fvSolution
@@ -693,7 +693,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C

@@ -95,7 +95,7 @@ Foam::Xfer<Foam::faceList> Foam::extrudedMesh::extrudedFaces
 
     const label nLayers = model.nLayers();
 
-    label nFaces = 
+    label nFaces =
         (nLayers + 1)*surfaceFaces.size() + nLayers*surfaceEdges.size();
 
     faceList eFaces(nFaces);

applications/utilities/mesh/generation/snappyHexMesh/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
     /* -g -DFULLDEBUG -O0 */ \
-    -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C

@@ -115,7 +115,7 @@ void writeMesh
 
 int main(int argc, char *argv[])
 {
-    argList::validOptions.insert("overwrite", "");
+    argList::addBoolOption("overwrite");
 #   include "setRootCase.H"
 #   include "createTime.H"
     runTime.functionObjects().off();
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
         autoRefineDriver::debug = debug;
         autoSnapDriver::debug = debug;
         autoLayerDriver::debug = debug;
-    }        
+    }
 
 
     // Read geometry

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict

@@ -180,6 +180,12 @@ castellatedMeshControls
     // NOTE: This point should never be on a face, always inside a cell, even
     // after refinement.
     locationInMesh (5 0.28 0.43);
+
+
+    // Whether any faceZones (as specified in the refinementSurfaces)
+    // are only on the boundary of corresponding cellZones or also allow
+    // free-standing zone faces. Not used if there are no faceZones.
+    allowFreeStandingZoneFaces true;
 }
 
 
@@ -274,7 +280,8 @@ addLayersControls
     maxThicknessToMedialRatio 0.3;
 
     // Angle used to pick up medial axis points
-    minMedianAxisAngle 130;
+    // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x.
+    minMedianAxisAngle 90;
 
     // Create buffer region for new layer terminations
     nBufferCellsNoExtrude 0;