diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C index 0318dbb1fa..9332f97b5a 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C @@ -52,11 +52,11 @@ Foam::ChomiakInjector::ChomiakInjector : injectorModel(dict, sm), ChomiakDict_(dict.subDict(typeName + "Coeffs")), - dropletDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - ChomiakDict_.subDict("dropletDistributionModel"), + ChomiakDict_.subDict("sizeDistribution"), sm.rndGen() ) ), @@ -101,7 +101,7 @@ Foam::scalar Foam::ChomiakInjector::d0 const scalar ) const { - return dropletDistributionModel_->sample(); + return sizeDistribution_->sample(); } @@ -113,8 +113,8 @@ Foam::vector Foam::ChomiakInjector::direction const scalar d ) const { - scalar dMin = dropletDistributionModel_->minValue(); - scalar dMax = dropletDistributionModel_->maxValue(); + scalar dMin = sizeDistribution_->minValue(); + scalar dMax = sizeDistribution_->maxValue(); scalar angle = (d - dMax)*maxSprayAngle_[n] diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H index 2803334068..bcda0e5df7 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H @@ -63,7 +63,7 @@ private: dictionary ChomiakDict_; - autoPtr dropletDistributionModel_; + autoPtr sizeDistribution_; scalarList maxSprayAngle_; diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C index 17e65d4d5d..4282d5ec63 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C @@ -52,11 +52,11 @@ Foam::definedHollowConeInjector::definedHollowConeInjector : injectorModel(dict, sm), definedHollowConeDict_(dict.subDict(typeName + "Coeffs")), - dropletDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - definedHollowConeDict_.subDict("dropletDistributionModel"), + definedHollowConeDict_.subDict("sizeDistribution"), sm.rndGen() ) ), @@ -138,7 +138,7 @@ Foam::scalar Foam::definedHollowConeInjector::d0 { // swallow function arguments - not used // return value sampled from distribution model - return dropletDistributionModel_->sample(); + return sizeDistribution_->sample(); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H index ec08e64aea..8da81dcd2c 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H @@ -60,7 +60,7 @@ private: typedef VectorSpace, scalar, 2> pair; dictionary definedHollowConeDict_; - autoPtr dropletDistributionModel_; + autoPtr sizeDistribution_; // inner and outer cone angle time histories // 2 column vectors = (time, coneAngle) diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C index 198c30eaa8..eb358ae7b4 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C @@ -52,11 +52,11 @@ Foam::hollowConeInjector::hollowConeInjector : injectorModel(dict, sm), hollowConeDict_(dict.subDict(typeName + "Coeffs")), - dropletDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - hollowConeDict_.subDict("dropletDistributionModel"), + hollowConeDict_.subDict("sizeDistribution"), sm.rndGen() ) ), @@ -112,7 +112,7 @@ Foam::scalar Foam::hollowConeInjector::d0 const scalar ) const { - return dropletDistributionModel_->sample(); + return sizeDistribution_->sample(); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H index 3c80c2b2d4..abb59667b9 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H @@ -58,7 +58,7 @@ private: dictionary hollowConeDict_; - autoPtr dropletDistributionModel_; + autoPtr sizeDistribution_; scalarList innerAngle_; scalarList outerAngle_; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties index ea38b2c4a4..f9c1ae9b09 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties @@ -120,7 +120,7 @@ RanzMarshallCoeffs hollowConeInjectorCoeffs { - dropletDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution