From 4084c6b3defd67009abbe68a9b6f4059372b904b Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 1 Mar 2010 10:05:04 +0000
Subject: [PATCH] ENH: lagrangian/intermeditate. Compatibility changes after
merge.
---
.../InteractingKinematicParcel.C | 8 +++++++-
.../defineBasicInteractingKinematicParcel.C | 3 ---
.../include/makeReactingMultiphaseParcelInjectionModels.H | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.C
index bf3fc3e1285..9220aecf965 100644
--- a/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/InteractingKinematicParcel/InteractingKinematicParcel.C
@@ -329,7 +329,13 @@ bool Foam::InteractingKinematicParcel<ParcelType>::hitPatch
ParcelType& p = static_cast<ParcelType&>(*this);
td.cloud().postProcessing().postPatch(p, patchI);
- return td.cloud().patchInteraction().correct(pp, this->face(), U_);
+ return td.cloud().patchInteraction().correct
+ (
+ pp,
+ this->face(),
+ td.keepParticle,
+ U_
+ );
}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/defineBasicInteractingKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/defineBasicInteractingKinematicParcel.C
index 1f8c830d5e9..48d9ec6b93d 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/defineBasicInteractingKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicInteractingKinematicParcel/defineBasicInteractingKinematicParcel.C
@@ -26,7 +26,6 @@ License
#include "basicInteractingKinematicParcel.H"
#include "InteractingKinematicCloud.H"
-#include "makeParcelIOList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,8 +37,6 @@ namespace Foam
(
InteractingKinematicCloud<basicInteractingKinematicParcel>, 0
);
-
- makeParcelIOList(basicInteractingKinematicParcel);
};
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
index 61d3341dae8..a9055f2cfea 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -112,7 +112,7 @@ License
makeInjectionModelThermoType \
( \
ReactingMultiphaseLookupTableInjection, \
- KinematicCloud, \
+ InteractingKinematicCloud, \
ParcelType, \
ThermoType \
);
--
GitLab