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

create OFstream on stack instead of heap

Browse Source
This commit is contained in:
danielque
2017-08-23 17:45:58 +02:00
parent 76b90cc3cc
commit 6343a6a09c
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,17 +96,17 @@ fileName IOModel::buildFilePath(word dirName) const
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,word finaliser) const
{ {
OFstream* fileStream = new OFstream(fileName(path/name)); OFstream fileStream(path/name);
*fileStream << "FoamFile\n"; fileStream << "FoamFile\n";
*fileStream << "{version 2.0; format ascii;class "<< className << "; location 0;object "<< name <<";}\n"; fileStream << "{version 2.0; format ascii;class "<< className << "; location 0;object "<< name <<";}\n";
*fileStream << nPProc <<"\n"; fileStream << nPProc <<"\n";
if(type!="origProcId")*fileStream << "(\n"; if(type!="origProcId") fileStream << "(\n";
else if(type=="origProcId") else if(type=="origProcId")
{ {
if(nPProc>0) *fileStream <<"{0}"<< "\n"; if(nPProc>0) fileStream <<"{0}"<< "\n";
else *fileStream <<"{}"<< "\n"; else fileStream <<"{}"<< "\n";
} }
for(int index = 0;index < particleCloud_.numberOfParticles(); ++index) for(int index = 0;index < particleCloud_.numberOfParticles(); ++index)
@ -114,17 +114,16 @@ void IOModel::streamDataToPath(fileName path, double** array,int nPProc,word nam
if (particleCloud_.cellIDs()[index][0] > -1) // particle Found if (particleCloud_.cellIDs()[index][0] > -1) // particle Found
{ {
if (type=="scalar"){ if (type=="scalar"){
*fileStream << array[index][0] << " \n"; fileStream << array[index][0] << " \n";
}else if (type=="position" || type=="vector"){ }else if (type=="position" || type=="vector"){
*fileStream <<"( "<< array[index][0] <<" "<<array[index][1]<<" "<<array[index][2]<<" ) "<< finaliser << " \n"; fileStream <<"( "<< array[index][0] <<" "<<array[index][1]<<" "<<array[index][2]<<" ) "<< finaliser << " \n";
}else if (type=="label"){ }else if (type=="label"){
*fileStream << index << finaliser << " \n"; fileStream << index << finaliser << " \n";
} }
} }
} }
if(type!="origProcId")*fileStream << ")\n"; if(type!="origProcId") fileStream << ")\n";
delete fileStream;
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //