ENH: Updated suppression collision model

This commit is contained in:
andy 2013-05-03 12:55:44 +01:00
parent 599a5f1d8d
commit 8b52b700d0
2 changed files with 10 additions and 5 deletions

View File

@ -622,7 +622,7 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
vDotSweep.internalField() /= mesh_.V();
vDotSweep.correctBoundaryConditions();
return vDotSweep;
return tvDotSweep;
}

View File

@ -36,7 +36,9 @@ void Foam::SuppressionCollision<CloudType>::collide(const scalar dt)
lookupObject<kinematicCloud>(suppressionCloud_);
volScalarField vDotSweep(sc.vDotSweep());
volScalarField P(type() + ":p", 1.0 - exp(-vDotSweep*dt));
dimensionedScalar Dt("dt", dimTime, dt);
volScalarField P(type() + ":p", 1.0 - exp(-vDotSweep*Dt));
forAllIter(typename CloudType, this->owner(), iter)
{
@ -63,9 +65,12 @@ Foam::SuppressionCollision<CloudType>::SuppressionCollision
CloudType& owner
)
:
StochasticCollisionModel<CloudType>(owner),
suppressionCloud_(dict.lookup("suppressionCloud")),
suppressedParcelType_(dict.lookupOrDefault("suppressedParcelType", -1))
StochasticCollisionModel<CloudType>(dict, owner, typeName),
suppressionCloud_(this->coeffDict().lookup("suppressionCloud")),
suppressedParcelType_
(
this->coeffDict().lookupOrDefault("suppressedParcelType", -1)
)
{}