exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added additional weighted Ops for faceSource

Browse source
This commit is contained in:
Henrik Rusche 2017-04-18 16:53:26 +02:00
parent 67ab0b5abd
commit 34d4a30be7
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
View file

@ -48,11 +48,13 @@ namespace Foam
template<>
const char* NamedEnum<fieldValues::faceSource::operationType, 15>::names[] =
const char* NamedEnum<fieldValues::faceSource::operationType, 17>::names[] =
{
"none",
"sum",
"weightedSum",
"sumMag",
"weightedSumMag",
"sumDirection",
"sumDirectionBalance",
"average",
@ -78,7 +80,7 @@ namespace Foam
const Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 3>
Foam::fieldValues::faceSource::sourceTypeNames_;
const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 15>
const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 17>
Foam::fieldValues::faceSource::operationTypeNames_;

4
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
View file

@ -185,7 +185,9 @@ public:
{
opNone,
opSum,
opWeightedSum,
opSumMag,
opWeightedSumMag,
opSumDirection,
opSumDirectionBalance,
opAverage,
@ -201,7 +203,7 @@ public:
};
//- Operation type names
static const NamedEnum<operationType, 15> operationTypeNames_;
static const NamedEnum<operationType, 17> operationTypeNames_;
private:

10
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
View file

@ -143,11 +143,21 @@ Type Foam::fieldValues::faceSource::processSameTypeValues
result = sum(values);
break;
}
case opWeightedSum:
{
result = sum(weightField*values);
break;
}
case opSumMag:
{
result = sum(cmptMag(values));
break;
}
case opWeightedSumMag:
{
result = sum(weightField*cmptMag(values));
break;
}
case opSumDirection:
{
FatalErrorIn