From 7ba2ddce9f6a3bd84a3297411b70732a6e59f4e4 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 11 Mar 2011 16:33:04 +0000
Subject: [PATCH] Clean-up

---
 src/OpenFOAM/meshes/meshTools/matchPoints.C   |  5 ++--
 .../polyMesh/globalMeshData/globalMeshData.H  |  6 ++---
 .../meshes/polyMesh/polyMeshFromShapeMesh.C   |  6 +++--
 .../derived/cohesive/cohesivePolyPatch.C      | 24 +++++++++----------
 .../polyPatches/polyPatch/polyPatch.C         |  1 +
 .../PrimitivePatch/PrimitivePatchMeshData.C   |  2 +-
 .../primitiveMeshCheck/primitiveMeshCheck.C   |  1 -
 7 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/OpenFOAM/meshes/meshTools/matchPoints.C b/src/OpenFOAM/meshes/meshTools/matchPoints.C
index 690a3c1c9..0c0d6efe1 100644
--- a/src/OpenFOAM/meshes/meshTools/matchPoints.C
+++ b/src/OpenFOAM/meshes/meshTools/matchPoints.C
@@ -59,7 +59,7 @@ bool Foam::matchPoints
 
     SortableList<scalar> pts1MagSqr(magSqr(pts1 - compareOrigin));
 
-    forAll(pts0MagSqr, i)
+    forAll (pts0MagSqr, i)
     {
         scalar dist0 = pts0MagSqr[i];
 
@@ -78,7 +78,7 @@ bool Foam::matchPoints
         // Go through range of equal mag and find nearest vector.
         scalar minDistSqr = VGREAT;
         label minFaceI = -1;
-    
+
         for
         (
             label j = startI;
@@ -90,6 +90,7 @@ bool Foam::matchPoints
         )
         {
             label faceI = pts1MagSqr.indices()[j];
+
             // Compare actual vectors
             scalar distSqr = magSqr(pts0[face0I] - pts1[faceI]);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index cf2f6e2d4..0eeadf1a1 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -27,9 +27,9 @@ Class
 
 Description
     Various mesh related information for a parallel run. Upon construction
-    constructs all info by using parallel communication. 
+    constructs all info by using parallel communication.
 
-    Requires: 
+    Requires:
     - all processor patches to have correct ordering.
     - all processorPatches to have their transforms set ('makeTransforms')
 
@@ -148,7 +148,7 @@ class globalMeshData
 
         // Processor patch addressing (be careful if not running in parallel!)
 
-            //- List of processor patch labels 
+            //- List of processor patch labels
             //  (size of list = number of processor patches)
             labelList processorPatches_;
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 29eb1d917..f1f41a52c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -506,8 +506,10 @@ Foam::polyMesh::polyMesh
 
             if (!found)
             {
-                FatalErrorIn("polyMesh::polyMesh(... construct from shapes...)")
-                    << "face " << faceI << " of patch " << patchI
+                FatalErrorIn
+                (
+                    "polyMesh::polyMesh(... construct from shapes...)"
+                )    << "face " << faceI << " of patch " << patchI
                     << " does not seem to belong to cell " << cellInside
                     << " which, according to the addressing, "
                     << "should be next to it."
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/cohesive/cohesivePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/cohesive/cohesivePolyPatch.C
index 8256dd066..e137e3208 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/cohesive/cohesivePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/cohesive/cohesivePolyPatch.C
@@ -136,9 +136,9 @@ bool cohesivePolyPatch::order
     }
 
     label oldFacesStartIndex = -1;
-    for(label i=0; i<topoFaceMap.size(); i=i+2)
+    for (label i = 0; i < topoFaceMap.size(); i += 2)
     {
-        if(topoFaceMap[i+1]-topoFaceMap[i] == 1)
+        if (topoFaceMap[i + 1] - topoFaceMap[i] == 1)
         {
             oldFacesStartIndex = i;
             break;
@@ -146,10 +146,10 @@ bool cohesivePolyPatch::order
     }
 
     label oldFacesSize = 0;
-    if(oldFacesStartIndex != -1)
+    if (oldFacesStartIndex != -1)
     {
         oldFacesSize = oldFacesSize + 2;
-        for (label i = oldFacesStartIndex+2; i < topoFaceMap.size(); i += 2)
+        for (label i = oldFacesStartIndex + 2; i < topoFaceMap.size(); i += 2)
         {
             oldFacesSize += 2*(topoFaceMap[i + 1]-topoFaceMap[i]);
         }
@@ -164,7 +164,7 @@ bool cohesivePolyPatch::order
         // Calculate normals
         vectorField normals(pp.size());
 
-        forAll(pp, faceI)
+        forAll (pp, faceI)
         {
             normals[faceI] = pp[faceI].normal(pp.points());
         }
@@ -176,7 +176,7 @@ bool cohesivePolyPatch::order
 
         label sizeByTwo = oldFacesSize/2;
 
-        if(oldFacesStartIndex != -1)
+        if (oldFacesStartIndex != -1)
         {
             for
             (
@@ -189,7 +189,7 @@ bool cohesivePolyPatch::order
                 half1ToPatch[n1Faces++] = i + sizeByTwo;
             }
 
-            for (label i=0; i<oldFacesStartIndex; i += 2)
+            for (label i = 0; i < oldFacesStartIndex; i += 2)
             {
                 half0ToPatch[n0Faces++] = i;
                 half1ToPatch[n1Faces++] = i + 1;
@@ -199,7 +199,7 @@ bool cohesivePolyPatch::order
             (
                 label i=oldFacesStartIndex+oldFacesSize;
                 i<topoFaceMap.size();
-                i=i+2
+                i = i + 2
             )
             {
                 half0ToPatch[n0Faces++] = i;
@@ -210,9 +210,9 @@ bool cohesivePolyPatch::order
         {
             for
             (
-                label i=0;
-                i<topoFaceMap.size();
-                i=i+2
+                label i = 0;
+                i < topoFaceMap.size();
+                i += 2
             )
             {
                 half0ToPatch[n0Faces++] = i;
@@ -259,7 +259,7 @@ bool cohesivePolyPatch::order
         faceMap[patchFaceI] = half0ToPatch.size() + faceI;
     }
 
-    forAll(faceMap, faceI)
+    forAll (faceMap, faceI)
     {
         if (faceMap[faceI] != faceI)
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index ce9f886f2..798f124fd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -256,6 +256,7 @@ Foam::scalarField Foam::polyPatch::calcFaceTol
 
         tols[faceI] = matchTol_*maxLen;
     }
+
     return tols;
 }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
index 9ef9b7aa1..16a5383e5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshData.C
@@ -80,7 +80,7 @@ calcMeshData() const
     // In <= 1.5 the meshPoints would be in increasing order but this gives
     // problems in processor point synchronisation where we have to find out
     // how the opposite side would have allocated points.
-    
+
     // Note:
     // ~~~~~
     // This is all garbage.  All -ext versions will preserve strong ordering
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 0a4e0c8c5..4307defc2 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -751,7 +751,6 @@ bool Foam::primitiveMesh::checkFaceSkewness
         {
             Info<< " ***Max skewness = " << maxSkew
                 << ", " << nWarnSkew << " highly skew faces detected"
-                << " which may impair the quality of the results"
                 << " Threshold = " << skewThreshold_
                 << endl;
         }