From 4959ffc79f771e23c93c822201033a53f4a991f0 Mon Sep 17 00:00:00 2001 From: Paul Kieckhefen Date: Fri, 16 Nov 2018 15:15:31 +0100 Subject: [PATCH] include suggestions by @danielque. --- .../twoWayOne2One/twoWayOne2One.C | 6 ----- .../twoWayOne2One/twoWayOne2One.H | 24 +++++++++---------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C index 1e8c2197..f921dde4 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C @@ -933,12 +933,6 @@ void twoWayOne2One::extractCollected(T*& src, T**& dst, int width) const } } -int twoWayOne2One::getNumberOfParticles() const -{ - return particleCloud_.numberOfParticles(); -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H index 08abc600..e29bb6b4 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H @@ -92,20 +92,20 @@ private: // private data dictionary propsDict_; - mutable MPI_Comm comm_liggghts_; + MPI_Comm comm_liggghts_; // LIG ranks from which to retrieve particle data - mutable labelList thisLigPartner_; - mutable labelList thisFoamPartner_; + labelList thisLigPartner_; + labelList thisFoamPartner_; - mutable One2One* lig2foam_; - mutable One2One* foam2lig_; + One2One* lig2foam_; + One2One* foam2lig_; - mutable bool* lig2foam_mask_; + bool* lig2foam_mask_; - mutable int* lig2foam_ids_; - mutable int* foam2lig_ids_; + int* lig2foam_ids_; + int* foam2lig_ids_; mutable double* lig2foam_vec_tmp_; mutable double* lig2foam_scl_tmp_; @@ -113,9 +113,9 @@ private: mutable double* foam2lig_vec_tmp_; mutable double* foam2lig_scl_tmp_; - mutable Switch staticProcMap_; - mutable Switch cellIdComm_; - mutable LAMMPS_NS::FixPropertyAtom* my_prev_cell_ids_fix_; + Switch staticProcMap_; + Switch cellIdComm_; + LAMMPS_NS::FixPropertyAtom* my_prev_cell_ids_fix_; treeBoundBox thisFoamBox_; @@ -220,8 +220,6 @@ public: int getNumberOfParticles() const; - word myType() const { return typeName; } - void setCG() { particleCloud_.setCG(lmp->force->cg()); } };