diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index dace4a6522..b1020c1e20 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -288,7 +288,7 @@ protected: typename ParcelType::constantProperties constProps_; //- Sub-models dictionary - const dictionary& subModelProperties_; + const dictionary subModelProperties_; //- Random number generator - used by some injection routines cachedRandom rndGen_; diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H index feb5ea8ee4..0f655be004 100644 --- a/src/lagrangian/intermediate/particleForces/particleForces.H +++ b/src/lagrangian/intermediate/particleForces/particleForces.H @@ -70,7 +70,7 @@ class particleForces const fvMesh& mesh_; //- The particleForces dictionary - const dictionary& dict_; + const dictionary dict_; //- Gravity const vector g_; diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C index 77bcb85737..e9be76e527 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C @@ -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: @@ -119,19 +119,19 @@ bool Foam::fieldValues::cellSource::writeValues(const word& fieldName) if (ok) { - Field values(combineFields(setFieldValues(fieldName))); + Field values(setFieldValues(fieldName)); + combineFields(values); - scalarField V(combineFields(filterField(mesh().V()))); + scalarField V(filterField(mesh().V())); + combineFields(V); - scalarField weightField - ( - combineFields(setFieldValues(weightFieldName_)) - ); - - Type result = processValues(values, V, weightField); + scalarField weightField(setFieldValues(weightFieldName_)); + combineFields(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 34ad992c0c..05fba8b9c0 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C @@ -91,32 +91,32 @@ Type Foam::fieldValues::faceSource::processValues { case opSum: { - result = gSum(values); + result = sum(values); break; } case opAreaAverage: { - result = gSum(values*magSf)/gSum(magSf); + result = sum(values*magSf)/sum(magSf); break; } case opAreaIntegrate: { - result = gSum(values*magSf); + result = sum(values*magSf); 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: @@ -150,18 +150,19 @@ bool Foam::fieldValues::faceSource::writeValues(const word& fieldName) else { // Get unoriented magSf - magSf = combineFields(filterField(mesh().magSf(), false)); + magSf = filterField(mesh().magSf(), false); } // Combine onto master - values = combineFields(values); - magSf = combineFields(magSf); - weightField = combineFields(weightField); + combineFields(values); + combineFields(magSf); + combineFields(weightField); - Type result = processValues(values, magSf, weightField); if (Pstream::master()) { + Type result = processValues(values, magSf, weightField); + if (valueOutput_) { IOField diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H index 179b96ae94..e382d98f89 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H +++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -166,12 +166,11 @@ public: //- Combine fields from all processor domains into single field template - tmp > combineFields(const Field& field) const; + void combineFields(Field& field); //- Combine fields from all processor domains into single field template - tmp > combineFields(const tmp >&) const; - + void combineFields(tmp >&); }; diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C index 3df599081d..55cce5e017 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,10 +30,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -Foam::tmp > Foam::fieldValue::combineFields -( - const Field& field -) const +void Foam::fieldValue::combineFields(Field& field) { List > allValues(Pstream::nProcs()); @@ -43,32 +40,20 @@ Foam::tmp > Foam::fieldValue::combineFields if (Pstream::master()) { - return tmp > - ( - new Field + field = + ListListOps::combine > ( - ListListOps::combine > - ( - allValues, - accessOp >() - ) - ) - ); - } - else - { - return field; + allValues, + accessOp >() + ); } } template -Foam::tmp > Foam::fieldValue::combineFields -( - const tmp >& field -) const +void Foam::fieldValue::combineFields(tmp >& field) { - return combineFields(field()); + combineFields(field()); }