diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 1c10870726cea9e0ee62b5878fceb94ff7ed0433..1028b5d20a7d167bc92bd191260fcbc71e45167d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -45,7 +45,7 @@ bool Foam::InjectionModel<CloudType>::validInjection(const label parcelI)
template<class CloudType>
-void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
+bool Foam::InjectionModel<CloudType>::prepareForNextTimeStep
(
const scalar time,
label& newParcels,
@@ -55,12 +55,13 @@ void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
// Initialise values
newParcels = 0;
newVolume = 0.0;
+ bool validInjection = false;
// Return if not started injection event
if (time < SOI_)
{
timeStep0_ = time;
- return;
+ return validInjection;
}
// Make times relative to SOI
@@ -73,16 +74,27 @@ void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
// Volume of parcels to inject
newVolume = this->volumeToInject(t0, t1);
- // Hold previous time if no parcels, but non-zero volume fraction
- if ((newParcels == 0) && (newVolume > 0.0))
+ if (newVolume > 0)
{
- // hold value of timeStep0_
+ if (newParcels > 0)
+ {
+ timeStep0_ = time;
+ validInjection = true;
+ }
+ else
+ {
+ // injection should have started, but not sufficient volume to
+ // produce (at least) 1 parcel - hold value of timeStep0_
+ validInjection = false;
+ }
}
else
{
- // advance value of timeStep0_
timeStep0_ = time;
+ validInjection = false;
}
+
+ return validInjection;
}
@@ -471,96 +483,97 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
label newParcels = 0;
scalar newVolume = 0.0;
- prepareForNextTimeStep(time, newParcels, newVolume);
-
- // Duration of injection period during this timestep
- const scalar deltaT =
- max(0.0, min(trackTime, min(time - SOI_, timeEnd() - time0_)));
-
- // Pad injection time if injection starts during this timestep
- const scalar padTime = max(0.0, SOI_ - time0_);
-
- // Introduce new parcels linearly across carrier phase timestep
- for (label parcelI = 0; parcelI < newParcels; parcelI++)
+ if (prepareForNextTimeStep(time, newParcels, newVolume))
{
- if (validInjection(parcelI))
- {
- // Calculate the pseudo time of injection for parcel 'parcelI'
- scalar timeInj = time0_ + padTime + deltaT*parcelI/newParcels;
+ // Duration of injection period during this timestep
+ const scalar deltaT =
+ max(0.0, min(trackTime, min(time - SOI_, timeEnd() - time0_)));
- // Determine the injection position and owner cell,
- // tetFace and tetPt
- label cellI = -1;
- label tetFaceI = -1;
- label tetPtI = -1;
-
- vector pos = vector::zero;
-
- setPositionAndCell
- (
- parcelI,
- newParcels,
- timeInj,
- pos,
- cellI,
- tetFaceI,
- tetPtI
- );
+ // Pad injection time if injection starts during this timestep
+ const scalar padTime = max(0.0, SOI_ - time0_);
- if (cellI > -1)
+ // Introduce new parcels linearly across carrier phase timestep
+ for (label parcelI = 0; parcelI < newParcels; parcelI++)
+ {
+ if (validInjection(parcelI))
{
- // Lagrangian timestep
- scalar dt = time - timeInj;
+ // Calculate the pseudo time of injection for parcel 'parcelI'
+ scalar timeInj = time0_ + padTime + deltaT*parcelI/newParcels;
+
+ // Determine the injection position and owner cell,
+ // tetFace and tetPt
+ label cellI = -1;
+ label tetFaceI = -1;
+ label tetPtI = -1;
- // Apply corrections to position for 2-D cases
- meshTools::constrainToMeshCentre(mesh, pos);
+ vector pos = vector::zero;
- // Create a new parcel
- parcelType* pPtr = new parcelType
+ setPositionAndCell
(
- td.cloud().pMesh(),
+ parcelI,
+ newParcels,
+ timeInj,
pos,
cellI,
tetFaceI,
tetPtI
);
- // Check/set new parcel thermo properties
- cloud.setParcelThermoProperties(*pPtr, dt);
+ if (cellI > -1)
+ {
+ // Lagrangian timestep
+ scalar dt = time - timeInj;
+
+ // Apply corrections to position for 2-D cases
+ meshTools::constrainToMeshCentre(mesh, pos);
- // Assign new parcel properties in injection model
- setProperties(parcelI, newParcels, timeInj, *pPtr);
+ // Create a new parcel
+ parcelType* pPtr = new parcelType
+ (
+ td.cloud().pMesh(),
+ pos,
+ cellI,
+ tetFaceI,
+ tetPtI
+ );
- // Check/set new parcel injection properties
- cloud.checkParcelProperties(*pPtr, dt, fullyDescribed());
+ // Check/set new parcel thermo properties
+ cloud.setParcelThermoProperties(*pPtr, dt);
- // Apply correction to velocity for 2-D cases
- meshTools::constrainDirection
- (
- mesh,
- mesh.solutionD(),
- pPtr->U()
- );
+ // Assign new parcel properties in injection model
+ setProperties(parcelI, newParcels, timeInj, *pPtr);
- // Number of particles per parcel
- pPtr->nParticle() =
- setNumberOfParticles
+ // Check/set new parcel injection properties
+ cloud.checkParcelProperties(*pPtr, dt, fullyDescribed());
+
+ // Apply correction to velocity for 2-D cases
+ meshTools::constrainDirection
(
- newParcels,
- newVolume,
- pPtr->d(),
- pPtr->rho()
+ mesh,
+ mesh.solutionD(),
+ pPtr->U()
);
- if (pPtr->move(td, dt))
- {
- td.cloud().addParticle(pPtr);
- massAdded += pPtr->nParticle()*pPtr->mass();
- parcelsAdded++;
- }
- else
- {
- delete pPtr;
+ // Number of particles per parcel
+ pPtr->nParticle() =
+ setNumberOfParticles
+ (
+ newParcels,
+ newVolume,
+ pPtr->d(),
+ pPtr->rho()
+ );
+
+ if (pPtr->move(td, dt))
+ {
+ td.cloud().addParticle(pPtr);
+ massAdded += pPtr->nParticle()*pPtr->mass();
+ parcelsAdded++;
+ }
+ else
+ {
+ delete pPtr;
+ }
}
}
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 30a2c97b16cb1e51947e7acd23ce95d938411d89..a3d67947b248b649da5ededce98151ca86972235 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -138,7 +138,7 @@ protected:
virtual bool validInjection(const label parcelI);
//- Determine properties for next time step/injection interval
- virtual void prepareForNextTimeStep
+ virtual bool prepareForNextTimeStep
(
const scalar time,
label& newParcels,