Commit bca79742 authored by Andrew Heather's avatar Andrew Heather
Browse files

ENH: Updates to cloud injection models

parent 3f069da2
......@@ -121,7 +121,7 @@ protected:
//- Number of parcels to introduce over the time step relative to SOI
virtual label parcelsToInject(const scalar time0, const scalar time1);
//- Number of parcels to introduce over the time step relative to SOI
//- Volume of parcels to introduce over the time step relative to SOI
virtual scalar volumeToInject(const scalar time0, const scalar time1);
......
......@@ -128,10 +128,10 @@ protected:
// Protected Member Functions
//- Number of parcels to introduce over the time step
//- Number of parcels to introduce over the time step relative to SOI
virtual label parcelsToInject(const scalar time0, const scalar time1);
//- Number of parcels to introduce over the time step
//- Volume of parcels to introduce over the time step relative to SOI
virtual scalar volumeToInject(const scalar time0, const scalar time1);
......
......@@ -91,7 +91,7 @@ Foam::label Foam::InjectionModel<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
) const
)
{
notImplemented
(
......@@ -111,7 +111,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
) const
)
{
notImplemented
(
......@@ -162,10 +162,10 @@ void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
scalar t1 = time - SOI_;
// Number of parcels to inject
newParcels = parcelsToInject(t0, t1);
newParcels = this->parcelsToInject(t0, t1);
// Volume of parcels to inject
newVolume = volumeToInject(t0, t1);
newVolume = this->volumeToInject(t0, t1);
// Hold previous time if no parcels, but non-zero volume fraction
if ((newParcels == 0) && (newVolume > 0.0))
......@@ -486,7 +486,7 @@ template<class CloudType>
template<class TrackData>
void Foam::InjectionModel<CloudType>::inject(TrackData& td)
{
if (this->active())
if (!this->active())
{
return;
}
......
......@@ -143,18 +143,10 @@ protected:
// Protected Member Functions
//- Number of parcels to introduce over the time step relative to SOI
virtual label parcelsToInject
(
const scalar time0,
const scalar time1
) const;
virtual label parcelsToInject(const scalar time0, const scalar time1);
//- Volume of parcels to introduce over the time step relative to SOI
virtual scalar volumeToInject
(
const scalar time0,
const scalar time1
) const;
virtual scalar volumeToInject(const scalar time0, const scalar time1);
//- Additional flag to identify whether or not injection of parcelI is
// permitted
......
......@@ -56,10 +56,10 @@ protected:
// Protected Member Functions
//- Number of parcels to introduce over the time step relative to SOI
virtual label parcelsToInject(const scalar, const scalar);
virtual label parcelsToInject(const scalar time0, const scalar time1);
//- Volume of parcels to introduce over the time step relative to SOI
virtual scalar volumeToInject(const scalar, const scalar);
virtual scalar volumeToInject(const scalar time0, const scalar time1);
public:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment