functionObjects: renamed moments and sizeDistribution packaged function objects

+ moments -> populationBalanceMoments + sizeDistribution -> populationBalanceSizeDistribution
2022-07-08 15:06:20 +01:00
parent 9c80366aa4
commit ea3ef02883
12 changed files with 19 additions and 19 deletions
--- a/etc/caseDicts/postProcessing/multiphase/populationBalanceMoments
+++ b/etc/caseDicts/postProcessing/multiphase/populationBalanceMoments
--- a/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution
+++ b/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict
@ -52,7 +52,7 @@ maxDeltaT       1;

 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        functionType=numberDensity,
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict
@ -52,7 +52,7 @@ maxDeltaT       1;

 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        functionType=numberDensity,
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict
@ -52,7 +52,7 @@ maxDeltaT       1;

 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        functionType=numberDensity,
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict
@ -52,7 +52,7 @@ maxDeltaT       1;

 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        functionType=numberDensity,
@ -60,7 +60,7 @@ functions
        funcName=numberDensity
    )

-    #includeFunc moments
+    #includeFunc populationBalanceMoments
    (
        populationBalance=bubbles,
        momentType=integerMoment,
@ -68,7 +68,7 @@ functions
        order=1
    )

-    #includeFunc moments
+    #includeFunc populationBalanceMoments
    (
        populationBalance=bubbles,
        momentType=integerMoment,
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict
@ -52,7 +52,7 @@ maxDeltaT       1;

 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        functionType=numberDensity,
@ -60,7 +60,7 @@ functions
        funcName=numberDensity
    )

-    #includeFunc moments
+    #includeFunc populationBalanceMoments
    (
        populationBalance=bubbles,
        momentType=integerMoment,
@ -68,7 +68,7 @@ functions
        order=1
    )

-    #includeFunc moments
+    #includeFunc populationBalanceMoments
    (
        populationBalance=bubbles,
        momentType=integerMoment,
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict
@ -52,7 +52,7 @@ maxDeltaT       1;

 functions
 {
-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        functionType=numberDensity,
@ -61,7 +61,7 @@ functions
        funcName=numberDensity
    )

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        functionType=volumeDensity,
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
@ -73,7 +73,7 @@ functions
        )
    )

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        regionType=cellZone,
@ -84,7 +84,7 @@ functions
        funcName=probabilityDensity.injection
    )

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=bubbles,
        regionType=cellZone,
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/pipeBend/system/controlDict
@ -53,7 +53,7 @@ functions
 {
    #includeFunc writeObjects(d.particles)

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=agglomerates,
        regionType=cellZone,
@ -64,7 +64,7 @@ functions
        funcName=probabilityDensity.afterBend_1d
    )

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=agglomerates,
        regionType=cellZone,
@ -75,7 +75,7 @@ functions
        funcName=probabilityDensity.afterBend_5d
    )

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=agglomerates,
        regionType=cellZone,
@ -86,7 +86,7 @@ functions
        funcName=probabilityDensity.afterBend_9d
    )

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=agglomerates,
        regionType=cellZone,
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
@ -60,7 +60,7 @@ functions
        fields=(TiCl4.vapor O2.vapor Cl2.vapor alpha.particles)
    )

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=aggregates,
        regionType=cellZone,
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
@ -60,7 +60,7 @@ functions
        fields=(TiCl4.vapor O2.vapor Cl2.vapor alpha.particles)
    )

-    #includeFunc sizeDistribution
+    #includeFunc populationBalanceSizeDistribution
    (
        populationBalance=aggregates,
        regionType=cellZone,