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 mutables from voidFractionModel classes

Browse Source
This commit is contained in:
danielque
2018-10-01 17:56:04 +02:00
parent 583e1ff3bb
commit 2c46466a06
16 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
View File

@ -373,6 +373,7 @@ public:
inline const wordList& forceModels() const;
inline voidFractionModel& voidFractionM();
inline const voidFractionModel& voidFractionM() const;
inline const locateModel& locateM() const;

8
src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H
View File

@ -319,9 +319,15 @@ inline probeModel& cfdemCloud::probeM()
return probeModel_();
}
inline voidFractionModel& cfdemCloud::voidFractionM()
{
return voidFractionModel_();
}
inline const voidFractionModel& cfdemCloud::voidFractionM() const
{
return voidFractionModel_;
return voidFractionModel_();
}
inline averagingModel& cfdemCloud::averagingM()
{

2
src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C
View File

@ -87,7 +87,7 @@ GaussVoidFraction::~GaussVoidFraction()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void GaussVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const
void GaussVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV)
{
reAllocArrays();

4
src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.H
View File

@ -63,7 +63,7 @@ private:
const scalar alphaMin_; //NP min value of voidFraction
mutable bool alphaLimited_;
bool alphaLimited_;
public:
@ -86,7 +86,7 @@ public:
// Member Functions
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const;
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&);
void buildLabelHashSet
(

4
src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C
View File

@ -87,7 +87,7 @@ IBVoidFraction::~IBVoidFraction()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void IBVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const
void IBVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV)
{
const boundBox& globalBb = particleCloud_.mesh().bounds();
@ -306,7 +306,7 @@ void IBVoidFraction::buildLabelHashSet
const label cellID,
labelHashSet& hashSett,
bool initialInsert //initial insertion of own cell
)const
)
{
if(initialInsert)
hashSett.insert(cellID);

6
src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.H
View File

@ -64,7 +64,7 @@ private:
const scalar alphaMin_; //NP min value of voidFraction
mutable bool alphaLimited_;
bool alphaLimited_;
const scalar scaleUpVol_; //NP scaling radius, keeping volume of particle
@ -91,7 +91,7 @@ public:
// Member Functions
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const;
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&);
void buildLabelHashSet
(
@ -100,7 +100,7 @@ public:
const label cellID,
labelHashSet& hashSett,
bool initialInsert
) const;
);
virtual double segmentParticleIntersection(int index, vector positionCenter, vector pointInside, vector pointOutside) const;
};

2
src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.C
View File

@ -86,7 +86,7 @@ bigParticleVoidFraction::~bigParticleVoidFraction()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void bigParticleVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const
void bigParticleVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV)
{
reAllocArrays();

4
src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.H
View File

@ -60,7 +60,7 @@ private:
const scalar alphaMin_; // min value of voidFraction
mutable bool alphaLimited_;
bool alphaLimited_;
public:
@ -83,7 +83,7 @@ public:
// Member Functions
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const;
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&);
void buildLabelHashSet
(

2
src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.C
View File

@ -78,7 +78,7 @@ centreVoidFraction::~centreVoidFraction()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void centreVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const
void centreVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV)
{
reAllocArrays();

4
src/lagrangian/cfdemParticle/subModels/voidFractionModel/centreVoidFraction/centreVoidFraction.H
View File

@ -60,7 +60,7 @@ private:
const scalar alphaMin_; //NP min value of voidFraction
mutable bool alphaLimited_;
bool alphaLimited_;
public:
@ -83,7 +83,7 @@ public:
// Member Functions
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const;
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&);
};

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

@ -156,7 +156,7 @@ dividedVoidFraction::~dividedVoidFraction()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes, double**& particleV) const
void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes, double**& particleV)
{
if (cfdemUseOnly_)
reAllocArrays(particleCloud_.numberOfParticles());

6
src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H
View File

@ -68,9 +68,9 @@ private:
const scalar alphaMin_; // min value of voidFraction
mutable bool alphaLimited_;
bool alphaLimited_;
mutable scalar tooMuch_; // particle volume which is lost due to voidFraction limitation
scalar tooMuch_; // particle volume which is lost due to voidFraction limitation
const bool interpolation_;
@ -104,7 +104,7 @@ public:
// Member Functions
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const;
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&);
};

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

