diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index 19d2731bd9..e8c282ffbe 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -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); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H index bfbbd70152..47b19de6d3 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H @@ -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); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index 72b891079a..20962a38a7 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -91,7 +91,7 @@ Foam::label Foam::InjectionModel::parcelsToInject ( const scalar time0, const scalar time1 -) const +) { notImplemented ( @@ -111,7 +111,7 @@ Foam::scalar Foam::InjectionModel::volumeToInject ( const scalar time0, const scalar time1 -) const +) { notImplemented ( @@ -162,10 +162,10 @@ void Foam::InjectionModel::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 template void Foam::InjectionModel::inject(TrackData& td) { - if (this->active()) + if (!this->active()) { return; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H index 86fffe68de..23f8f2f762 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H @@ -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 diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H index 4a33d23054..5dc73b8342 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H @@ -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: