diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index d8675f0fd0ec3d3a0fa9eb3607a826d99eb8b3cb..711c41e87b24ba692137e2aaf311779ea486119c 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C @@ -95,9 +95,12 @@ Foam::ConeInjection<CloudType>::ConeInjection Umag_(DataEntry<scalar>::New("Umag", this->coeffDict())), thetaInner_(DataEntry<scalar>::New("thetaInner", this->coeffDict())), thetaOuter_(DataEntry<scalar>::New("thetaOuter", this->coeffDict())), - parcelDistributionModel_ + sizeDistribution_ ( - distributionModels::distributionModel::New(this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen()) + distributionModels::distributionModel::New + ( + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() + ) ), tanVec1_(vector::zero), tanVec2_(vector::zero) @@ -153,7 +156,7 @@ Foam::ConeInjection<CloudType>::ConeInjection Umag_(im.Umag_().clone().ptr()), thetaInner_(im.thetaInner_().clone().ptr()), thetaOuter_(im.thetaOuter_().clone().ptr()), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), + sizeDistribution_(im.sizeDistribution_().clone().ptr()), tanVec1_(im.tanVec1_), tanVec2_(im.tanVec2_) {} @@ -222,7 +225,7 @@ void Foam::ConeInjection<CloudType>::setProperties parcel.U() = Umag_().value(t)*dirVec; // set particle diameter - parcel.d() = parcelDistributionModel_().sample(); + parcel.d() = sizeDistribution_().sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index 60b751bb684a473960524d559eaab57d37c06b13..278b2a1bddc0fecb99ed4645d7517b2caecb38c4 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -102,7 +102,7 @@ class ConeInjection const autoPtr<DataEntry<scalar> > thetaOuter_; //- Parcel size distribution model model - const autoPtr<distributionModels::distributionModel> parcelDistributionModel_; + const autoPtr<distributionModels::distributionModel> sizeDistribution_; // Tangential vectors to the direction vector diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C index faff5d7a39bc5457c3c6ec6d254ef052e4729d24..a7645b0bc2b0305240f3e4cc8ae872ef11bdd859 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C @@ -126,9 +126,12 @@ Foam::ConeInjectionMP<CloudType>::ConeInjectionMP Umag_(DataEntry<scalar>::New("Umag", this->coeffDict())), thetaInner_(DataEntry<scalar>::New("thetaInner", this->coeffDict())), thetaOuter_(DataEntry<scalar>::New("thetaOuter", this->coeffDict())), - parcelDistributionModel_ + sizeDistribution_ ( - distributionModels::distributionModel::New(this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen()) + distributionModels::distributionModel::New + ( + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() + ) ), nInjected_(this->parcelsAddedTotal()), tanVec1_(positions_.size()), @@ -193,7 +196,7 @@ Foam::ConeInjectionMP<CloudType>::ConeInjectionMP Umag_(im.Umag_().clone().ptr()), thetaInner_(im.thetaInner_().clone().ptr()), thetaOuter_(im.thetaOuter_().clone().ptr()), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), + sizeDistribution_(im.sizeDistribution_().clone().ptr()), nInjected_(im.nInjected_), tanVec1_(im.tanVec1_), tanVec2_(im.tanVec2_) @@ -268,7 +271,7 @@ void Foam::ConeInjectionMP<CloudType>::setProperties parcel.U() = Umag_().value(t)*dirVec; // set particle diameter - parcel.d() = parcelDistributionModel_().sample(); + parcel.d() = sizeDistribution_().sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H index d986e86a49b7a9ff321afa5a91cd7c7b22d142f3..806799bb7e07539d8beb3c58376ba6a542cdb7de 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H @@ -109,7 +109,7 @@ class ConeInjectionMP const autoPtr<DataEntry<scalar> > thetaOuter_; //- Parcel size distribution model model - const autoPtr<distributionModels::distributionModel> parcelDistributionModel_; + const autoPtr<distributionModels::distributionModel> sizeDistribution_; //- Number of parcels per injector already injected mutable label nInjected_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C index 95209cea066295ad6926ba9aa292652206dd2bc6..03fe941dab4d50019b706065a3761cc6c6aaa963 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C @@ -114,11 +114,11 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection nParcelsInjected_(positions_.size(), 0), U0_(this->coeffDict().lookup("U0")), diameters_(positions_.size()), - parcelDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelDistributionModel"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ) @@ -126,7 +126,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection // Construct parcel diameters - one per injector cell forAll(diameters_, i) { - diameters_[i] = parcelDistributionModel_->sample(); + diameters_[i] = sizeDistribution_->sample(); } // Determine total volume of particles to inject @@ -166,7 +166,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection nParcelsInjected_(im.nParcelsInjected_), U0_(im.U0_), diameters_(im.diameters_), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) + sizeDistribution_(im.sizeDistribution_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H index 91a570e4406547be386b4d44a45458de4fabd293..cf5b0239956671abebae90fd87a56d4fd7ea31aa 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H @@ -111,7 +111,8 @@ class FieldActivatedInjection scalarList diameters_; //- Parcel size distribution model model - const autoPtr<distributionModels::distributionModel> parcelDistributionModel_; + const autoPtr<distributionModels::distributionModel> + sizeDistribution_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C index b6107751f3ce951bf9cc82e87edca305345114af..8930fa85e8be3593c3becf148e6760f0d6c8ee72 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C @@ -90,7 +90,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject ( 1, (10*volumeAccumulator_) - /CloudType::parcelType::volume(parcelDistributionModel_().minValue()) + /CloudType::parcelType::volume(sizeDistribution_().minValue()) ); label iterationNo = 0; @@ -128,7 +128,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject { if (selfSeed_ && !cellCentresUsed.found(cI)) { - scalar dNew = parcelDistributionModel_().sample(); + scalar dNew = sizeDistribution_().sample(); newParticles_.append ( @@ -191,7 +191,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject scalar R = sqrt(3.0)*a/(2.0*sqrt(2.0)); scalar d = a/(2.0*sqrt(3.0)); - scalar dNew = parcelDistributionModel_().sample(); + scalar dNew = sizeDistribution_().sample(); scalar volNew = CloudType::parcelType::volume(dNew); newParticles_.append @@ -204,7 +204,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelDistributionModel_().sample(); + dNew = sizeDistribution_().sample(); newParticles_.append ( vectorPairScalarPair @@ -215,7 +215,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelDistributionModel_().sample(); + dNew = sizeDistribution_().sample(); newParticles_.append ( vectorPairScalarPair @@ -226,7 +226,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelDistributionModel_().sample(); + dNew = sizeDistribution_().sample(); newParticles_.append ( vectorPairScalarPair @@ -341,11 +341,11 @@ Foam::InflationInjection<CloudType>::InflationInjection fraction_(1.0), selfSeed_(this->coeffDict().lookupOrDefault("selfSeed", false)), dSeed_(SMALL), - parcelDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelDistributionModel"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ) @@ -409,7 +409,7 @@ Foam::InflationInjection<CloudType>::InflationInjection fraction_(im.fraction_), selfSeed_(im.selfSeed_), dSeed_(im.dSeed_), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) + sizeDistribution_(im.sizeDistribution_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H index 730c4acec1803b34c85567b536ef7588e8f5c725..ab3f3d182201f948ce5c81407e33aa658b7ea26f 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H @@ -108,7 +108,7 @@ class InflationInjection scalar dSeed_; //- Parcel size distribution model model - const autoPtr<distributionModels::distributionModel> parcelDistributionModel_; + const autoPtr<distributionModels::distributionModel> sizeDistribution_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C index 5f23df32cc431eec5bc0e5e31a24b115408e0a20..f5255106fdf3659c5d44e395f426165a71e512d2 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C @@ -96,11 +96,11 @@ Foam::ManualInjection<CloudType>::ManualInjection injectorTetFaces_(positions_.size(), -1), injectorTetPts_(positions_.size(), -1), U0_(this->coeffDict().lookup("U0")), - parcelDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelDistributionModel"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ) @@ -149,7 +149,7 @@ Foam::ManualInjection<CloudType>::ManualInjection // Construct parcel diameters forAll(diameters_, i) { - diameters_[i] = parcelDistributionModel_->sample(); + diameters_[i] = sizeDistribution_->sample(); } // Determine volume of particles to inject @@ -171,7 +171,7 @@ Foam::ManualInjection<CloudType>::ManualInjection injectorTetFaces_(im.injectorTetFaces_), injectorTetPts_(im.injectorTetPts_), U0_(im.U0_), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) + sizeDistribution_(im.sizeDistribution_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H index 215a8da2f15a6e97392c4e2ee7bc617401008992..972995a458896f569a33503ed7f9b26f974eb255 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H @@ -83,7 +83,7 @@ class ManualInjection const vector U0_; //- Parcel size distribution model model - const autoPtr<distributionModels::distributionModel> parcelDistributionModel_; + const autoPtr<distributionModels::distributionModel> sizeDistribution_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C index a762bf3316c83639f75db5fd59cf668e2b2797c4..1f6a2750272fd8b0ce91328ae78524acf592a99f 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C @@ -104,11 +104,11 @@ Foam::PatchInjection<CloudType>::PatchInjection ( DataEntry<scalar>::New("flowRateProfile", this->coeffDict()) ), - parcelDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelDistributionModel"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ), @@ -157,7 +157,7 @@ Foam::PatchInjection<CloudType>::PatchInjection parcelsPerSecond_(im.parcelsPerSecond_), U0_(im.U0_), flowRateProfile_(im.flowRateProfile_().clone().ptr()), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), + sizeDistribution_(im.sizeDistribution_().clone().ptr()), cellOwners_(im.cellOwners_), fraction_(im.fraction_) {} @@ -240,7 +240,7 @@ void Foam::PatchInjection<CloudType>::setProperties parcel.U() = U0_; // set particle diameter - parcel.d() = parcelDistributionModel_->sample(); + parcel.d() = sizeDistribution_->sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H index 2245ad8b9cc770ab22aafd9dce2f69702625d0d9..4ee540c7bf1ef1859f70e0f52f3216417d3c4cc5 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H @@ -86,7 +86,7 @@ class PatchInjection const autoPtr<DataEntry<scalar> > flowRateProfile_; //- Parcel size distribution model model - const autoPtr<distributionModels::distributionModel> parcelDistributionModel_; + const autoPtr<distributionModels::distributionModel> sizeDistribution_; //- List of cell labels corresponding to injector positions labelList cellOwners_; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 746e73e254c8976167becf42649c5a84e214803a..cd5f1054015aadcef898cff90df72cb035243ae7 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -131,7 +131,7 @@ subModels SOI 0; positionsFile "coalCloud1Positions"; U0 ( 0 -10 0 ); - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 2f97343b5cd372df5025c390cb15dc859996d829..699ce6d46bec35da59157182e49ae7c625dd54af 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -107,7 +107,7 @@ subModels SOI 0; positionsFile "limestonePositions"; U0 ( 0 0 0 ); - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 433b3082fe5c132bd3a63504f0f81769020418e0..60b93e7d13cfce997e0838e53425955154a6af6a 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -130,7 +130,7 @@ subModels SOI 0; positionsFile "reactingCloud1Positions"; U0 (0 0 0); - parcelDistribution + sizeDistribution { pdfType uniform; uniformDistribution diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 2eaf9f11d70fbc7aa92ea3be58f3780f84741bd8..e28b21992b5297e596939d684d4b83ebf4d79997 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -133,7 +133,7 @@ subModels parcelsPerSecond 1e5; U0 (40 0 0); flowRateProfile constant 1; - parcelDistribution + sizeDistribution { pdfType general; generalDistribution diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index 49f09ba2db0721b7b21223e163c233070cdea1c5..ff99c3fba903835933e76540c29aa06ffdc2fcec 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -131,7 +131,7 @@ subModels thetaInner constant 0; thetaOuter constant 45; - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties index 20743a48b8774f1dfbf751d59019a76fda95ead3..9a2aa28a680228d502aafd4b6721eaa9c11da1f2 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties @@ -59,7 +59,7 @@ thermoSingleLayerCoeffs particlesPerParcel 100.0; - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index 4f1f754edbc25ebf1d86e4683685b0f8db873e01..2b4877e8d15362c6c48c3407d9e32062a2ebf2cb 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -131,7 +131,7 @@ subModels thetaInner constant 0; thetaOuter constant 45; - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties index bf07405f41ec682b1074df35c09e5ecb430f1687..7c745789b7503e92cd99aa9207ad7724603fb3c2 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties @@ -61,7 +61,7 @@ thermoSingleLayerCoeffs particlesPerParcel 100.0; - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index 93b2bfa516d4a171ed33bd5cf25e99b44a96feb9..823e4111abd34bc55bfe1733f5fadb680990668f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -123,7 +123,7 @@ subModels SOI 0; positionsFile "reactingCloud1Positions"; U0 ( 0 0 0 ); - parcelDistribution + sizeDistribution { pdfType uniform; uniformDistribution diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index ad33dc46d3066a92039594d2546e77d34158eecc..4896ab3e80903ff5cb64a237f04745c741f815f8 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -87,7 +87,7 @@ subModels SOI 0; positionsFile "kinematicCloud1Positions"; U0 ( 0 0 0 ); - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 72d096b370af7cc59b016edb3abbf5e7632390bd..451e2419c729370b176395e9327d6242fdf6daf2 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -106,7 +106,7 @@ subModels SOI 0; positionsFile "thermoCloud1Positions"; U0 ( 0 0 0 ); - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 003816f8a7cfd5885f203fb45c9dd8bb1ffd6ee0..1201e969082907e32bc35501f706157b215e6e3f 100644 --- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -144,7 +144,7 @@ subModels duration 1; // NOTE: set to 1 for steady state U0 (0 40 0); flowRateProfile constant 1; - parcelDistribution + sizeDistribution { pdfType general; generalDistribution