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

Addressed comments brought up in review

Browse Source 
Changed back the way the propsDict is read/constructed
Changed back the behaviour of verbose
This commit is contained in:
Gerhard Holzinger
2018-09-24 09:57:42 +02:00
parent f59b266279
commit 5c21513b64
4 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.C
View File

@ -62,14 +62,23 @@ execute::execute
)
:
liggghtsCommandModel(dict,sm,i),
propsDict_(dict.subOrEmptyDict(typeName + "Props")),
nrModel_(i),
commandList_(wordList(propsDict_.lookup("command"))),
propsDict_(),
commandList_(),
command_(""),
scalarList_(0),
labelList_(0),
timeStamp_(false)
{
// read propsDict
OStringStream oStrStream;
oStrStream << nrModel_;
propsDict_ = dict.subOrEmptyDict(typeName + "Props" + oStrStream.str());
// read command list
commandList_ = wordList(propsDict_.lookup("command"));
// read list of scalars
if (propsDict_.found("scalars"))
{
@ -85,7 +94,7 @@ execute::execute
// check if verbose
if (propsDict_.found("verbose"))
{
verbose_ = propsDict_.lookup("verbose");
verbose_ = true;
}
parseCommandList(commandList_, labelList_, scalarList_, command_, propsDict_, timeStamp_);

4
src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H
View File

@ -57,10 +57,10 @@ class execute
{
private:
dictionary propsDict_;
int nrModel_;
dictionary propsDict_;
wordList commandList_;
word command_;

16
src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.C
View File

@ -62,12 +62,22 @@ readLiggghtsData::readLiggghtsData
)
:
liggghtsCommandModel(dict,sm,i),
propsDict_(dict.subOrEmptyDict(typeName + "Props")),
nrModel_(i),
insertionNr_(readLabel(propsDict_.lookup("startIndex"))),
propsDict_(),
insertionNr_(),
command_("read_data"),
filePathList_(0)
{
// read propsDict
OStringStream oStrStream;
oStrStream << nrModel_;
propsDict_ = dict.subOrEmptyDict(typeName + "Props" + oStrStream.str());
// read insertion nr
insertionNr_ = readLabel(propsDict_.lookup("startIndex"));
if (propsDict_.found("exactTiming"))
{
exactTiming_ = propsDict_.lookup("exactTiming");
@ -76,7 +86,7 @@ readLiggghtsData::readLiggghtsData
if (propsDict_.found("verbose"))
{
verbose_ = propsDict_.lookup("verbose");
verbose_ = true;
}
// read command from dict

4
src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H
View File

@ -56,10 +56,10 @@ class readLiggghtsData
{
private:
dictionary propsDict_;
int nrModel_;
dictionary propsDict_;
int insertionNr_;
word command_;