From 2f4f3584112889346a756c9c68e63399bf746776 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 11 Nov 2020 12:25:03 +0000
Subject: [PATCH] foamToVTK: Minor rationalisation to improve maintainability

---
 .../dataConversion/foamToVTK/foamToVTK.C       |  4 ++--
 .../foamToVTK/foamToVTK/lagrangianWriter.C     |  2 +-
 .../foamToVTK/foamToVTK/lagrangianWriter.H     | 18 ++++--------------
 .../foamToVTK/lagrangianWriterTemplates.C      |  1 +
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index e5abfb1520..e30bdced0d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -1204,7 +1204,7 @@ int main(int argc, char *argv[])
                 );
 
                 // Write number of fields
-                writer.writeParcelHeader
+                writer.writeFieldsHeader
                 (
                     labelNames.size()
                   + scalarNames.size()
@@ -1234,7 +1234,7 @@ int main(int argc, char *argv[])
                 );
 
                 // Write number of fields
-                writer.writeParcelHeader(0);
+                writer.writeFieldsHeader(0);
             }
         }
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C
index e2735cc77f..832bd17973 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C
@@ -89,7 +89,7 @@ Foam::lagrangianWriter::lagrangianWriter
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::lagrangianWriter::writeParcelHeader(const label nFields)
+void Foam::lagrangianWriter::writeFieldsHeader(const label nFields)
 {
     os_ << "POINT_DATA " << nParcels_ << std::endl
         << "FIELD attributes " << nFields
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H
index 3523c0f061..153b7166e2 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H
@@ -25,7 +25,7 @@ Class
     Foam::lagrangianWriter
 
 Description
-    Write fields (internal).
+    Writes Lagrangian points and fields
 
 SourceFiles
     lagrangianWriter.C
@@ -36,13 +36,8 @@ SourceFiles
 #ifndef lagrangianWriter_H
 #define lagrangianWriter_H
 
-#include "OFstream.H"
-#include "Cloud.H"
-#include "volFields.H"
-#include "pointFields.H"
 #include "vtkMesh.H"
-
-using namespace Foam;
+#include <fstream>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -87,12 +82,8 @@ public:
 
     // Member Functions
 
-        std::ofstream& os()
-        {
-            return os_;
-        }
-
-        void writeParcelHeader(const label nFields);
+        //- Write the fields header specifying the number of fields
+        void writeFieldsHeader(const label nFields);
 
         //- Write IOField
         template<class Type>
@@ -110,7 +101,6 @@ public:
     #include "lagrangianWriterTemplates.C"
 #endif
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C
index a2106e994b..2bd4074c2e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C
@@ -25,6 +25,7 @@ License
 
 #include "lagrangianWriter.H"
 #include "vtkWriteFieldOps.H"
+#include "Cloud.H"
 #include "IOField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //