Revert "BUG: Contuation from commit ca0799cbc7 - updated cellSource"

This reverts commit b8c2cbaaec.
This commit is contained in:
andy
2011-02-08 15:52:31 +00:00
parent 654b8d18cb
commit 0942748819
2 changed files with 11 additions and 10 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -72,32 +72,32 @@ Type Foam::fieldValues::cellSource::processValues
{
case opSum:
{
result = gSum(values);
result = sum(values);
break;
}
case opVolAverage:
{
result = gSum(values*V)/gSum(V);
result = sum(values*V)/sum(V);
break;
}
case opVolIntegrate:
{
result = gSum(values*V);
result = sum(values*V);
break;
}
case opWeightedAverage:
{
result = gSum(values*weightField)/gSum(weightField);
result = sum(values*weightField)/sum(weightField);
break;
}
case opMin:
{
result = gMin(values);
result = min(values);
break;
}
case opMax:
{
result = gMax(values);
result = max(values);
break;
}
default:
@ -128,10 +128,10 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName)
combineFields(setFieldValues<scalar>(weightFieldName_))
);
Type result = processValues(values, V, weightField);
if (Pstream::master())
{
Type result = processValues(values, V, weightField);
if (valueOutput_)
{
IOField<Type>