Merge branch 'clouds'

This commit is contained in:
andy
2010-11-02 15:04:58 +00:00
541 changed files with 16290 additions and 5129 deletions

View File

@ -171,15 +171,16 @@ Foam::streamLineParticle::streamLineParticle
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::streamLineParticle::move(streamLineParticle::trackData& td)
bool Foam::streamLineParticle::move
(
streamLineParticle::trackData& td,
const scalar trackTime
)
{
td.switchProcessor = false;
td.keepParticle = true;
// Set very large dt. Note: cannot use GREAT since 1/GREAT is SMALL
// which is a trigger value for the tracking...
scalar deltaT = Foam::sqrt(GREAT); //cloud().pMesh().time().deltaTValue();
scalar tEnd = (1.0 - stepFraction())*deltaT;
scalar tEnd = (1.0 - stepFraction())*trackTime;
scalar dtMax = tEnd;
while
@ -227,7 +228,7 @@ bool Foam::streamLineParticle::move(streamLineParticle::trackData& td)
dt *= fraction;
tEnd -= dt;
stepFraction() = 1.0 - tEnd/deltaT;
stepFraction() = 1.0 - tEnd/trackTime;
if (tEnd <= ROOTVSMALL)
{