zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: Corrected ambiguous construction from tmp errors

Browse Source
This commit is contained in:
Andrew Heather
2017-03-24 15:50:27 +00:00
parent bad27c45fc
commit 65a4a357b5
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
View File

@ -986,11 +986,14 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
{ {
if (validField<scalar>(weightFieldName_)) if (validField<scalar>(weightFieldName_))
{ {
scalarField weightField = getFieldValues<scalar> scalarField weightField
( (
weightFieldName_, getFieldValues<scalar>
true, (
orientWeightField_ weightFieldName_,
true,
orientWeightField_
)
); );
// Process the fields // Process the fields
@ -998,11 +1001,14 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
} }
else if (validField<vector>(weightFieldName_)) else if (validField<vector>(weightFieldName_))
{ {
vectorField weightField = getFieldValues<vector> vectorField weightField
( (
weightFieldName_, getFieldValues<vector>
true, (
orientWeightField_ weightFieldName_,
true,
orientWeightField_
)
); );
// Process the fields // Process the fields

6
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
View File

@ -191,7 +191,7 @@ processSameTypeValues
} }
else else
{ {
const scalarField factor = weightingFactor(weightField); const scalarField factor(weightingFactor(weightField));
result = gSum(factor*values)/(gSum(factor) + ROOTVSMALL); result = gSum(factor*values)/(gSum(factor) + ROOTVSMALL);
} }
@ -206,7 +206,7 @@ processSameTypeValues
} }
case opWeightedAreaAverage: case opWeightedAreaAverage:
{ {
const scalarField factor = weightingFactor(weightField, Sf); const scalarField factor(weightingFactor(weightField, Sf));
result = gSum(factor*values)/gSum(factor + ROOTVSMALL); result = gSum(factor*values)/gSum(factor + ROOTVSMALL);
break; break;
@ -220,7 +220,7 @@ processSameTypeValues
} }
case opWeightedAreaIntegrate: case opWeightedAreaIntegrate:
{ {
const scalarField factor = weightingFactor(weightField, Sf); const scalarField factor(weightingFactor(weightField, Sf));
result = gSum(factor*values); result = gSum(factor*values);
break; break;