diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index fed08dcd474a40343f6f65254dcfc7ec5a86dd63..1a594764378b2d237cb8aaf0c5b93654ef62e9b5 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -265,7 +265,7 @@ void Foam::KinematicCloud<ParcelType>::evolve() g_.value() ); - inject(td); + inject(); if (coupled_) { @@ -277,15 +277,11 @@ void Foam::KinematicCloud<ParcelType>::evolve() template<class ParcelType> -template<class TrackingData> -void Foam::KinematicCloud<ParcelType>::inject -( - TrackingData& td -) +void Foam::KinematicCloud<ParcelType>::inject() { scalar time = this->db().time().value(); - scalar pRho = td.constProps().rho0(); + scalar pRho = constProps_.rho0(); this->injection().prepareForNextTimeStep(time0_, time); @@ -367,14 +363,14 @@ void Foam::KinematicCloud<ParcelType>::inject // construct the parcel that is to be injected ParcelType* pPtr = new ParcelType ( - td.cloud(), + *this, parcelTypeId_, pPosition, pCell, pDiameter, pU, pNumberOfParticles, - td.constProps() + constProps_ ); scalar dt = time - timeInj; diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index f2e77b607e2acd900b394eccfe7c5536feea3c0a..0d3781413cbb72236afdd2554dc640890e9fba92 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -234,8 +234,7 @@ protected: ); //- Inject more parcels - template<class TrackingData> - void inject(TrackingData& td); + void inject(); //- Inject parcel if it is valid - delete otherwise void injectParcel(ParcelType* p); diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 2f81a702f9f2d29462fd475624a938b372d075d5..4bad7642727b81043196feb55ebc140a557f83bd 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -174,7 +174,7 @@ void Foam::ReactingCloud<ParcelType>::evolve() this->g().value() ); - inject(td); + inject(); if (this->coupled()) { @@ -186,15 +186,11 @@ void Foam::ReactingCloud<ParcelType>::evolve() template<class ParcelType> -template<class TrackingData> -void Foam::ReactingCloud<ParcelType>::inject -( - TrackingData& td -) +void Foam::ReactingCloud<ParcelType>::inject() { scalar time = this->db().time().value(); - scalar pRho = td.constProps().rho0(); + scalar pRho = this->constProps().rho0(); this->injection().prepareForNextTimeStep(this->time0(), time); @@ -276,7 +272,7 @@ void Foam::ReactingCloud<ParcelType>::inject // construct the parcel that is to be injected ParcelType* pPtr = new ParcelType ( - td.cloud(), + *this, this->parcelTypeId(), pPosition, pCell, @@ -287,7 +283,7 @@ void Foam::ReactingCloud<ParcelType>::inject composition().YLiquid0(), composition().YSolid0(), composition().YMixture0(), - td.constProps() + this->constProps() ); scalar dt = time - timeInj; diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H index d1c60f5a974c0c3070b7f515005eed318a94f993..9ce5c98b1aa35210762b134ebfc4510a0a611e30 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H @@ -117,8 +117,7 @@ class ReactingCloud protected: //- Inject more parcels - template<class TrackingData> - void inject(TrackingData& td); + void inject(); public: