Merge branch 'feature/aLittleConstBeauty' of https://github.com/ParticulateFlow/CFDEMcoupling into feature/aLittleConstBeauty

This commit is contained in:
danielque
2018-10-01 13:32:05 +02:00

View File

@ -61,14 +61,11 @@ noDrag::noDrag
)
:
forceModel(dict,sm),
propsDict_(dict),
propsDict_(dict.subDict(word(typeName + "Props"))),
verbose_(propsDict_.found("verbose")),
noDEMForce_(propsDict_.found("noDEMForce")),
keepCFDForce_(propsDict_.found("keepCFDForce"))
{
if(dict.found(word(typeName + "Props")))
propsDict_=dictionary(dict.subDict(typeName + "Props"));
// init force sub model
setForceSubModels(propsDict_);