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

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

@@ -1,3 +1,4 @@
     argList::noParallel();
     argList::validOptions.insert("blockTopology", "");
+    argList::validOptions.insert("dict", "dictionary");
 #   include "addRegionOption.H"

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

@@ -77,11 +77,21 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Reading block mesh description dictionary" << endl;
 
+    word dictName("blockMeshDict");
+    fileName dictPath(runTime.constant()/polyMeshDir);
+
+    if (args.options().found("dict"))
+    {
+        fileName userDict(args.options()["dict"]);
+
+        dictName = userDict.name();
+        dictPath = userDict.path();
+    }
+
     IOobject meshDescriptionIOobject
     (
-        "blockMeshDict",
-        runTime.constant(),
-        polyMeshDir,
+        dictName,
+        dictPath,
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
@@ -91,13 +101,14 @@ int main(int argc, char *argv[])
     if (!meshDescriptionIOobject.headerOk())
     {
         FatalErrorIn(args.executable())
-            << "Cannot open mesh description file " << nl
-            << runTime.constant()/polyMeshDir/"blockMeshDict" << nl
+            << "Cannot open mesh description file: " << nl
+            << dictPath/dictName << nl
             << exit(FatalError);
     }
 
     IOdictionary meshDescription(meshDescriptionIOobject);
 
+
     Info<< nl << "Creating block mesh" << endl;
 
     blockMesh blocks(meshDescription);

applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C

@@ -95,8 +95,8 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    Info<< "\nCreating boundary-layer for U of thickness" << ybl.value() << " m"
-        << nl << endl;
+    Info<< "\nCreating boundary-layer for U of thickness "
+        << ybl.value() << " m" << nl << endl;
 
     // Modify velocity by applying a 1/7th power law boundary-layer
     // u/U0 = (y/ybl)^(1/7)