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

clean-up and pretty formatting of liggghtsCommandModel and its derived classes

Browse Source 
removed an unused member "int stdInterval_" of the class runLiggghts
This commit is contained in:
Gerhard Holzinger
2017-10-23 17:39:18 +02:00
parent e329da4227
commit 963b717811
7 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/writeLiggghts/writeLiggghts.C
View File

@ -77,41 +77,49 @@ writeLiggghts::writeLiggghts
if (propsDict_.found("path"))
{
path_=fileName(propsDict_.lookup("path"));
path_ = fileName(propsDict_.lookup("path"));
if (!checkPath(path_))
FatalError<<"The path you provided in writeLiggghtsProps is incorrect: " << path_ << "\n" << abort(FatalError);
{
FatalError << "The path you provided in writeLiggghtsProps is incorrect: " << path_ << "\n" << abort(FatalError);
}
else
{
Info << "Using user defined path to write LIGGGHTS restart file: " << path_ << endl;
}
}
if(propsDict_.found("writeName"))
if (propsDict_.found("writeName"))
{
propsDict_.lookup("writeName") >> writeName_;
}
if (!writeLast_ && propsDict_.found("overwrite"))
{
overwrite_=Switch(propsDict_.lookup("overwrite"));
overwrite_ = Switch(propsDict_.lookup("overwrite"));
}
if(writeLast_)
if (writeLast_)
{
runLast_=true;
runLast_ = true;
}
else
{
//Warning << "Using invalid options of writeLiggghts, please use 'writeLast' option." << endl;
runEveryWriteStep_=true;
runEveryWriteStep_ = true;
}
command_ += " " + path_ + "/" + writeName_;
if(overwrite_)
if (overwrite_)
{
strCommand_=string(command_);
}
else
{
command_ += "_";
}
Info << "writeLiggghts: A restart file writeName_"<< command_ <<" is written." << endl;
Info << "writeLiggghts: A restart file writeName_" << command_ << " is written." << endl;
checkTimeSettings(dict_);
}
@ -132,7 +140,7 @@ const char* writeLiggghts::command(int commandLine)
bool writeLiggghts::runCommand(int couplingStep)
{
if(!overwrite_) strCommand_=addTimeStamp(command_);
if (!overwrite_) strCommand_ = addTimeStamp(command_);
return runThisCommand(couplingStep);
}