ENH: Re-inistated weighted-average fieldAverage usage

This commit is contained in:
andy
2012-03-02 17:13:46 +00:00
parent edccfce28e
commit 04033b6968
6 changed files with 35 additions and 12 deletions

View File

@ -78,7 +78,8 @@ template<class Type>
Type Foam::fieldValues::cellSource::processValues
(
const Field<Type>& values,
const scalarField& V
const scalarField& V,
const scalarField& weightField
) const
{
Type result = pTraits<Type>::zero;
@ -94,6 +95,11 @@ Type Foam::fieldValues::cellSource::processValues
result = sum(values)/values.size();
break;
}
case opWeightedAverage:
{
result = sum(values)/sum(weightField);
break;
}
case opVolAverage:
{
result = sum(values*V)/sum(V);
@ -169,7 +175,7 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
if (Pstream::master())
{
Type result = processValues(values, V);
Type result = processValues(values, V, weightField);
if (valueOutput_)
{