mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
removed volumeFraction - unnecessary
This commit is contained in:
@ -186,7 +186,6 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
|
|||||||
(
|
(
|
||||||
const label parcels,
|
const label parcels,
|
||||||
const scalar volume,
|
const scalar volume,
|
||||||
const scalar volumeFraction,
|
|
||||||
const scalar diameter,
|
const scalar diameter,
|
||||||
const scalar rho
|
const scalar rho
|
||||||
)
|
)
|
||||||
@ -196,13 +195,14 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
|
|||||||
{
|
{
|
||||||
case pbMass:
|
case pbMass:
|
||||||
{
|
{
|
||||||
nP = volumeFraction*massTotal_/parcels
|
nP = volume/volumeTotal_
|
||||||
/(rho*mathematicalConstant::pi/6.0*pow3(diameter));
|
*massTotal_/rho
|
||||||
|
/(parcels*mathematicalConstant::pi/6.0*pow3(diameter));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case pbNumber:
|
case pbNumber:
|
||||||
{
|
{
|
||||||
nP = volumeFraction*massTotal_/(rho*volume);
|
nP = massTotal_/(rho*volumeTotal_*parcels);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -363,9 +363,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Volume fraction to introduce during this timestep
|
|
||||||
const scalar volFraction = volumeFraction(newVolume);
|
|
||||||
|
|
||||||
// Duration of injection period during this timestep
|
// Duration of injection period during this timestep
|
||||||
const scalar deltaT =
|
const scalar deltaT =
|
||||||
max(0.0, min(carrierDt, min(time - SOI_, timeEnd() - time0_)));
|
max(0.0, min(carrierDt, min(time - SOI_, timeEnd() - time0_)));
|
||||||
@ -418,7 +415,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
|
|||||||
(
|
(
|
||||||
newParcels,
|
newParcels,
|
||||||
newVolume,
|
newVolume,
|
||||||
volFraction,
|
|
||||||
pPtr->d(),
|
pPtr->d(),
|
||||||
pPtr->rho()
|
pPtr->rho()
|
||||||
);
|
);
|
||||||
|
|||||||
@ -183,7 +183,6 @@ protected:
|
|||||||
(
|
(
|
||||||
const label parcels,
|
const label parcels,
|
||||||
const scalar volume,
|
const scalar volume,
|
||||||
const scalar volumeFraction,
|
|
||||||
const scalar diameter,
|
const scalar diameter,
|
||||||
const scalar rho
|
const scalar rho
|
||||||
);
|
);
|
||||||
@ -290,9 +289,6 @@ public:
|
|||||||
template<class TrackData>
|
template<class TrackData>
|
||||||
void inject(TrackData& td);
|
void inject(TrackData& td);
|
||||||
|
|
||||||
//- Return the volume fraction to introduce
|
|
||||||
inline scalar volumeFraction(const scalar volume) const;
|
|
||||||
|
|
||||||
|
|
||||||
// Injection geometry
|
// Injection geometry
|
||||||
|
|
||||||
|
|||||||
@ -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_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ************************************************************************* //
|
// ************************************************************************* //
|
||||||
|
|||||||
Reference in New Issue
Block a user