diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.C b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.C index 3b79f718..3b8a4c94 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.C +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.C @@ -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_); diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H index 477c97d1..d3349400 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/execute/execute.H @@ -57,10 +57,10 @@ class execute { private: - dictionary propsDict_; - int nrModel_; + dictionary propsDict_; + wordList commandList_; word command_; diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.C b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.C index 9c5b00e5..f06f40bc 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.C +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.C @@ -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 diff --git a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H index 6cd26e31..68f8ed87 100644 --- a/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H +++ b/src/lagrangian/cfdemParticle/subModels/liggghtsCommandModel/readLiggghtsData/readLiggghtsData.H @@ -56,10 +56,10 @@ class readLiggghtsData { private: - dictionary propsDict_; - int nrModel_; + dictionary propsDict_; + int insertionNr_; word command_;