blockMesh: Change default location of blockMeshDict from constant/polyMesh to system

For multi-region cases the default location of blockMeshDict is now system/<region name>

If the blockMeshDict is not found in system then the constant directory
is also checked providing backward-compatibility

applications/utilities/mesh/generation/blockMesh/blockMeshApp.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-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,8 +28,10 @@ Description
     A multi-block mesh generator.
 
     Uses the block mesh description found in
-    \a constant/polyMesh/blockMeshDict
+    \a system/blockMeshDict
-    (or \a constant/\<region\>/polyMesh/blockMeshDict).
+    or \a system/\<region\>/blockMeshDict
+    or \a constant/polyMesh/blockMeshDict
+    or \a constant/\<region\>/polyMesh/blockMeshDict
 
 Usage
 
@@ -81,57 +83,67 @@ int main(int argc, char *argv[])
         "specify alternative dictionary for the blockMesh description"
     );
 
-#   include "addRegionOption.H"
+    #include "addRegionOption.H"
-#   include "setRootCase.H"
+    #include "setRootCase.H"
-#   include "createTime.H"
+    #include "createTime.H"
 
     const word dictName("blockMeshDict");
 
     word regionName;
-    fileName polyMeshDir;
+    word regionPath;
 
+    // Check if the region is specified otherwise mesh the default region
     if (args.optionReadIfPresent("region", regionName, polyMesh::defaultRegion))
     {
-        // constant/<region>/polyMesh/blockMeshDict
-        polyMeshDir = regionName/polyMesh::meshSubDir;
-
         Info<< nl << "Generating mesh for region " << regionName << endl;
+        regionPath = regionName;
     }
+
+    // Search for the appropriate blockMesh dictionary....
+
+    fileName dictPath;
+
+    // Check if the dictionary is specified on the command-line
+    if (args.optionFound("dict"))
+    {
+        dictPath = args["dict"];
+
+        dictPath =
+        (
+            isDir(dictPath)
+          ? dictPath/dictName
+          : dictPath
+        );
+    }
+    // Check if dictionary is present in the constant directory
+    else if
+    (
+        exists
+        (
+            runTime.path()/runTime.constant()
+           /regionPath/polyMesh::meshSubDir/dictName
+        )
+    )
+    {
+        dictPath =
+            runTime.path()/runTime.constant()
+           /regionPath/polyMesh::meshSubDir/dictName;
+    }
+    // Otherwise assume the dictionary is present in the system directory
     else
     {
-        // constant/polyMesh/blockMeshDict
+        dictPath = runTime.path()/runTime.system()/regionPath/dictName;
-        polyMeshDir = polyMesh::meshSubDir;
     }
 
     IOobject meshDictIO
     (
-        dictName,
+        dictPath,
-        runTime.constant(),
-        polyMeshDir,
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
         false
     );
 
-    if (args.optionFound("dict"))
-    {
-        const fileName dictPath = args["dict"];
-
-        meshDictIO = IOobject
-        (
-            (
-                isDir(dictPath)
-              ? dictPath/dictName
-              : dictPath
-            ),
-            runTime,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-    }
-
     if (!meshDictIO.headerOk())
     {
         FatalErrorIn(args.executable())
@@ -222,7 +234,7 @@ int main(int argc, char *argv[])
             meshDict.lookup("mergePatchPairs")
         );
 
-#       include "mergePatchPairs.H"
+        #include "mergePatchPairs.H"
     }
     else
     {