From b3f78c4485aea066fd660f94d6348d8b8b02e964 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 14 Jan 2014 10:49:09 +0000
Subject: [PATCH 1/3] STYLE: Minor code formatting

---
 .../functionObjects/field/streamLine/streamLine.C          | 7 ++++---
 .../field/wallBoundedStreamLine/wallBoundedStreamLine.C    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index 5c1b6e22c9..b8a34c87f2 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ void Foam::streamLine::track()
 
     label nSeeds = returnReduce(particles.size(), sumOp<label>());
 
-    Info << "    seeded " << nSeeds << " particles." << endl;
+    Info << "    seeded " << nSeeds << " particles" << endl;
 
     // Read or lookup fields
     PtrList<volScalarField> vsFlds;
@@ -625,7 +625,8 @@ void Foam::streamLine::write()
             n += allTracks_[trackI].size();
         }
 
-        Info<< "    Tracks:" << allTracks_.size() << "  total samples:" << n
+        Info<< "    Tracks:" << allTracks_.size() nl
+            << "    Tottal samples:" << n
             << endl;
 
 
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index 66c3fa49fb..863221f220 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -750,8 +750,8 @@ void Foam::wallBoundedStreamLine::write()
             n += allTracks_[trackI].size();
         }
 
-        Info<< "Tracks:" << allTracks_.size()
-            << "  total samples:" << n << endl;
+        Info<< "    Tracks:" << allTracks_.size() << nl
+            << "    Total samples:" << n << endl;
 
 
         // Massage into form suitable for writers

From 74449da76290fd4f613ec728e4e1ed54b70a7c95 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 14 Jan 2014 12:41:43 +0000
Subject: [PATCH 2/3] functionObjects/field/streamLine: Fixed errors in message
 output

---
 .../functionObjects/field/streamLine/streamLine.C             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index b8a34c87f2..ba8b0e6ac2 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -625,8 +625,8 @@ void Foam::streamLine::write()
             n += allTracks_[trackI].size();
         }
 
-        Info<< "    Tracks:" << allTracks_.size() nl
-            << "    Tottal samples:" << n
+        Info<< "    Tracks:" << allTracks_.size() << nl
+            << "    Tottal samples:" << nl
             << endl;
 
 

From b9311f0507a043200be76be782bf112e208ff56a Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 14 Jan 2014 12:42:35 +0000
Subject: [PATCH 3/3] Icc: filter yet more spurious warning messages

---
 wmake/rules/linux64Icc/c++   | 2 +-
 wmake/rules/linuxIA64Icc/c++ | 2 +-
 wmake/rules/linuxIcc/c++     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++
index dfad97cee6..51cb6a389c 100644
--- a/wmake/rules/linux64Icc/c++
+++ b/wmake/rules/linux64Icc/c++
@@ -1,6 +1,6 @@
 .SUFFIXES: .C .cxx .cc .cpp
 
-c++WARN     = -wd327,654,819,1125,1476,1505,1572
+c++WARN     = -wd327,525,654,819,1125,1476,1505,1572
 
 CC          = icpc -std=c++0x
 
diff --git a/wmake/rules/linuxIA64Icc/c++ b/wmake/rules/linuxIA64Icc/c++
index 625cbd186e..600e980b8b 100644
--- a/wmake/rules/linuxIA64Icc/c++
+++ b/wmake/rules/linuxIA64Icc/c++
@@ -1,6 +1,6 @@
 .SUFFIXES: .C .cxx .cc .cpp
 
-c++WARN     = -wd327,654,819,1125,1476,1505,1572
+c++WARN     = -wd327,525,654,819,1125,1476,1505,1572
 
 CC          = icpc
 
diff --git a/wmake/rules/linuxIcc/c++ b/wmake/rules/linuxIcc/c++
index d06a874848..314cd3cd12 100644
--- a/wmake/rules/linuxIcc/c++
+++ b/wmake/rules/linuxIcc/c++
@@ -1,6 +1,6 @@
 .SUFFIXES: .C .cxx .cc .cpp
 
-c++WARN     = -wd327,654,819,1125,1476,1505,1572
+c++WARN     = -wd327,525,654,819,1125,1476,1505,1572
 
 #CC          = icpc -gcc-version=400
 CC          = icpc -std=c++0x