zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove unneeded parameter finaliser from IOModel::streamDataToPath

Browse Source
This commit is contained in:
danielque
2017-08-24 09:58:01 +02:00
parent 5e7b332dd9
commit 2e2701ccf7
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C
View File

@ -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);

2
src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.H
View File

@ -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;
};

6
src/lagrangian/cfdemParticle/subModels/IOModel/basicIO/basicIO.C
View File

@ -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_;
}

8
src/lagrangian/cfdemParticle/subModels/IOModel/sophIO/sophIO.C
View File

@ -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;
}

4
src/lagrangian/cfdemParticle/subModels/IOModel/trackIO/trackIO.C
View File

@ -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;