Merge branch 'master' into cvm

Conflicts:
	applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C

applications/solvers/basic/potentialFoam/createFields.H

@@ -47,4 +47,10 @@
 
     label pRefCell = 0;
     scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
+    setRefCell
+    (
+        p,
+        potentialFlow,
+        pRefCell,
+        pRefValue
+    );

applications/solvers/basic/potentialFoam/potentialFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,8 +42,8 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
+    #include "readControls.H"
     #include "createFields.H"
-    #include "readSIMPLEControls.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/solvers/basic/potentialFoam/readControls.H

@@ -0,0 +1,5 @@
+    const dictionary& potentialFlow =
+        mesh.solutionDict().subDict("potentialFlow");
+
+    const int nNonOrthCorr =
+        potentialFlow.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);