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

include suggestions by @danielque.

Browse Source
This commit is contained in:
Paul Kieckhefen
2018-11-16 15:15:31 +01:00
parent a68a15272b
commit 4959ffc79f
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C
View File

@ -933,12 +933,6 @@ void twoWayOne2One::extractCollected(T*& src, T**& dst, int width) const
} }
} }
int twoWayOne2One::getNumberOfParticles() const
{
return particleCloud_.numberOfParticles();
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

24
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H
View File

@ -92,20 +92,20 @@ private:
// private data // private data
dictionary propsDict_; dictionary propsDict_;
mutable MPI_Comm comm_liggghts_; MPI_Comm comm_liggghts_;
// LIG ranks from which to retrieve particle data // LIG ranks from which to retrieve particle data
mutable labelList thisLigPartner_; labelList thisLigPartner_;
mutable labelList thisFoamPartner_; labelList thisFoamPartner_;
mutable One2One* lig2foam_; One2One* lig2foam_;
mutable One2One* foam2lig_; One2One* foam2lig_;
mutable bool* lig2foam_mask_; bool* lig2foam_mask_;
mutable int* lig2foam_ids_; int* lig2foam_ids_;
mutable int* foam2lig_ids_; int* foam2lig_ids_;
mutable double* lig2foam_vec_tmp_; mutable double* lig2foam_vec_tmp_;
mutable double* lig2foam_scl_tmp_; mutable double* lig2foam_scl_tmp_;
@ -113,9 +113,9 @@ private:
mutable double* foam2lig_vec_tmp_; mutable double* foam2lig_vec_tmp_;
mutable double* foam2lig_scl_tmp_; mutable double* foam2lig_scl_tmp_;
mutable Switch staticProcMap_; Switch staticProcMap_;
mutable Switch cellIdComm_; Switch cellIdComm_;
mutable LAMMPS_NS::FixPropertyAtom* my_prev_cell_ids_fix_; LAMMPS_NS::FixPropertyAtom* my_prev_cell_ids_fix_;
treeBoundBox thisFoamBox_; treeBoundBox thisFoamBox_;
@ -220,8 +220,6 @@ public:
int getNumberOfParticles() const; int getNumberOfParticles() const;
word myType() const { return typeName; }
void setCG() { particleCloud_.setCG(lmp->force->cg()); } void setCG() { particleCloud_.setCG(lmp->force->cg()); }
}; };