STYLE: diesel lib: dropletDistributionModel->sizeDistribution

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]

src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H

@@ -63,7 +63,7 @@ private:
 
         dictionary ChomiakDict_;
 
-        autoPtr<distributionModels::distributionModel> dropletDistributionModel_;
+        autoPtr<distributionModels::distributionModel> sizeDistribution_;
         scalarList maxSprayAngle_;
 
 

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();
 }
 
 

src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H

@@ -60,7 +60,7 @@ private:
         typedef VectorSpace<Vector<scalar>, scalar, 2> pair;
 
         dictionary definedHollowConeDict_;
-        autoPtr<distributionModels::distributionModel> dropletDistributionModel_;
+        autoPtr<distributionModels::distributionModel> sizeDistribution_;
 
         // inner and outer cone angle time histories
         // 2 column vectors = (time, coneAngle)

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();
 }
 
 

src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H

@@ -58,7 +58,7 @@ private:
 
         dictionary hollowConeDict_;
 
-        autoPtr<distributionModels::distributionModel> dropletDistributionModel_;
+        autoPtr<distributionModels::distributionModel> sizeDistribution_;
         scalarList innerAngle_;
         scalarList outerAngle_;
 

tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties

@@ -120,7 +120,7 @@ RanzMarshallCoeffs
 
 hollowConeInjectorCoeffs
 {
-    dropletDistribution
+    sizeDistribution
     {
         pdfType         RosinRammler;
         RosinRammlerDistribution