zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory allocation to consider particles

Browse Source
This commit is contained in:
Efe Kinaci
2016-08-11 08:47:37 +02:00
parent 42eacb256c
commit cfe4254674
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.C
View File

@ -159,32 +159,34 @@ species::species
species::~species()
{
int len = particleCloud_.numberOfParticles();
if (particleCloud_.dataExchangeM().maxNumberOfParticles() > 0)
{
particleCloud_.dataExchangeM().destroy(partTemp_,nP_);
particleCloud_.dataExchangeM().destroy(partRho_,nP_);
particleCloud_.dataExchangeM().destroy(partTemp_,len);
particleCloud_.dataExchangeM().destroy(partRho_,len);
for (int i=0; i<speciesNames_.size(); i++)
{
particleCloud_.dataExchangeM().destroy(concentrations_[i],len);
particleCloud_.dataExchangeM().destroy(changeOfSpeciesMass_[i],len);
}
for (int i=0; i<speciesNames_.size(); i++)
{
particleCloud_.dataExchangeM().destroy(concentrations_[i],nP_);
particleCloud_.dataExchangeM().destroy(changeOfSpeciesMass_[i],nP_);
}
}
}
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //
void species::allocateMyArrays() const
{
// could be implemented similarly as forcemodel LaEuScalarTemp
// get memory for 2d arrays
double initVal=0.0;
particleCloud_.dataExchangeM().allocateArray(partRho_,initVal,1,"nparticles");
particleCloud_.dataExchangeM().allocateArray(partTemp_,initVal,1,"nparticles");
for (int i=0; i<speciesNames_.size(); i++)
if (particleCloud_.dataExchangeM().maxNumberOfParticles() > 0)
{
particleCloud_.dataExchangeM().allocateArray(concentrations_[i],initVal,1,"nparticles");
particleCloud_.dataExchangeM().allocateArray(changeOfSpeciesMass_[i],initVal,1,"nparticles");
// get memory for 2d arrays
double initVal=0.0;
particleCloud_.dataExchangeM().allocateArray(partRho_,initVal,1,"nparticles");
particleCloud_.dataExchangeM().allocateArray(partTemp_,initVal,1,"nparticles");
for (int i=0; i<speciesNames_.size(); i++)
{
particleCloud_.dataExchangeM().allocateArray(concentrations_[i],initVal,1,"nparticles");
particleCloud_.dataExchangeM().allocateArray(changeOfSpeciesMass_[i],initVal,1,"nparticles");
}
}
}

5
src/lagrangian/cfdemParticle/subModels/chemistryModel/species/species.H
View File

@ -87,6 +87,8 @@ private:
word partRhoName_;
mutable double **partRho_; // gas density at particle positions
int nP_ = particleCloud_.numberOfParticles();
//word velFieldName_; // when velocity is to be calculated in the species source code
@ -98,6 +100,7 @@ private:
void allocateMyArrays() const;
// void reAllocMyArrays() const;
public:
@ -121,6 +124,8 @@ public:
// Member Functions
void execute();
// tmp<fvScalarMatrix> Smi(const label i) const;