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

make couple() method of dataExchangeModel non-const

Browse Source 
method modifies at least one member that can be observed from outside
(i.e. couplingStep_)
This commit is contained in:
danielque
2018-10-03 13:13:22 +02:00
parent 7a32a19679
commit c7fd297b68
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.C
View File

@ -195,7 +195,7 @@ void dataExchangeModel::destroy(double* array) const
//==== //====
bool dataExchangeModel::couple(int i) const bool dataExchangeModel::couple(int i)
{ {
bool coupleNow = false; bool coupleNow = false;
if (doCoupleNow()) if (doCoupleNow())

4
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
View File

@ -62,7 +62,7 @@ protected:
int maxNumberOfParticles_; int maxNumberOfParticles_;
mutable int couplingStep_; int couplingStep_;
scalar DEMts_; scalar DEMts_;
@ -176,7 +176,7 @@ public:
virtual void destroy(double*) const; virtual void destroy(double*) const;
//==== //====
virtual bool couple(int) const; virtual bool couple(int);
virtual scalar timeStepFraction() const; virtual scalar timeStepFraction() const;

2
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C
View File

@ -204,7 +204,7 @@ void twoWayMPI::destroy(double* array) const
} }
//============ //============
bool twoWayMPI::couple(int i) const bool twoWayMPI::couple(int i)
{ {
bool coupleNow = false; bool coupleNow = false;
if (i==0) if (i==0)

2
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H
View File

@ -151,7 +151,7 @@ public:
void destroy(int*) const; void destroy(int*) const;
//============== //==============
bool couple(int) const; bool couple(int);
int getNumberOfParticles() const; int getNumberOfParticles() const;
int getNumberOfClumps() const; int getNumberOfClumps() const;

2
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.C
View File

@ -384,7 +384,7 @@ void inline twoWayMany2Many::destroy(int* array) const
//============== //==============
bool twoWayMany2Many::couple(int i) const bool twoWayMany2Many::couple(int i)
{ {
bool coupleNow = false; bool coupleNow = false;
if (i==0) if (i==0)

2
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/twoWayMany2Many.H
View File

@ -201,7 +201,7 @@ public:
void inline destroy(int*) const; void inline destroy(int*) const;
//============== //==============
bool couple(int) const; bool couple(int);
int getNumberOfParticles() const; int getNumberOfParticles() const;
int getNumberOfClumps() const; int getNumberOfClumps() const;