zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'clouds'

Browse Source
This commit is contained in:
andy
2010-11-02 15:04:58 +00:00
parent c42d7e8944 6abc63b6c3
commit 960773dfe5
541 changed files with 16290 additions and 5129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/postProcessing/functionObjects/field/streamLine/streamLine.C
View File

@ -228,8 +228,13 @@ void Foam::streamLine::track()
allVectors_
);
// Set very large dt. Note: cannot use GREAT since 1/GREAT is SMALL
// which is a trigger value for the tracking...
const scalar trackTime = Foam::sqrt(GREAT);
// Track
particles.move(td);
particles.move(td, trackTime);
}

13
src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
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)
{

6
src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
View File

@ -169,9 +169,9 @@ public:
streamLineParticle(const streamLineParticle& c);
//- Construct and return a clone
autoPtr<streamLineParticle> clone() const
autoPtr<Particle<streamLineParticle> > clone() const
{
return autoPtr<streamLineParticle>
return autoPtr<Particle<streamLineParticle> >
(
new streamLineParticle(*this)
);
@ -185,7 +185,7 @@ public:
// Tracking
//- Track all particles to their end point
bool move(trackData&);
bool move(trackData&, const scalar trackTime);
//- Overridable function to handle the particle hitting a patch