From f4f38c3ccb1829bd1dc1e68a02bc6671de7552d0 Mon Sep 17 00:00:00 2001 From: andy <andy> Date: Wed, 2 Feb 2011 10:45:55 +0000 Subject: [PATCH] STYLE: intermediate lib: parcelDistributionModel->sizeDistribution --- .../ConeInjection/ConeInjection.C | 11 +++++++---- .../ConeInjection/ConeInjection.H | 2 +- .../ConeInjectionMP/ConeInjectionMP.C | 11 +++++++---- .../ConeInjectionMP/ConeInjectionMP.H | 2 +- .../FieldActivatedInjection.C | 8 ++++---- .../FieldActivatedInjection.H | 3 ++- .../InflationInjection/InflationInjection.C | 18 +++++++++--------- .../InflationInjection/InflationInjection.H | 2 +- .../ManualInjection/ManualInjection.C | 8 ++++---- .../ManualInjection/ManualInjection.H | 2 +- .../PatchInjection/PatchInjection.C | 8 ++++---- .../PatchInjection/PatchInjection.H | 2 +- .../constant/coalCloud1Properties | 2 +- .../constant/limestoneCloud1Properties | 2 +- .../constant/reactingCloud1Properties | 2 +- .../constant/reactingCloud1Properties | 2 +- .../hotBoxes/constant/reactingCloud1Properties | 2 +- .../hotBoxes/constant/surfaceFilmProperties | 2 +- .../constant/reactingCloud1Properties | 2 +- .../constant/surfaceFilmProperties | 2 +- .../constant/reactingCloud1Properties | 2 +- .../constant/kinematicCloud1Properties | 2 +- .../constant/thermoCloud1Properties | 2 +- .../constant/reactingCloud1Properties | 2 +- 24 files changed, 54 insertions(+), 47 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index d8675f0fd0e..711c41e87b2 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 60b751bb684..278b2a1bddc 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 faff5d7a39b..a7645b0bc2b 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 d986e86a49b..806799bb7e0 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 95209cea066..03fe941dab4 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 91a570e4406..cf5b0239956 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 b6107751f3c..8930fa85e8b 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 730c4acec18..ab3f3d18220 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 5f23df32cc4..f5255106fdf 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 215a8da2f15..972995a4588 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 a762bf3316c..1f6a2750272 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 2245ad8b9cc..4ee540c7bf1 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 746e73e254c..cd5f1054015 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 2f97343b5cd..699ce6d46be 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 433b3082fe5..60b93e7d13c 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 2eaf9f11d70..e28b21992b5 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 49f09ba2db0..ff99c3fba90 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 20743a48b87..9a2aa28a680 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 4f1f754edbc..2b4877e8d15 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 bf07405f41e..7c745789b75 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 93b2bfa516d..823e4111abd 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 ad33dc46d30..4896ab3e809 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 72d096b370a..451e2419c72 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 003816f8a7c..1201e969082 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 -- GitLab