diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index 4dc98e9dea..2230e01e65 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C @@ -58,7 +58,7 @@ Foam::scalar Foam::ConeInjection::volumeToInject { if ((time0 >= 0.0) && (time0 < duration_)) { - return volumeFlowRate_().integrate(time0, time1); + return flowRateProfile_().integrate(time0, time1); } else { @@ -85,11 +85,11 @@ Foam::ConeInjection::ConeInjection ( readScalar(this->coeffDict().lookup("parcelsPerSecond")) ), - volumeFlowRate_ + flowRateProfile_ ( DataEntry::New ( - "volumeFlowRate", + "flowRateProfile", this->coeffDict() ) ), @@ -147,7 +147,7 @@ Foam::ConeInjection::ConeInjection tanVec2_ = direction_^tanVec1_; // Set total volume to inject - this->volumeTotal_ = volumeFlowRate_().integrate(0.0, duration_); + this->volumeTotal_ = flowRateProfile_().integrate(0.0, duration_); // Set/cache the injector cell this->findCellAtPosition(injectorCell_, position_); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index 80e333040f..006159ec20 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -83,8 +83,8 @@ class ConeInjection //- Number of parcels to introduce per second [] const label parcelsPerSecond_; - //- Volume flow rate of parcels to introduce relative to SOI [m^3] - const autoPtr > volumeFlowRate_; + //- Flow rate profile relative to SOI [] + const autoPtr > flowRateProfile_; //- Parcel velocity magnitude relative to SOI [m/s] const autoPtr > Umag_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C index 9b2c87ad35..802d624047 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C @@ -40,7 +40,7 @@ Foam::label Foam::ConeInjectionMP::parcelsToInject { if ((time0 >= 0.0) && (time0 < duration_)) { - const scalar targetVolume = volumeFlowRate_().integrate(0, time1); + const scalar targetVolume = flowRateProfile_().integrate(0, time1); const label targetParcels = parcelsPerInjector_*targetVolume/this->volumeTotal_; @@ -67,7 +67,7 @@ Foam::scalar Foam::ConeInjectionMP::volumeToInject { if ((time0 >= 0.0) && (time0 < duration_)) { - return volumeFlowRate_().integrate(time0, time1); + return flowRateProfile_().integrate(time0, time1); } else { @@ -116,11 +116,11 @@ Foam::ConeInjectionMP::ConeInjectionMP ( readScalar(this->coeffDict().lookup("parcelsPerInjector")) ), - volumeFlowRate_ + flowRateProfile_ ( DataEntry::New ( - "volumeFlowRate", + "flowRateProfile", this->coeffDict() ) ), @@ -182,7 +182,7 @@ Foam::ConeInjectionMP::ConeInjectionMP } // Set total volume to inject - this->volumeTotal_ = volumeFlowRate_().integrate(0.0, duration_); + this->volumeTotal_ = flowRateProfile_().integrate(0.0, duration_); // Set/cache the injector cells forAll(positions_, i) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H index 81cecda980..451ed6d1cb 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H @@ -90,8 +90,8 @@ class ConeInjectionMP //- Number of parcels to introduce per injector const label parcelsPerInjector_; - //- Volume flow rate of parcels to introduce relative to SOI [m^3] - const autoPtr > volumeFlowRate_; + //- Flow rate profile relative to SOI [] + const autoPtr > flowRateProfile_; //- Parcel velocity magnitude relative to SOI [m/s] const autoPtr > Umag_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C index 048179a30a..661c7e566f 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C @@ -56,7 +56,7 @@ Foam::scalar Foam::PatchInjection::volumeToInject { if ((time0 >= 0.0) && (time0 < duration_)) { - return fraction_*volumeFlowRate_().integrate(time0, time1); + return fraction_*flowRateProfile_().integrate(time0, time1); } else { @@ -82,11 +82,11 @@ Foam::PatchInjection::PatchInjection readScalar(this->coeffDict().lookup("parcelsPerSecond")) ), U0_(this->coeffDict().lookup("U0")), - volumeFlowRate_ + flowRateProfile_ ( DataEntry::New ( - "volumeFlowRate", + "flowRateProfile", this->coeffDict() ) ), @@ -127,7 +127,7 @@ Foam::PatchInjection::PatchInjection fraction_ = scalar(patchSize)/totalPatchSize; // Set total volume/mass to inject - this->volumeTotal_ = fraction_*volumeFlowRate_().integrate(0.0, duration_); + this->volumeTotal_ = fraction_*flowRateProfile_().integrate(0.0, duration_); this->massTotal_ *= fraction_; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H index 88ae42801c..fc6c8d86cb 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H @@ -79,8 +79,8 @@ class PatchInjection //- Initial parcel velocity [m/s] const vector U0_; - //- Volume flow rate of parcels to introduce relative to SOI [m^3/s] - const autoPtr > volumeFlowRate_; + //- Flow rate profile relative to SOI [] + const autoPtr > flowRateProfile_; //- Parcel size PDF model const autoPtr parcelPDF_; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 1dbbf94c3f..24c5f8b39b 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -98,7 +98,7 @@ PatchInjectionCoeffs duration 10000; parcelsPerSecond 1e5; U0 (40 0 0); - volumeFlowRate constant 1; + flowRateProfile constant 1; parcelPDF { pdfType general; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index aaaa1b10c6..df6e2fb803 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -86,7 +86,7 @@ ConeInjectionCoeffs position ( 0.25 0.25 0.05 ); direction ( 0 -1 0 ); parcelsPerSecond 10000; - volumeFlowRate Constant 0.01; + flowRateProfile Constant 0.01; Umag Constant 50; thetaInner Constant 0; thetaOuter Constant 30;