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

ENH: Clean-up after latest Foundation integrations

Browse Source
This commit is contained in:
Andrew Heather
2017-03-27 14:34:01 +01:00
parent dcb1a95e35
commit b708c23cfc
17 changed files with 433 additions and 393 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_))
{
scalarField weightField = getFieldValues<scalar>
scalarField weightField
(
weightFieldName_,
true,
orientWeightField_
getFieldValues<scalar>
(
weightFieldName_,
true,
orientWeightField_
)
);
// Process the fields
@ -998,11 +1001,14 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
}
else if (validField<vector>(weightFieldName_))
{
vectorField weightField = getFieldValues<vector>
vectorField weightField
(
weightFieldName_,
true,
orientWeightField_
getFieldValues<vector>
(
weightFieldName_,
true,
orientWeightField_
)
);
// Process the fields

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

@ -147,17 +147,6 @@ processSameTypeValues
break;
}
case opWeightedSum:
{
if (weightField.size())
{
result = sum(weightField*values);
}
else
{
result = sum(values);
}
break;
}
{
if (returnReduce(weightField.empty(), andOp<bool>()))
{
@ -165,7 +154,7 @@ processSameTypeValues
}
else
{
tmp<scalarField> weight = weightingFactor(weightField);
tmp<scalarField> weight(weightingFactor(weightField));
result = gSum(weight*values);
}
@ -202,7 +191,7 @@ processSameTypeValues
}
else
{
const scalarField factor = weightingFactor(weightField);
const scalarField factor(weightingFactor(weightField));
result = gSum(factor*values)/(gSum(factor) + ROOTVSMALL);
}
@ -217,7 +206,7 @@ processSameTypeValues
}
case opWeightedAreaAverage:
{
const scalarField factor = weightingFactor(weightField, Sf);
const scalarField factor(weightingFactor(weightField, Sf));
result = gSum(factor*values)/gSum(factor + ROOTVSMALL);
break;
@ -231,25 +220,11 @@ processSameTypeValues
}
case opWeightedAreaIntegrate:
{
const scalarField factor = weightingFactor(weightField, Sf);
const scalarField factor(weightingFactor(weightField, Sf));
result = gSum(factor*values);
break;
}
case opWeightedAreaIntegrate:
{
const scalarField magSf(mag(Sf));
if (weightField.size())
{
result = sum(weightField*magSf*values);
}
else
{
result = sum(magSf*values);
}
break;
}
case opMin:
{
result = gMin(values);