From f6cbf149e749ce56fba6853a931265196d10c287 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Fri, 18 Sep 2015 12:04:47 +0100
Subject: [PATCH] Clean-up and formatting

---
 src/meshTools/searchableSurface/triSurfaceMesh.H       |  4 +++-
 .../booleanOps/booleanSurface/booleanSurface.H         |  3 ++-
 .../triSurface/orientedSurface/orientedSurface.H       | 10 +++++++---
 .../triSurface/treeDataTriSurface/treeDataTriSurface.C |  4 ++--
 .../triSurface/treeDataTriSurface/treeDataTriSurface.H |  3 ++-
 .../triSurface/triSurfaceSearch/triSurfaceSearch.C     |  7 +++++--
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.H b/src/meshTools/searchableSurface/triSurfaceMesh.H
index a9825900e..e81d30a25 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.H
@@ -249,6 +249,7 @@ public:
                 List<volumeType>&
             ) const;
 
+
         // Other
 
             //- Set bounds of surface. Bounds currently set as list of
@@ -271,7 +272,8 @@ public:
             //  indices) get the specified field. Misses do not get set.
             virtual void getField
             (
-                const List<pointIndexHit>&, labelList&
+                const List<pointIndexHit>&,
+                labelList&
             ) const;
 
 
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
index fb46a2979..4d8463f6c 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
@@ -25,7 +25,8 @@ Class
     Foam::booleanSurface
 
 Description
-    Surface-surface intersection. Given two surfaces construct combined surface.
+    Surface-surface intersection.
+    Given two surfaces construct a combined surface.
 
     Called 'boolean' since the volume of resulting surface will encompass
     the volumes of the original surface according to some boolean operation:
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.H b/src/meshTools/triSurface/orientedSurface/orientedSurface.H
index d685fa3bb..3e39b30d7 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.H
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.H
@@ -46,7 +46,7 @@ namespace Foam
 // Forward declaration of classes
 
 /*---------------------------------------------------------------------------*\
-                           Class orientedSurface Declaration
+                       Class orientedSurface Declaration
 \*---------------------------------------------------------------------------*/
 
 class orientedSurface
@@ -148,8 +148,12 @@ public:
         //- Flip faces such that normals are consistent with point:
         //  orientOutside=true : point outside surface
         //  orientOutside=false : point inside surface
-        static bool orient(triSurface&, const point&, const bool orientOutside);
-
+        static bool orient
+        (
+            triSurface&,
+            const point&,
+            const bool orientOutside
+        );
 };
 
 
diff --git a/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C b/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C
index 709918323..218dd5cb0 100644
--- a/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C
+++ b/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C
@@ -216,8 +216,8 @@ Foam::label Foam::treeDataTriSurface::getVolumeType
         sample,
         max
         (
-            Foam::sqr(GREAT),
-            Foam::magSqr(treeBb.span())
+            sqr(GREAT),
+            magSqr(treeBb.span())
         )
     );
 
diff --git a/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H b/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H
index beb41ddbf..610c5950f 100644
--- a/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H
+++ b/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H
@@ -108,7 +108,8 @@ public:
 
         // Search
 
-            //- Get type (inside,outside,mixed,unknown) of point w.r.t. surface.
+            //- Get type (inside, outside, mixed, unknown) of point
+            //  with respect to a surface.
             //  Only makes sense for closed surfaces.
             label getVolumeType
             (
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index bf6d8dd33..092bdb7af 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -174,8 +174,11 @@ tmp<pointField> triSurfaceSearch::calcNearest
 }
 
 
-pointIndexHit triSurfaceSearch::nearest(const point& pt, const vector& span)
- const
+pointIndexHit triSurfaceSearch::nearest
+(
+    const point& pt,
+    const vector& span
+) const
 {
     const scalar nearestDistSqr = 0.25*magSqr(span);