diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/moments/moments.C b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/moments/moments.C index e8e5bbb4d1..9c36cefa37 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/moments/moments.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/moments/moments.C @@ -736,7 +736,7 @@ Foam::functionObjects::moments::moments coordinateType_(coordinateTypeNames_.read(dict.lookup("coordinateType"))), weightType_ ( - dict.found("weight") + dict.found("weightType") ? weightTypeNames_.read(dict.lookup("weightType")) : weightType::numberConcentration ), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/moments/moments.H b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/moments/moments.H index c337a0fc85..851aea300e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/moments/moments.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/moments/moments.H @@ -232,10 +232,10 @@ public: return wordList::null(); } - //- Calculate the force fields + //- Calculate the moment fields virtual bool execute(); - //- Write the force fields + //- Write the moment fields virtual bool write(); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C index c3a6bb68a8..7e5d0fc0d7 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C @@ -428,31 +428,18 @@ bool Foam::functionObjects::sizeDistribution::write() || functionType_ == functionType::areaDensity ) { + boundaryValues.first() = coordinateValues.first(); + boundaryValues.last() = coordinateValues.last(); + + for (label i = 1; i < boundaryValues.size() - 1; i++) + { + boundaryValues[i] = + 0.5*(coordinateValues[i] + coordinateValues[i-1]); + } + if (logTransform_) { - boundaryValues.first() = Foam::log(coordinateValues.first()); - boundaryValues.last() = Foam::log(coordinateValues.last()); - - for (label i = 1; i < boundaryValues.size() - 1; i++) - { - boundaryValues[i] = - 0.5 - *( - Foam::log(coordinateValues[i]) - + Foam::log(coordinateValues[i-1]) - ); - } - } - else - { - boundaryValues.first() = coordinateValues.first(); - boundaryValues.last() = coordinateValues.last(); - - for (label i = 1; i < boundaryValues.size() - 1; i++) - { - boundaryValues[i] = - (coordinateValues[i] + coordinateValues[i-1])/2; - } + boundaryValues = Foam::log(boundaryValues); } } diff --git a/etc/caseDicts/postProcessing/multiphase/moments b/etc/caseDicts/postProcessing/multiphase/moments index 912b856118..510a6d5607 100644 --- a/etc/caseDicts/postProcessing/multiphase/moments +++ b/etc/caseDicts/postProcessing/multiphase/moments @@ -23,7 +23,7 @@ weightType numberConcentration; // volumeConcentration, // areaConcentration // defaults to numberConcentration order 0; // relevant for integer moments only -mean arithmetic; // geometric +meanType arithmetic; // geometric // relevant for non-integer moments, // defaults to arithmetic