diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C index b5f13e8a..436f0b15 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C @@ -37,7 +37,6 @@ Description #include "dataExchangeModel.H" #include -//#include // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -265,22 +264,6 @@ void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfra particleVolumes[index][0] += volume*centreWeight; particleV[index][0] += volume*centreWeight; } - - /*//OUTPUT - if (index==0 && verbose_) - { - Info << "centre cellID = " << cellID << endl; - Info << "cellsPerParticle_=" << cellsPerParticle_[index][0] << endl; - - for(int i=0;i= 0) - { - position = particleCloud_.position(index); - voidfractionAtPos=voidfractionInterpolator_.interpolate(position,cellI); - }else{ - voidfractionAtPos=-1; - } - - for(int subcell=0;subcell= 0) - { - if(voidfractionAtPos > 0) - voidfractions[index][subcell] = voidfractionAtPos; - else - voidfractions[index][subcell] = voidfractionNext_[cellID]; - } - else - { - voidfractions[index][subcell] = -1.; - } - } - } - else*/ { for (int subcell=0; subcell < cellsPerParticle_[index][0]; subcell++) { diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C index b1ae3e78..38cb8cdd 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C @@ -126,22 +126,6 @@ void voidFractionModel::resetVoidFractions() const voidfractionNext_.ref() = 1.; } -/*void voidFractionModel::undoVoidFractions(double**const& mask) const -{ - voidfractionPrev_.internalField() = voidfractionNext_.internalField(); - - for(int index=0; index< particleCloud_.numberOfParticles(); index++) - { - if(mask[index][0]) - { - // undo voidfraction cause by particle - label cellI = particleCloud_.cellIDs()[index][0]; - scalar cellVolume=voidfractionNext_.mesh().V()[cellI]; - voidfractionNext_[cellI] += particleCloud_.particleVolumes()[index][0]/cellVolume; - } - } -}*/ - int** const& voidFractionModel::cellsPerParticle() const { return cellsPerParticle_;