diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index 7c63f1c26247550d6bc388c3a6a229b513bbde9d..42134dcdeddd0165892180182f72211cd61f4ffd 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -186,7 +186,6 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles ( const label parcels, const scalar volume, - const scalar volumeFraction, const scalar diameter, const scalar rho ) @@ -196,13 +195,14 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles { case pbMass: { - nP = volumeFraction*massTotal_/parcels - /(rho*mathematicalConstant::pi/6.0*pow3(diameter)); + nP = volume/volumeTotal_ + *massTotal_/rho + /(parcels*mathematicalConstant::pi/6.0*pow3(diameter)); break; } case pbNumber: { - nP = volumeFraction*massTotal_/(rho*volume); + nP = massTotal_/(rho*volumeTotal_*parcels); break; } default: @@ -363,9 +363,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td) return; } - // Volume fraction to introduce during this timestep - const scalar volFraction = volumeFraction(newVolume); - // Duration of injection period during this timestep const scalar deltaT = max(0.0, min(carrierDt, min(time - SOI_, timeEnd() - time0_))); @@ -418,7 +415,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td) ( newParcels, newVolume, - volFraction, pPtr->d(), pPtr->rho() ); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H index 05e009f4c6ad00fe5f0bdbe6b472ebcf388dde99..dc3b9ff61b2661400ea7c4919e5ca7f183359f20 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H @@ -183,7 +183,6 @@ protected: ( const label parcels, const scalar volume, - const scalar volumeFraction, const scalar diameter, const scalar rho ); @@ -290,9 +289,6 @@ public: template<class TrackData> void inject(TrackData& td); - //- Return the volume fraction to introduce - inline scalar volumeFraction(const scalar volume) const; - // Injection geometry diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H index 80a142816c826fa03984fee7c502c063280a84c5..716208c09266b15d80daf1ce582941519e57dce8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H @@ -96,14 +96,4 @@ Foam::label Foam::InjectionModel<CloudType>::parcelsAddedTotal() const } -template<class CloudType> -Foam::scalar Foam::InjectionModel<CloudType>::volumeFraction -( - const scalar volume -) const -{ - return volume/volumeTotal_; -} - - // ************************************************************************* //