diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.C b/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.C index 98064a76..7ea9532e 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.C @@ -57,18 +57,18 @@ terminalVelocity::terminalVelocity forceModel(dict,sm), propsDict_(dict.subDict(typeName + "Props")), interpolate_(propsDict_.lookupOrDefault("interpolation", false)), + mesh_(sm.mesh()), ignoreCellsName_(propsDict_.lookupOrDefault("ignoreCellsName","none")), ignoreCells_(), existIgnoreCells_(true), - mesh_(sm.mesh()), // turbKineticEnergyFieldName_(propsDict_.lookupOrDefault("turbKineticEnergyFieldName","")), // turbDissipationRateFieldName_(propsDict_.lookupOrDefault("turbDissipationRateFieldName","")), // turbKineticEnergy_(NULL), + existturbDissipationRateInObjReg_(false), + turbulenceCorrection_(propsDict_.lookupOrDefault("turbulenceCorrection",false)), turbDissipationRate_(NULL), // recurrenceBaseName_(propsDict_.lookupOrDefault("recurrenceBaseName","")), // recurrenceBase_(NULL), - existturbDissipationRateInObjReg_(false), - turbulenceCorrection_(propsDict_.lookupOrDefault("turbulenceCorrection",false)), // delta( IOobject // ( // "delta", diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.H b/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.H index 8b5d1338..a2ae7e09 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/terminalVelocity/terminalVelocity.H @@ -66,16 +66,16 @@ private: // volScalarField* turbKineticEnergy_; + bool existturbDissipationRateInObjReg_; + + bool turbulenceCorrection_; + volScalarField* turbDissipationRate_; // mutable volScalarField delta; mutable volScalarField wallIndicatorField_; - bool existturbDissipationRateInObjReg_; - - bool turbulenceCorrection_; - scalar liquidViscosity_; // drag reduction factor in turbulent flow diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.H b/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.H index c324b274..ad146cee 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/turbulentDispersion/turbulentDispersion.H @@ -78,8 +78,6 @@ protected: mutable volScalarField delta_; - scalar Ck_; - scalar dt_; scalar turbulentSchmidtNumber_; @@ -90,10 +88,12 @@ protected: scalar critVoidfraction_; - virtual vector unitFlucDir() const; + scalar Ck_; mutable Random ranGen_; + virtual vector unitFlucDir() const; + bool ignoreCell(label) const; public: