Clean-up and formatting

applications/solvers/coupled/conjugateHeatFoam/solveEnergy.H

@@ -14,15 +14,12 @@
               + fvm::div(phi, T)
             )
           - fvm::laplacian(kappaEff, T)
-            ==
+         ==
             radiation->Ru()
           - fvm::Sp(4.0*radiation->Rp()*pow3(T), T)
           + 3.0*radiation->Rp()*pow4(T)
         );
 
-        //Done automatically in 1.6.1-ext
-        //TFluidEqn->boundaryManipulate(T.boundaryField());
-
         fvScalarMatrix* TSolidEqn = new fvScalarMatrix
         (
             fvm::ddt(rhoCpsolid, Tsolid)
@@ -30,10 +27,6 @@
           + fvm::SuSp(-solidThermo.S()/Tsolid, Tsolid)
         );
 
-        //Done automatically in 1.6.1-ext
-        //TSolidEqn->boundaryManipulate(Tsolid.boundaryField());
-
-
         // Add fluid equation
         TEqns.set(0, TFluidEqn);
 

applications/solvers/coupled/pUCoupledFoam/createFields.H

@@ -1,69 +1,71 @@
-Info << "Reading field p\n" << endl;
-volScalarField p
-(
-    IOobject
+    Info << "Reading field p\n" << endl;
+    volScalarField p
     (
-        "p",
-        runTime.timeName(),
+        IOobject
+        (
+            "p",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    Info << "Reading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+#   include "createPhi.H"
+
+    singlePhaseTransportModel laminarTransport(U, phi);
+
+    autoPtr<incompressible::RASModel> turbulence
+    (
+        incompressible::RASModel::New(U, phi, laminarTransport)
+    );
+
+    // Block vector field for velocity (first entry) and pressure (second
+    // entry).
+    Info << "Creating field Up\n" << endl;
+    volVector4Field Up
+    (
+        IOobject
+        (
+            "Up",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
         mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
+        dimensionedVector4("zero", dimless, vector4::zero)
+    );
 
-Info << "Reading field U\n" << endl;
-volVectorField U
-(
-    IOobject
+    Info<< "Creating field rAU\n" << endl;
+    volScalarField rAU
     (
-        "U",
-        runTime.timeName(),
+        IOobject
+        (
+            "rAU",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
         mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
+        runTime.deltaT()
+    );
 
-#include "createPhi.H"
-
-singlePhaseTransportModel laminarTransport(U, phi);
-autoPtr<incompressible::RASModel> turbulence
-(
-    incompressible::RASModel::New(U, phi, laminarTransport)
-);
-
-// Block vector field for velocity (first entry) and pressure (second
-// entry).
-Info << "Creating field Up\n" << endl;
-volVector4Field Up
-(
-    IOobject
-    (
-       "Up",
-       runTime.timeName(),
-       mesh,
-       IOobject::NO_READ,
-       IOobject::NO_WRITE
-    ),
-    mesh,
-    dimensionedVector4("zero", dimless, vector4::zero)
-);
-
-Info<< "Creating field rAU\n" << endl;
-volScalarField rAU
-(
-    IOobject
-    (
-        "rAU",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::NO_WRITE
-    ),
-    mesh,
-    runTime.deltaT()
-);
-
-mesh.schemesDict().setFluxRequired(p.name());
+    mesh.schemesDict().setFluxRequired(p.name());
+    mesh.schemesDict().setFluxRequired("pcorr");

applications/solvers/incompressible/simpleFoam/pEqn.H

@@ -3,7 +3,7 @@
 
     // Prepare clean 1/Ap without contribution from under-relaxation
     // HJ, 26/Oct/2015
-    volScalarField rUA
+    volScalarField rAU
     (
         "(1|A(U))",
         1/HUEqn().A()
@@ -13,7 +13,7 @@
     // the flux precursor
     U.storePrevIter();
 
-    U = rUA*HUEqn().H();
+    U = rAU*HUEqn().H();
     HUEqn.clear();
 
     phi = fvc::interpolate(U) & mesh.Sf();