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: FieldFunctions reduce on returnType, not input type (#1327)

Browse Source 
- for most functions the input type and return type are identical,
  but MinMax, sumMag are not.
This commit is contained in:
Mark Olesen
2019-05-28 14:48:18 +02:00
committed by Andrew Heather
parent 7945ca739c
commit 26a6533053
8 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
View File

@ -554,13 +554,14 @@ scalarMinMax minMaxMag(const FieldField<Field, Type>& f)
TMP_UNARY_FUNCTION(scalarMinMax, minMaxMag)
// With reduction on ReturnType
#define G_UNARY_FUNCTION(returnType, gFunc, func, rFunc) \
\
template<template<class> class Field, class Type> \
returnType gFunc(const FieldField<Field, Type>& f) \
{ \
returnType res = func(f); \
reduce(res, rFunc##Op<Type>()); \
reduce(res, rFunc##Op<returnType>()); \
return res; \
} \
TMP_UNARY_FUNCTION(returnType, gFunc)
@ -568,10 +569,11 @@ TMP_UNARY_FUNCTION(returnType, gFunc)
G_UNARY_FUNCTION(Type, gMax, max, max)
G_UNARY_FUNCTION(Type, gMin, min, min)
G_UNARY_FUNCTION(Type, gSum, sum, sum)
G_UNARY_FUNCTION(scalar, gSumMag, sumMag, sum)
G_UNARY_FUNCTION(MinMax<Type>, gMinMax, minMax, minMax)
G_UNARY_FUNCTION(scalarMinMax, gMinMaxMag, minMaxMag, minMaxMag)
G_UNARY_FUNCTION(MinMax<Type>, gMinMax, minMax, sum)
G_UNARY_FUNCTION(scalarMinMax, gMinMaxMag, minMaxMag, sum)
G_UNARY_FUNCTION(scalar, gSumMag, sumMag, sum)
#undef G_UNARY_FUNCTION