From a5a811e4361dc782a6444e9e4b9d2950edbc0c4e Mon Sep 17 00:00:00 2001 From: danielque Date: Thu, 1 Jul 2021 16:02:53 +0200 Subject: [PATCH] fix usage of cg-scaling transfered from LIGGGHTS fixes https://github.com/ParticulateFlow/CFDEMcoupling-PFM/issues/1 --- .../energyModel/heatTransferGunn/heatTransferGunn.C | 4 ++-- .../heatTransferRanzMarshall/heatTransferRanzMarshall.C | 4 ++-- .../subModels/forceModel/BeetstraDrag/BeetstraDrag.C | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C index 11064fa0..f62f3d35 100644 --- a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C +++ b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C @@ -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 voidfractionInterpolator_(voidfraction_); diff --git a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferRanzMarshall/heatTransferRanzMarshall.C b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferRanzMarshall/heatTransferRanzMarshall.C index 2b5a4e7c..ad3cbfb0 100644 --- a/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferRanzMarshall/heatTransferRanzMarshall.C +++ b/src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferRanzMarshall/heatTransferRanzMarshall.C @@ -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 voidfractionInterpolator_(voidfraction_); diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C index e4eef410..86ddc04e 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C @@ -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);