From 0421563db0d37dc5156410f9615e43a5533298a9 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 19 Dec 2008 13:44:48 +0000
Subject: [PATCH] more tidying up: NOTE - inject() functionality should be
moved to the injection sub-model
---
.../Templates/KinematicCloud/KinematicCloud.C | 14 +++++---------
.../Templates/KinematicCloud/KinematicCloud.H | 3 +--
.../clouds/Templates/ReactingCloud/ReactingCloud.C | 14 +++++---------
.../clouds/Templates/ReactingCloud/ReactingCloud.H | 3 +--
4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index fed08dcd474..1a594764378 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 f2e77b607e2..0d3781413cb 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 2f81a702f9f..4bad7642727 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 d1c60f5a974..9ce5c98b1aa 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:
--
GitLab