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 remote branch 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2010-11-08 08:07:29 +01:00
parent d5acd22a63 9c350ab501
commit 8b59f1d0d5
674 changed files with 19530 additions and 5336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
View File

@ -333,7 +333,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
trackedParticle::trackData td(cloud, maxFeatureLevel);
// Track all particles to their end position (= starting feature point)
cloud.move(td);
cloud.move(td, mesh_.time().deltaTValue());
// Reset level
maxFeatureLevel = -1;
@ -406,7 +406,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
}
// Track all particles to their end position.
cloud.move(td);
cloud.move(td, mesh_.time().deltaTValue());
}

13
src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
View File

@ -27,7 +27,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
//- Construct from components
Foam::trackedParticle::trackedParticle
(
const Cloud<trackedParticle>& c,
@ -49,7 +48,6 @@ Foam::trackedParticle::trackedParticle
{}
//- Construct from Istream
Foam::trackedParticle::trackedParticle
(
const Cloud<trackedParticle>& c,
@ -89,13 +87,16 @@ Foam::trackedParticle::trackedParticle
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::trackedParticle::move(trackedParticle::trackData& td)
bool Foam::trackedParticle::move
(
trackedParticle::trackData& td,
const scalar trackedParticle
)
{
td.switchProcessor = false;
td.keepParticle = true;
scalar deltaT = cloud().pMesh().time().deltaTValue();
scalar tEnd = (1.0 - stepFraction())*deltaT;
scalar tEnd = (1.0 - stepFraction())*trackedParticle;
scalar dtMax = tEnd;
while (td.keepParticle && !td.switchProcessor && tEnd > SMALL)
@ -109,7 +110,7 @@ bool Foam::trackedParticle::move(trackedParticle::trackData& td)
dt *= trackToFace(end_, td);
tEnd -= dt;
stepFraction() = 1.0 - tEnd/deltaT;
stepFraction() = 1.0 - tEnd/trackedParticle;
}
return td.keepParticle;

12
src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.H
View File

@ -47,7 +47,7 @@ namespace Foam
class trackedParticleCloud;
/*---------------------------------------------------------------------------*\
Class trackedParticle Declaration
Class trackedParticle Declaration
\*---------------------------------------------------------------------------*/
class trackedParticle
@ -68,6 +68,7 @@ class trackedParticle
//- passive label
label j_;
public:
friend class Cloud<trackedParticle>;
@ -135,9 +136,12 @@ public:
);
//- Construct and return a clone
autoPtr<trackedParticle> clone() const
autoPtr<Particle<trackedParticle> > clone() const
{
return autoPtr<trackedParticle>(new trackedParticle(*this));
return autoPtr<Particle<trackedParticle> >
(
new trackedParticle(*this)
);
}
@ -166,7 +170,7 @@ public:
// Tracking
//- Track all particles to their end point
bool move(trackData&);
bool move(trackData&, const scalar);
//- Overridable function to handle the particle hitting a patch