zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix usage of cg-scaling transfered from LIGGGHTS

Browse Source 
fixes https://github.com/ParticulateFlow/CFDEMcoupling-PFM/issues/1
This commit is contained in:
danielque
2021-07-01 16:02:53 +02:00
parent f847ceeefe
commit a5a811e436
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
View File

@ -284,7 +284,7 @@ void heatTransferGunn::calcEnergyContribution()
vector Us(0,0,0);
scalar ds(0);
scalar ds_scaled(0);
scalar scaleDia3 = typeCG_[0]*typeCG_[0]*typeCG_[0];
scalar scaleDia3 = scaleDia_*scaleDia_*scaleDia_;
scalar muf(0);
scalar magUr(0);
scalar Rep(0);
@ -293,7 +293,7 @@ void heatTransferGunn::calcEnergyContribution()
scalar Tsum(0.0);
scalar Nsum(0.0);
scalar cg = typeCG_[0];
scalar cg = scaleDia_;
label partType = 1;
interpolationCellPoint<scalar> voidfractionInterpolator_(voidfraction_);

4
src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferRanzMarshall/heatTransferRanzMarshall.C
View File

@ -284,7 +284,7 @@ void heatTransferRanzMarshall::calcEnergyContribution()
vector Us(0,0,0);
scalar ds(0);
scalar ds_scaled(0);
scalar scaleDia3 = typeCG_[0]*typeCG_[0]*typeCG_[0];
scalar scaleDia3 = scaleDia_*scaleDia_*scaleDia_;
scalar muf(0);
scalar magUr(0);
scalar Rep(0);
@ -293,7 +293,7 @@ void heatTransferRanzMarshall::calcEnergyContribution()
scalar Tsum(0.0);
scalar Nsum(0.0);
scalar cg = typeCG_[0];
scalar cg = scaleDia_;
label partType = 1;
interpolationCellPoint<scalar> voidfractionInterpolator_(voidfraction_);

5
src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C
View File

@ -153,7 +153,6 @@ void BeetstraDrag::setForce() const
else if (particleCloud_.cg() > 1)
{
scaleDia_=particleCloud_.cg();
typeCG_[0] = scaleDia_;
Info << "Beetstra using scale from liggghts cg = " << scaleDia_ << endl;
}
@ -171,7 +170,7 @@ void BeetstraDrag::setForce() const
scalar ds(0);
scalar ds_scaled(0);
scalar dSauter(0);
scalar scaleDia3 = typeCG_[0]*typeCG_[0]*typeCG_[0];
scalar scaleDia3 = scaleDia_*scaleDia_*scaleDia_;
scalar nuf(0);
scalar rho(0);
scalar magUr(0);
@ -180,7 +179,7 @@ void BeetstraDrag::setForce() const
scalar GCcorr(1.);
scalar PCcorr(1.);
scalar cg = typeCG_[0];
scalar cg = scaleDia_;
label partType = 1;
vector dragExplicit(0,0,0);