Commit 81d2dc92 authored by andy's avatar andy
Browse files

ENH: Updated cloud particleCollector function object

parent ff5ed954
......@@ -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:
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment