mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
Addressed comments brought up in review
Changed back the way the propsDict is read/constructed Changed back the behaviour of verbose
This commit is contained in:
@ -62,14 +62,23 @@ execute::execute
|
|||||||
)
|
)
|
||||||
:
|
:
|
||||||
liggghtsCommandModel(dict,sm,i),
|
liggghtsCommandModel(dict,sm,i),
|
||||||
propsDict_(dict.subOrEmptyDict(typeName + "Props")),
|
|
||||||
nrModel_(i),
|
nrModel_(i),
|
||||||
commandList_(wordList(propsDict_.lookup("command"))),
|
propsDict_(),
|
||||||
|
commandList_(),
|
||||||
command_(""),
|
command_(""),
|
||||||
scalarList_(0),
|
scalarList_(0),
|
||||||
labelList_(0),
|
labelList_(0),
|
||||||
timeStamp_(false)
|
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
|
// read list of scalars
|
||||||
if (propsDict_.found("scalars"))
|
if (propsDict_.found("scalars"))
|
||||||
{
|
{
|
||||||
@ -85,7 +94,7 @@ execute::execute
|
|||||||
// check if verbose
|
// check if verbose
|
||||||
if (propsDict_.found("verbose"))
|
if (propsDict_.found("verbose"))
|
||||||
{
|
{
|
||||||
verbose_ = propsDict_.lookup("verbose");
|
verbose_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
parseCommandList(commandList_, labelList_, scalarList_, command_, propsDict_, timeStamp_);
|
parseCommandList(commandList_, labelList_, scalarList_, command_, propsDict_, timeStamp_);
|
||||||
|
|||||||
@ -57,10 +57,10 @@ class execute
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
|
||||||
dictionary propsDict_;
|
|
||||||
|
|
||||||
int nrModel_;
|
int nrModel_;
|
||||||
|
|
||||||
|
dictionary propsDict_;
|
||||||
|
|
||||||
wordList commandList_;
|
wordList commandList_;
|
||||||
|
|
||||||
word command_;
|
word command_;
|
||||||
|
|||||||
@ -62,12 +62,22 @@ readLiggghtsData::readLiggghtsData
|
|||||||
)
|
)
|
||||||
:
|
:
|
||||||
liggghtsCommandModel(dict,sm,i),
|
liggghtsCommandModel(dict,sm,i),
|
||||||
propsDict_(dict.subOrEmptyDict(typeName + "Props")),
|
|
||||||
nrModel_(i),
|
nrModel_(i),
|
||||||
insertionNr_(readLabel(propsDict_.lookup("startIndex"))),
|
propsDict_(),
|
||||||
|
insertionNr_(),
|
||||||
command_("read_data"),
|
command_("read_data"),
|
||||||
filePathList_(0)
|
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"))
|
if (propsDict_.found("exactTiming"))
|
||||||
{
|
{
|
||||||
exactTiming_ = propsDict_.lookup("exactTiming");
|
exactTiming_ = propsDict_.lookup("exactTiming");
|
||||||
@ -76,7 +86,7 @@ readLiggghtsData::readLiggghtsData
|
|||||||
|
|
||||||
if (propsDict_.found("verbose"))
|
if (propsDict_.found("verbose"))
|
||||||
{
|
{
|
||||||
verbose_ = propsDict_.lookup("verbose");
|
verbose_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// read command from dict
|
// read command from dict
|
||||||
|
|||||||
@ -56,10 +56,10 @@ class readLiggghtsData
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
|
||||||
dictionary propsDict_;
|
|
||||||
|
|
||||||
int nrModel_;
|
int nrModel_;
|
||||||
|
|
||||||
|
dictionary propsDict_;
|
||||||
|
|
||||||
int insertionNr_;
|
int insertionNr_;
|
||||||
|
|
||||||
word command_;
|
word command_;
|
||||||
|
|||||||
Reference in New Issue
Block a user