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

Merge branch 'develop' into feature/adaptive_resolution_universe

Browse Source 
# Conflicts:
#	src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H
This commit is contained in:
Daniel Queteschiner
2019-10-23 20:11:49 +02:00
parent cab6b7e88f 7854673f21
commit 4cfce8bc6c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,7 +400,7 @@ public:
// write cfdemCloud internal data
inline void setPositions(label n,double* pos);
inline void setCellIDs(label n,int* ID);
inline void setCellIDs(labelList const& IDs);
inline void setCellIDs(DynamicList<label> const& IDs);
inline void setImpDEMdrag(bool flag) { impDEMdrag_ = flag; }
inline void setImpDEMdragAcc(bool flag) { impDEMdragAcc_ = flag; }

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

@ -63,7 +63,7 @@ inline void cfdemCloud::setCellIDs(label n,int* ID)
cellIDs_[i][0]=ID[i];
}
inline void cfdemCloud::setCellIDs(labelList const& IDs)
inline void cfdemCloud::setCellIDs(DynamicList<label> const& IDs)
{
for (int i=0; i<IDs.size(); ++i)
cellIDs_[i][0] = IDs[i];