diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index 513167db87431f04ef90b020e901d51f5adc196b..3baa64357c32a303e3b71bf7980834e00a9ab8ba 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -255,7 +255,10 @@ bool Foam::InjectionModel<CloudType>::findCellAtPosition "Foam::InjectionModel<CloudType>::findCellAtPosition" "(" "label&, " - "vector&" + "label&, " + "label&, " + "vector&, " + "bool" ")" ) << "Cannot find parcel injection cell. " << "Parcel position = " << p0 << nl @@ -386,9 +389,9 @@ Foam::InjectionModel<CloudType>::InjectionModel ) : SubModelBase<CloudType>(owner, dict, type), - SOI_(readScalar(this->coeffDict().lookup("SOI"))), + SOI_(0.0), volumeTotal_(0.0), - massTotal_(readScalar(this->coeffDict().lookup("massTotal"))), + massTotal_(0.0), massInjected_(0.0), nInjections_(0), parcelsAddedTotal_(0), @@ -403,6 +406,16 @@ Foam::InjectionModel<CloudType>::InjectionModel Info<< " Constructing " << owner.mesh().nGeometricD() << "-D injection" << endl; + if (owner.solution().transient()) + { + this->coeffDict().lookup("massTotal") >> massTotal_; + this->coeffDict().lookup("SOI") >> SOI_; + } + else + { + this->coeffDict().lookup("massFlowRate") >> massTotal_; + } + const word parcelBasisType = this->coeffDict().lookup("parcelBasisType"); if (parcelBasisType == "mass") diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H index d559aab81459042d1b6e59cd1f4e6a8120ef858b..6f952f254bf073e01462b0c3c60818a91d951e9c 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H @@ -102,7 +102,7 @@ protected: // Global injection properties //- Start of injection [s] - const scalar SOI_; + scalar SOI_; //- Total volume of particles introduced by this injector [m^3] // - scaled to ensure massTotal is achieved