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 per-particle voidfraction in trilinear model

Browse Source 
all particles incorrectly received the voidfraction of the same 8 cells
closes #106
This commit is contained in:
danielque
2020-07-30 13:18:08 +02:00
parent d4e6ec2e39
commit 3ffc8eef65
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.C
View File

@ -350,12 +350,6 @@ void trilinearVoidFraction::setvoidFraction(double** const& mask,double**& voidf
alphaLimited = true; alphaLimited = true;
} }
if(index==0 && alphaLimited) Info<<"alpha limited to" <<alphaMin_<<endl;*/ if(index==0 && alphaLimited) Info<<"alpha limited to" <<alphaMin_<<endl;*/
// store voidFraction for each particle
voidfractions[index][0] = voidfractionNext_[cellI];
// store cellweight for each particle - this should not live here
particleWeights[index][0] = 1.;
} }
} }
voidfractionNext_.correctBoundaryConditions(); voidfractionNext_.correctBoundaryConditions();
@ -363,23 +357,18 @@ void trilinearVoidFraction::setvoidFraction(double** const& mask,double**& voidf
// bring voidfraction from Eulerian Field to particle array // bring voidfraction from Eulerian Field to particle array
for (int index = 0; index < particleCloud_.numberOfParticles(); ++index) for (int index = 0; index < particleCloud_.numberOfParticles(); ++index)
{ {
label cellID = particleCloud_.cellIDs()[index][0]; for (int subcell = 0; subcell < maxCellsPerParticle_; ++subcell)
{
label cellID = particleCloud_.cellIDs()[index][subcell];
if (cellID >= 0) if (cellID >= 0)
{ {
voidfractions[index][0] = voidfractionNext_[i000]; voidfractions[index][subcell] = voidfractionNext_[cellID];
voidfractions[index][1] = voidfractionNext_[i100];
voidfractions[index][2] = voidfractionNext_[i110];
voidfractions[index][3] = voidfractionNext_[i010];
voidfractions[index][4] = voidfractionNext_[i001];
voidfractions[index][5] = voidfractionNext_[i101];
voidfractions[index][6] = voidfractionNext_[i111];
voidfractions[index][7] = voidfractionNext_[i011];
} }
else else
{ {
for (int i = 0; i < 8; ++i) voidfractions[index][subcell] = -1.;
voidfractions[index][i] = -1.; }
} }
} }
} }