From 2e2701ccf7d63df5fa3a22b60bbecba271cec665 Mon Sep 17 00:00:00 2001
From: danielque <daniel.queteschiner@jku.at>
Date: Thu, 24 Aug 2017 09:58:01 +0200
Subject: [PATCH] remove unneeded parameter finaliser from
 IOModel::streamDataToPath

---
 .../cfdemParticle/subModels/IOModel/IOModel/IOModel.C     | 2 +-
 .../cfdemParticle/subModels/IOModel/IOModel/IOModel.H     | 2 +-
 .../cfdemParticle/subModels/IOModel/basicIO/basicIO.C     | 6 +++---
 .../cfdemParticle/subModels/IOModel/sophIO/sophIO.C       | 8 ++++----
 .../cfdemParticle/subModels/IOModel/trackIO/trackIO.C     | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C
index 4d03d9ac..a6b62e6c 100644
--- a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C
+++ b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C
@@ -94,7 +94,7 @@ fileName IOModel::buildFilePath(word dirName) const
     return path;
 }
 
-void IOModel::streamDataToPath(fileName path, double** array,int nPProc,word name,word type,word className,word finaliser) const
+void IOModel::streamDataToPath(fileName path, double** array,int nPProc,word name,word type,word className) const
 {
     OFstream fileStream(path/name);
 
diff --git a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H
index d266fc0b..f0329302 100644
--- a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H
+++ b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H
@@ -121,7 +121,7 @@ public:
 
     fileName buildFilePath(word) const;
 
-    void streamDataToPath(fileName,double**,int,word,word type,word className,word finaliser) const;
+    void streamDataToPath(fileName,double**,int,word,word type,word className) const;
 };
 
 
diff --git a/src/lagrangian/cfdemParticle/subModels/IOModel/basicIO/basicIO.C b/src/lagrangian/cfdemParticle/subModels/IOModel/basicIO/basicIO.C
index 67f26361..9a3d27f4 100644
--- a/src/lagrangian/cfdemParticle/subModels/IOModel/basicIO/basicIO.C
+++ b/src/lagrangian/cfdemParticle/subModels/IOModel/basicIO/basicIO.C
@@ -102,9 +102,9 @@ int basicIO::dumpDEMdata() const
         nPProc_ = count;
 
         // stream data to file
-        streamDataToPath(lagPath_, particleCloud_.positions(),nPProc_,"positions","position","Cloud<passiveParticle>","0");
-        streamDataToPath(lagPath_, particleCloud_.velocities(),nPProc_,"v","vector","vectorField","");
-        streamDataToPath(lagPath_, particleCloud_.radii(),nPProc_,"r","scalar","scalarField","");
+        streamDataToPath(lagPath_, particleCloud_.positions(),nPProc_,"positions","position","Cloud<passiveParticle>");
+        streamDataToPath(lagPath_, particleCloud_.velocities(),nPProc_,"v","vector","vectorField");
+        streamDataToPath(lagPath_, particleCloud_.radii(),nPProc_,"r","scalar","scalarField");
     }
     return nPProc_;
 }
diff --git a/src/lagrangian/cfdemParticle/subModels/IOModel/sophIO/sophIO.C b/src/lagrangian/cfdemParticle/subModels/IOModel/sophIO/sophIO.C
index e540c5a6..2a400c79 100644
--- a/src/lagrangian/cfdemParticle/subModels/IOModel/sophIO/sophIO.C
+++ b/src/lagrangian/cfdemParticle/subModels/IOModel/sophIO/sophIO.C
@@ -84,10 +84,10 @@ int sophIO::dumpDEMdata() const
         npProcs=basicIO::dumpDEMdata();
 
         // stream data to file
-        streamDataToPath(lagPath_, particleCloud_.voidfractions(),npProcs,"voidfractions","scalar","scalarField","");
-        streamDataToPath(lagPath_, particleCloud_.impForces(),npProcs,"impForces","vector","vectorField","");
-        streamDataToPath(lagPath_, particleCloud_.expForces(),npProcs,"expForces","vector","vectorField","");
-        streamDataToPath(lagPath_, particleCloud_.DEMForces(),npProcs,"DEMForces","vector","vectorField","");
+        streamDataToPath(lagPath_, particleCloud_.voidfractions(),npProcs,"voidfractions","scalar","scalarField");
+        streamDataToPath(lagPath_, particleCloud_.impForces(),npProcs,"impForces","vector","vectorField");
+        streamDataToPath(lagPath_, particleCloud_.expForces(),npProcs,"expForces","vector","vectorField");
+        streamDataToPath(lagPath_, particleCloud_.DEMForces(),npProcs,"DEMForces","vector","vectorField");
     }
     return npProcs;
 }
diff --git a/src/lagrangian/cfdemParticle/subModels/IOModel/trackIO/trackIO.C b/src/lagrangian/cfdemParticle/subModels/IOModel/trackIO/trackIO.C
index 888a08fc..7fc9caa9 100644
--- a/src/lagrangian/cfdemParticle/subModels/IOModel/trackIO/trackIO.C
+++ b/src/lagrangian/cfdemParticle/subModels/IOModel/trackIO/trackIO.C
@@ -82,8 +82,8 @@ int trackIO::dumpDEMdata() const
         npProcs = sophIO::dumpDEMdata();
 
         // stream data to file
-        streamDataToPath(lagPath_, particleCloud_.velocities(),npProcs,"origId","label","labelField","");
-        streamDataToPath(lagPath_, particleCloud_.velocities(),npProcs,"origProcId","origProcId","labelField","");
+        streamDataToPath(lagPath_, particleCloud_.velocities(),npProcs,"origId","label","labelField");
+        streamDataToPath(lagPath_, particleCloud_.velocities(),npProcs,"origProcId","origProcId","labelField");
     }
 
     return npProcs;