ENH: lagrangian - updated calls to cloud function objects

This commit is contained in:
Andrew Heather
2023-05-17 17:54:20 +01:00
committed by Andrew Heather
parent 8fb148bb0e
commit 0b381897c3

View File

@ -311,9 +311,8 @@ bool Foam::KinematicParcel<ParcelType>::move
const scalar trackTime const scalar trackTime
) )
{ {
typename TrackCloudType::parcelType& p = auto& p = static_cast<typename TrackCloudType::parcelType&>(*this);
static_cast<typename TrackCloudType::parcelType&>(*this); auto& ttd =
typename TrackCloudType::parcelType::trackingData& ttd =
static_cast<typename TrackCloudType::parcelType::trackingData&>(td); static_cast<typename TrackCloudType::parcelType::trackingData&>(td);
ttd.switchProcessor = false; ttd.switchProcessor = false;
@ -383,9 +382,10 @@ bool Foam::KinematicParcel<ParcelType>::move
if (p.active() && p.onFace()) if (p.active() && p.onFace())
{ {
cloud.functions().postFace(p, ttd.keepParticle); ttd.keepParticle = cloud.functions().postFace(p, ttd);
} }
cloud.functions().postMove(p, dt, start, ttd.keepParticle);
ttd.keepParticle = cloud.functions().postMove(p, dt, start, ttd);
if (p.active() && p.onFace() && ttd.keepParticle) if (p.active() && p.onFace() && ttd.keepParticle)
{ {
@ -405,13 +405,14 @@ bool Foam::KinematicParcel<ParcelType>::hitPatch
trackingData& td trackingData& td
) )
{ {
typename TrackCloudType::parcelType& p = auto& p = static_cast<typename TrackCloudType::parcelType&>(*this);
static_cast<typename TrackCloudType::parcelType&>(*this); auto& ttd =
static_cast<typename TrackCloudType::parcelType::trackingData&>(td);
const polyPatch& pp = p.mesh().boundaryMesh()[p.patch()]; const polyPatch& pp = p.mesh().boundaryMesh()[p.patch()];
// Invoke post-processing model // Invoke post-processing model
cloud.functions().postPatch(p, pp, td.keepParticle); td.keepParticle = cloud.functions().postPatch(p, pp, ttd);
if (isA<processorPolyPatch>(pp)) if (isA<processorPolyPatch>(pp))
{ {