@ -88,7 +88,7 @@ trilinearVoidFraction::~trilinearVoidFraction()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void trilinearVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV) const
void trilinearVoidFraction::setvoidFraction(double** const& mask,double**& voidfractions,double**& particleWeights,double**& particleVolumes,double**& particleV)
{
reAllocArrays();

2
src/lagrangian/cfdemParticle/subModels/voidFractionModel/trilinearVoidFraction/trilinearVoidFraction.H
View File

@ -88,7 +88,7 @@ public:
// Member Functions
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&) const;
void setvoidFraction(double** const& ,double**&, double**&, double**&, double**&);
};

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

@ -112,7 +112,7 @@ tmp<volScalarField> voidFractionModel::voidFractionInterp() const
);
}
void voidFractionModel::resetVoidFractions() const
void voidFractionModel::resetVoidFractions()
{
voidfractionPrev_.ref() = voidfractionNext_.ref();
voidfractionNext_.ref() = 1.;
@ -128,7 +128,7 @@ int voidFractionModel::maxCellsPerParticle() const
return maxCellsPerParticle_;
}
void voidFractionModel::reAllocArrays() const
void voidFractionModel::reAllocArrays()
{
if(particleCloud_.numberOfParticlesChanged())
{
@ -137,7 +137,7 @@ void voidFractionModel::reAllocArrays() const
}
}
void voidFractionModel::reAllocArrays(int nP) const
void voidFractionModel::reAllocArrays(int nP)
{
if(particleCloud_.numberOfParticlesChanged())
{

32
src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.H
View File

@ -65,17 +65,17 @@ protected:
bool multiWeights_;
mutable volScalarField voidfractionPrev_;
volScalarField voidfractionPrev_;
mutable volScalarField voidfractionNext_;
volScalarField voidfractionNext_;
mutable int ** cellsPerParticle_;
int ** cellsPerParticle_;
int maxCellsPerParticle_;
mutable scalar weight_;
scalar weight_;
mutable scalar porosity_;
scalar porosity_;
// Protected member functions
@ -124,30 +124,32 @@ public:
// public member functions
virtual void setvoidFraction(double** const&,double**&,double**&,double**&,double**&) const = 0;
virtual void setvoidFraction(double** const&,double**&,double**&,double**&,double**&) = 0;
tmp<volScalarField> voidFractionInterp() const;
inline volScalarField& voidFractionPrev()const { return voidfractionPrev_; }
volScalarField& voidFractionPrev() { return voidfractionPrev_; }
const volScalarField& voidFractionPrev() const { return voidfractionPrev_; }
inline volScalarField& voidFractionNext()const { return voidfractionNext_; }
volScalarField& voidFractionNext() { return voidfractionNext_; }
const volScalarField& voidFractionNext() const { return voidfractionNext_; }
inline scalar weight()const { return weight_; }
scalar weight() const { return weight_; }
inline scalar weight(label index) const
scalar weight(label index) const
{
return particleCloud_.particleEffVolFactor(index);
}
inline scalar porosity()const { return porosity_; }
scalar porosity() const { return porosity_; }
inline void checkWeightNporosity(dictionary& propsDict) const
void checkWeightNporosity(dictionary& propsDict)
{
if (propsDict.found("weight")) weight_ = readScalar(propsDict.lookup("weight"));
if (propsDict.found("porosity")) porosity_ = readScalar(propsDict.lookup("porosity"));
}
void resetVoidFractions() const;
void resetVoidFractions();
//void undoVoidFractions(double**const&) const;
@ -155,9 +157,9 @@ public:
int maxCellsPerParticle() const;
void reAllocArrays() const;
void reAllocArrays();
void reAllocArrays(int nP) const; //force number of particles during reallocation, for CFD offline-use
void reAllocArrays(int nP); //force number of particles during reallocation, for CFD offline-use
virtual void setParticleType(label type) const {}