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 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2011-03-01 17:00:32 +00:00
parent f182b725da e694ee9ca5
commit 075dee2fb8
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C
View File

@ -44,13 +44,17 @@ void Foam::CollidingCloud<CloudType>::setModels()
template<class CloudType> template<class CloudType>
template<class TrackData> template<class TrackData>
void Foam::CollidingCloud<CloudType>::moveCollide(TrackData& td) void Foam::CollidingCloud<CloudType>::moveCollide
(
TrackData& td,
const scalar deltaT
)
{ {
td.part() = TrackData::tpVelocityHalfStep; td.part() = TrackData::tpVelocityHalfStep;
CloudType::move(td, this->solution().deltaT()); CloudType::move(td, deltaT);
td.part() = TrackData::tpLinearTrack; td.part() = TrackData::tpLinearTrack;
CloudType::move(td, this->solution().deltaT()); CloudType::move(td, deltaT);
// td.part() = TrackData::tpRotationalTrack; // td.part() = TrackData::tpRotationalTrack;
// CloudType::move(td); // CloudType::move(td);
@ -60,7 +64,7 @@ void Foam::CollidingCloud<CloudType>::moveCollide(TrackData& td)
this->collision().collide(); this->collision().collide();
td.part() = TrackData::tpVelocityHalfStep; td.part() = TrackData::tpVelocityHalfStep;
CloudType::move(td, this->solution().deltaT()); CloudType::move(td, deltaT);
} }
@ -211,14 +215,14 @@ void Foam::CollidingCloud<CloudType>::motion(TrackData& td)
while(!(++moveCollideSubCycle).end()) while(!(++moveCollideSubCycle).end())
{ {
moveCollide(td); moveCollide(td, this->db().time().deltaTValue());
} }
moveCollideSubCycle.endSubCycle(); moveCollideSubCycle.endSubCycle();
} }
else else
{ {
moveCollide(td); moveCollide(td, this->db().time().deltaTValue());
} }
} }

2
src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.H
View File

@ -108,7 +108,7 @@ protected:
//- Move-collide particles //- Move-collide particles
template<class TrackData> template<class TrackData>
void moveCollide(TrackData& td); void moveCollide(TrackData& td, const scalar deltaT);
//- Reset state of cloud //- Reset state of cloud
void cloudReset(CollidingCloud<CloudType>& c); void cloudReset(CollidingCloud<CloudType>& c);

2
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
View File

@ -295,6 +295,7 @@ bool Foam::KinematicParcel<ParcelType>::move
const polyMesh& mesh = td.cloud().pMesh(); const polyMesh& mesh = td.cloud().pMesh();
const polyBoundaryMesh& pbMesh = mesh.boundaryMesh(); const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
const scalarField& V = mesh.cellVolumes(); const scalarField& V = mesh.cellVolumes();
const scalar maxCo = td.cloud().solution().maxCo();
scalar tEnd = (1.0 - p.stepFraction())*trackTime; scalar tEnd = (1.0 - p.stepFraction())*trackTime;
const scalar dtMax = tEnd; const scalar dtMax = tEnd;
@ -315,7 +316,6 @@ bool Foam::KinematicParcel<ParcelType>::move
if (p.active() && magU > ROOTVSMALL) if (p.active() && magU > ROOTVSMALL)
{ {
const scalar d = dt*magU; const scalar d = dt*magU;
const scalar maxCo = td.cloud().solution().maxCo();
const scalar dCorr = min(d, maxCo*cbrt(V[cellI])); const scalar dCorr = min(d, maxCo*cbrt(V[cellI]));
dt *= dt *=
dCorr/d dCorr/d