Merge branch 'master' of /home/noisy2/OpenFOAM/OpenFOAM-dev/

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -43,23 +43,20 @@ Description
 
 int main(int argc, char *argv[])
 {
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "createFields.H"
-#   include "initContinuityErrs.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
 
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
-#       include "readTimeControls.H"
-#       include "readPIMPLEControls.H"
-#       include "compressibleCourantNo.H"
-#       include "setDeltaT.H"
+        #include "readTimeControls.H"
+        #include "readPIMPLEControls.H"
+        #include "compressibleCourantNo.H"
+        #include "setDeltaT.H"
 
         runTime++;
 
@@ -75,13 +72,13 @@ int main(int argc, char *argv[])
         int oCorr=0;
         do
         {
-#           include "UEqn.H"
-#           include "hEqn.H"
+            #include "UEqn.H"
+            #include "hEqn.H"
 
             // --- PISO loop
             for (int corr=0; corr<nCorr; corr++)
             {
-#               include "pEqn.H"
+                #include "pEqn.H"
             }
 
             turbulence->correct();

applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C

@@ -121,8 +121,8 @@ int main(int argc, char *argv[])
 
                 Info<< "Patch " << patchi
                     << " named " << currPatch.name()
-                    << " y+ : min: " << min(Yp) << " max: " << max(Yp)
-                    << " average: " << average(Yp) << nl << endl;
+                    << " y+ : min: " << min(yPlus) << " max: " << max(yPlus)
+                    << " average: " << average(yPlus) << nl << endl;
             }
         }
 

applications/utilities/postProcessing/wall/yPlusRAS/Make/files

@@ -1,3 +1,3 @@
-checkYPlus.C
+yPlusRAS.C
 
-EXE = $(FOAM_APPBIN)/checkYPlus
+EXE = $(FOAM_APPBIN)/yPlusRAS

tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict

@@ -57,11 +57,11 @@ edges
 
 patches
 (
-    patch top
+    wall top
     (
         (13 15 14 12)
     )
-    patch bottom
+    wall bottom
     (
         (0 1 5 4)
         (1 8 10 5)