diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index fa213c67d3..b593d4393b 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -402,17 +402,17 @@ bool Foam::KinematicParcel::hitPatch td.keepParticle ); - // Invoke surface film model - if (td.cloud().surfaceFilm().transferParcel(p, pp, td.keepParticle)) + if (isA(pp)) { - // All interactions done - return true; - } - else if (pp.coupled()) - { - // Don't apply the patchInteraction models to coupled boundaries + // Skip processor patches return false; } + else if (td.cloud().surfaceFilm().transferParcel(p, pp, td.keepParticle)) + { + // Surface film model consumes the interaction, i.e. all + // interactions done + return true; + } else { // Invoke patch interaction model diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C index 4ee514d8c4..9033ab2b89 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C @@ -26,7 +26,6 @@ License #include "patchInteractionDataList.H" #include "stringListOps.H" #include "emptyPolyPatch.H" -#include "cyclicAMIPolyPatch.H" // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //