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

remove commented out code

Browse Source
This commit is contained in:
danielque
2017-08-21 13:17:26 +02:00
parent 1213c90a50
commit 116bf952ab
2 changed files with 0 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C
View File

@ -37,7 +37,6 @@ Description
#include "dataExchangeModel.H"
#include <math.h>
//#include <mpi.h>
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
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<cellsPerParticle_[index][0];i++)
{
if(i==0)Info << "cellids, voidfractions, particleWeights, : \n";
Info << particleCloud_.cellIDs()[index][i] << " ," << endl;
Info << voidfractions[index][i] << " ," << endl;
Info << particleWeights[index][i] << " ," << endl;
}
}*/
}// end if in cell
//}// end if in mask
}// end loop all particles
@ -295,35 +278,6 @@ void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfra
//scalar voidfractionAtPos(0);
for(int index=0; index < particleCloud_.numberOfParticles(); index++)
{
/*if(interpolation_)
{
label cellI = particleCloud_.cellIDs()[index][0];
if(cellI >= 0)
{
position = particleCloud_.position(index);
voidfractionAtPos=voidfractionInterpolator_.interpolate(position,cellI);
}else{
voidfractionAtPos=-1;
}
for(int subcell=0;subcell<cellsPerParticle_[index][0];subcell++)
{
label cellID = particleCloud_.cellIDs()[index][subcell];
if(cellID >= 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++)
{

16
src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C
View File

@ -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_;