diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C index 36db2d47..734d3118 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C @@ -88,6 +88,8 @@ cfdemCloud::cfdemCloud getParticleDensities_(couplingProperties_.lookupOrDefault("getParticleDensities",false)), getParticleEffVolFactors_(couplingProperties_.lookupOrDefault("getParticleEffVolFactors",false)), getParticleTypes_(couplingProperties_.lookupOrDefault("getParticleTypes",false)), + streamingMode_(couplingProperties_.lookupOrDefault("streamingMode",false)), + streamingFluc_(couplingProperties_.lookupOrDefault("streamingFluc",false)), maxDEMForce_(0.), phaseInForcesTime_(couplingProperties_.lookupOrDefault("phaseInForcesTime",0.0)), modelType_(couplingProperties_.lookup("modelType")), @@ -438,15 +440,26 @@ void cfdemCloud::getDEMdata() void cfdemCloud::giveDEMdata() { - if(forceM(0).coupleForce()) + if (forceM(0).coupleForce()) { - dataExchangeM().giveData("dragforce","vector-atom",DEMForces_); - - if(impDEMdrag_) + if (!streamingMode_) { - if(verbose_) Info << "sending Ksl and uf" << endl; - dataExchangeM().giveData("Ksl","scalar-atom",Cds_); - dataExchangeM().giveData("uf","vector-atom",fluidVel_); + dataExchangeM().giveData("dragforce","vector-atom",DEMForces_); + + if (impDEMdrag_) + { + if (verbose_) Info << "sending Ksl and uf" << endl; + dataExchangeM().giveData("Ksl","scalar-atom",Cds_); + dataExchangeM().giveData("uf","vector-atom",fluidVel_); + } + } + else + { + dataExchangeM().giveData("vrec","vector-atom",particleConvVel_); + if (streamingFluc_) + { + dataExchangeM().giveData("vfluc","vector-atom",particleFlucVel_); + } } } if(verbose_) Info << "giveDEMdata done." << endl; diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index 636c2c18..fe8babfd 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -105,6 +105,10 @@ protected: const bool getParticleTypes_; + const bool streamingMode_; + + const bool streamingFluc_; + scalar maxDEMForce_; scalar phaseInForcesTime_;