9d57e8795a
The TrackData::switchProcessor flag was not being set for some of the tracking steps made by the more complicated parcels. In the case that a parcel starts the step already on a processor boundary, this sometimes lead to the particle being transferred back and forth indefinitely. The flag is now explicitly set in all cases.
142 lines
3.7 KiB
C
142 lines
3.7 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "CollidingParcel.H"
|
|
|
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
|
|
template<class ParcelType>
|
|
Foam::CollidingParcel<ParcelType>::CollidingParcel
|
|
(
|
|
const CollidingParcel<ParcelType>& p
|
|
)
|
|
:
|
|
ParcelType(p),
|
|
f_(p.f_),
|
|
angularMomentum_(p.angularMomentum_),
|
|
torque_(p.torque_),
|
|
collisionRecords_(p.collisionRecords_)
|
|
{}
|
|
|
|
|
|
template<class ParcelType>
|
|
Foam::CollidingParcel<ParcelType>::CollidingParcel
|
|
(
|
|
const CollidingParcel<ParcelType>& p,
|
|
const polyMesh& mesh
|
|
)
|
|
:
|
|
ParcelType(p, mesh),
|
|
f_(p.f_),
|
|
angularMomentum_(p.angularMomentum_),
|
|
torque_(p.torque_),
|
|
collisionRecords_(p.collisionRecords_)
|
|
{}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
|
|
|
template<class ParcelType>
|
|
template<class TrackData>
|
|
bool Foam::CollidingParcel<ParcelType>::move
|
|
(
|
|
TrackData& td,
|
|
const scalar trackTime
|
|
)
|
|
{
|
|
typename TrackData::cloudType::parcelType& p =
|
|
static_cast<typename TrackData::cloudType::parcelType&>(*this);
|
|
|
|
switch (td.part())
|
|
{
|
|
case TrackData::tpVelocityHalfStep:
|
|
{
|
|
// First and last leapfrog velocity adjust part, required
|
|
// before and after tracking and force calculation
|
|
|
|
p.U() += 0.5*trackTime*p.f()/p.mass();
|
|
|
|
p.angularMomentum() += 0.5*trackTime*p.torque();
|
|
|
|
td.keepParticle = true;
|
|
td.switchProcessor = false;
|
|
|
|
break;
|
|
}
|
|
|
|
case TrackData::tpLinearTrack:
|
|
{
|
|
ParcelType::move(td, trackTime);
|
|
|
|
break;
|
|
}
|
|
|
|
case TrackData::tpRotationalTrack:
|
|
{
|
|
NotImplemented;
|
|
|
|
break;
|
|
}
|
|
|
|
default:
|
|
{
|
|
FatalErrorInFunction
|
|
<< td.part() << " is an invalid part of the tracking method."
|
|
<< abort(FatalError);
|
|
}
|
|
}
|
|
|
|
return td.keepParticle;
|
|
}
|
|
|
|
|
|
template<class ParcelType>
|
|
void Foam::CollidingParcel<ParcelType>::transformProperties(const tensor& T)
|
|
{
|
|
ParcelType::transformProperties(T);
|
|
|
|
f_ = transform(T, f_);
|
|
|
|
angularMomentum_ = transform(T, angularMomentum_);
|
|
|
|
torque_ = transform(T, torque_);
|
|
}
|
|
|
|
|
|
template<class ParcelType>
|
|
void Foam::CollidingParcel<ParcelType>::transformProperties
|
|
(
|
|
const vector& separation
|
|
)
|
|
{
|
|
ParcelType::transformProperties(separation);
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
|
|
|
|
#include "CollidingParcelIO.C"
|
|
|
|
// ************************************************************************* //
|