From 09427488198972993f43782441be2bcd7b52f6e1 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 8 Feb 2011 15:52:31 +0000 Subject: [PATCH] Revert "BUG: Contuation from commit ca0799cbc7f - updated cellSource" This reverts commit b8c2cbaaec6c1b0ae2dcee668502655e198df2ee. --- .../cellSource/cellSourceTemplates.C | 18 +++++++++--------- .../faceSource/faceSourceTemplates.C | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C index 77bcb85737..719393b252 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C @@ -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(weightFieldName_)) ); - Type result = processValues(values, V, weightField); - if (Pstream::master()) { + Type result = processValues(values, V, weightField); + if (valueOutput_) { IOField diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C index e122d2f7f9..d8ab9fac28 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C @@ -158,10 +158,11 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName) magSf = combineFields(magSf); weightField = combineFields(weightField); - Type result = processValues(values, magSf, weightField); if (Pstream::master()) { + Type result = processValues(values, magSf, weightField); + if (valueOutput_) { IOField