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

src/fieldSources/basicSource/explicitSource/ExplicitSource.H

@@ -39,7 +39,7 @@ Description
             }
         }
 
-    If volumeMode = 
+    If volumeMode =
         - absolute: values are given as <quantity>
         - specific: values are given as <quantity>/m3
 

src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H

@@ -38,7 +38,7 @@ Description
             gradPini    gradPini [0 2 -2 0 0] 0; // initial pressure gradient
             flowDir     (1 0 0);    // flow direction
         }
-        
+
 
 SourceFiles
     pressureGradientExplicitSource.C

src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H

@@ -202,7 +202,7 @@ protected:
         //- Maximum radius
         scalar rMax_;
 
-        
+
     // Protected Member Functions
 
         //- Check data
@@ -247,7 +247,7 @@ public:
 
     // Constructors
 
-        
+
         //- Construct from components
         rotorDiskSource
         (

src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C

@@ -181,7 +181,7 @@ void Foam::ParticleErosion<CloudType>::postPatch
 
         // particle direction of travel
         const vector& U = p.U();
-        
+
         // quick reject if particle travelling away from the patch
         if ((-nw & U) < 0)
         {

src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H

@@ -112,7 +112,7 @@ public:
 
             //- Post-move hook
             virtual void postMove
-            (   
+            (
                 const parcelType& p,
                 const label cellI,
                 const scalar dt

src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C

@@ -285,7 +285,7 @@ void Foam::PairCollision<CloudType>::wallInteraction()
                             );
 
                             flatSiteData.append(wSD);
- 
+
                             particleHit = true;
                         }
                     }

src/postProcessing/functionObjects/field/turbulenceFields/postProcessingDict

@@ -26,7 +26,7 @@ functions
 
         fields
         (
-            R 
+            R
         );
     }
 }

src/postProcessing/functionObjects/utilities/pressureCoefficient/pressureCoefficient.H

@@ -28,7 +28,7 @@ Description
     Calculates pressure coefficient, c_p
 
         c_p = p/p_dyn,inf
-    
+
     where:
 
         p_dyn,inf = 0.5*rho*mag(U_inf)^2

src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C

@@ -268,7 +268,7 @@ kOmegaSST::kOmegaSST
       / max
         (
             a1_*omega_,
-            F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_))))
+            F2()*sqrt(2.0)*mag(symm(fvc::grad(U_)))
         )
     );
     mut_.correctBoundaryConditions();
@@ -365,7 +365,7 @@ void kOmegaSST::correct()
         // Re-calculate viscosity
         mut_ =
             a1_*rho_*k_
-           /max(a1_*omega_, F2()*sqrt(2.0*magSqr(symm(fvc::grad(U_)))));
+           /max(a1_*omega_, F2()*sqrt(2.0)*mag(symm(fvc::grad(U_))));
         mut_.correctBoundaryConditions();
 
         // Re-calculate thermal diffusivity