diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C index 0f2fd94588..3be79ab797 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C @@ -30,107 +30,8 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -void Foam::PairCollision::buildCellOccupancy() +void Foam::PairCollision::preInteraction() { - Info<< " Build cell occupancy" << endl; - - forAll(cellOccupancy_, cO) - { - cellOccupancy_[cO].clear(); - } - - forAllIter(typename CloudType, this->owner(), iter) - { - cellOccupancy_[iter().cell()].append(&iter()); - } - - il_.ril().referParticles(cellOccupancy_); -} - - -template -void Foam::PairCollision::evaluatePair -( - typename CloudType::parcelType& pA, - typename CloudType::parcelType& pB -) const -{ - pairModel_->evaluatePair(pA, pB); -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::PairCollision::PairCollision -( - const dictionary& dict, - CloudType& owner -) -: - CollisionModel(dict, owner, typeName), - cellOccupancy_(owner.mesh().nCells()), - pairModel_ - ( - PairModel::New - ( - this->coeffDict(), - this->owner() - ) - ), - il_ - ( - owner.mesh(), - sqr(readScalar(this->coeffDict().lookup("maxInteractionDistance"))), - true - ) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::PairCollision::~PairCollision() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -Foam::label Foam::PairCollision::nSubCycles() const -{ - if (pairModel_->controlsTimestep()) - { - label nSubCycles = returnReduce - ( - pairModel_->nSubCycles(), maxOp