diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C index 10bb48d887b9c4e6583f7e3069bb453379ae0e35..128750c3a6bb6df7cfd71e13d5771bc7fcbf897e 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C @@ -266,11 +266,10 @@ template<class CloudType> Foam::label Foam::ParticleCollector<CloudType>::collectParcelPolygon ( const point& position, - const vector& U + const vector& U, + const scalar dt ) const { - scalar dt = this->owner().db().time().deltaTValue(); - point end(position + dt*U); label dummyNearType = -1; @@ -322,13 +321,12 @@ template<class CloudType> Foam::label Foam::ParticleCollector<CloudType>::collectParcelConcentricCircles ( const point& position, - const vector& U + const vector& U, + const scalar dt ) const { label secI = -1; - scalar dt = this->owner().db().time().deltaTValue(); - point end(position + dt*U); const scalar d1 = normal_ & (position - coordSys_.origin()); @@ -636,12 +634,12 @@ void Foam::ParticleCollector<CloudType>::postMove { case mtPolygon: { - faceI = collectParcelPolygon(p.position(), p.U()); + faceI = collectParcelPolygon(p.position(), p.U(), dt); break; } case mtConcentricCircle: { - faceI = collectParcelConcentricCircles(p.position(), p.U()); + faceI = collectParcelConcentricCircles(p.position(), p.U(), dt); break; } default: diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H index 29bb8ff95bda3c0d86a187305f563359b1f9c803..71e65fe6c709dabf9636efa83ffc697c6656e5c5 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -170,14 +170,16 @@ private: label collectParcelPolygon ( const point& position, - const vector& U + const vector& U, + const scalar dt ) const; //- Collect parcels in concentric circle collectors label collectParcelConcentricCircles ( const point& position, - const vector& U + const vector& U, + const scalar dt ) const;