ENH: added surfaceFieldValue uniformity operation

src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,18 +83,21 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::operationTypeNames_
     { operationType::opCoV, "CoV" },
     { operationType::opAreaNormalAverage, "areaNormalAverage" },
     { operationType::opAreaNormalIntegrate, "areaNormalIntegrate" },
+    { operationType::opUniformity, "uniformity" },
 
     // Using weighting
     { operationType::opWeightedSum, "weightedSum" },
     { operationType::opWeightedAverage, "weightedAverage" },
     { operationType::opWeightedAreaAverage, "weightedAreaAverage" },
     { operationType::opWeightedAreaIntegrate, "weightedAreaIntegrate" },
+    { operationType::opWeightedUniformity, "weightedUniformity" },
 
     // Using absolute weighting
     { operationType::opAbsWeightedSum, "absWeightedSum" },
     { operationType::opAbsWeightedAverage, "absWeightedAverage" },
     { operationType::opAbsWeightedAreaAverage, "absWeightedAreaAverage" },
     { operationType::opAbsWeightedAreaIntegrate, "absWeightedAreaIntegrate" },
+    { operationType::opAbsWeightedUniformity, "absWeightedUniformity" },
 };
 
 const Foam::Enum
@@ -117,10 +120,8 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::obr() const
     {
         return mesh_.lookupObject<objectRegistry>(regionName_);
     }
-    else
-    {
-        return mesh_;
-    }
+
+    return mesh_;
 }
 
 
@@ -599,7 +600,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::initialise
         }
     }
 
-    // Backwards compatibility for v1612+ and older
+    // Backwards compatibility for v1612 and older
     List<word> orientedFields;
     if (dict.readIfPresent("orientedFields", orientedFields))
     {
@@ -696,6 +697,45 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::processValues
 
             return gSum(pos0(nv)*mag(values) - neg(nv)*mag(values));
         }
+
+        case opUniformity:
+        case opWeightedUniformity:
+        case opAbsWeightedUniformity:
+        {
+            const scalar areaTotal = gSum(mag(Sf));
+            tmp<scalarField> areaVal(values * mag(Sf));
+
+            scalar mean, numer;
+
+            if (canWeight(weightField))
+            {
+                // Weighted quantity = (Weight * phi * dA)
+
+                tmp<scalarField> weight(weightingFactor(weightField));
+
+                // Mean weighted value (area-averaged)
+                mean = gSum(weight()*areaVal()) / areaTotal;
+
+                // Abs. deviation from weighted mean value
+                numer = gSum(mag(weight*areaVal - (mean * mag(Sf))));
+            }
+            else
+            {
+                // Unweighted quantity = (1 * phi * dA)
+
+                // Mean value (area-averaged)
+                mean = gSum(areaVal()) / areaTotal;
+
+                // Abs. deviation from mean value
+                numer = gSum(mag(areaVal - (mean * mag(Sf))));
+            }
+
+            // Uniformity index
+            const scalar ui = 1 - numer/(2*mag(mean*areaTotal) + ROOTVSMALL);
+
+            return min(max(ui, 0), 1);
+        }
+
         default:
         {
             // Fall through to other operations
@@ -742,6 +782,45 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::processValues
             const scalar val = gSum(values & Sf);
             return vector(val, 0, 0);
         }
+
+        case opUniformity:
+        case opWeightedUniformity:
+        case opAbsWeightedUniformity:
+        {
+            const scalar areaTotal = gSum(mag(Sf));
+            tmp<scalarField> areaVal(values & Sf);
+
+            scalar mean, numer;
+
+            if (canWeight(weightField))
+            {
+                // Weighted quantity = (Weight * phi . dA)
+
+                tmp<scalarField> weight(weightingFactor(weightField));
+
+                // Mean weighted value (area-averaged)
+                mean = gSum(weight()*areaVal()) / areaTotal;
+
+                // Abs. deviation from weighted mean value
+                numer = gSum(mag(weight*areaVal - (mean * mag(Sf))));
+            }
+            else
+            {
+                // Unweighted quantity = (1 * phi . dA)
+
+                // Mean value (area-averaged)
+                mean = gSum(areaVal()) / areaTotal;
+
+                // Abs. deviation from mean value
+                numer = gSum(mag(areaVal - (mean * mag(Sf))));
+            }
+
+            // Uniformity index
+            const scalar ui = 1 - numer/(2*mag(mean*areaTotal) + ROOTVSMALL);
+
+            return vector(min(max(ui, 0), 1), 0, 0);
+        }
+
         default:
         {
             // Fall through to other operations
@@ -762,11 +841,9 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::weightingFactor
     {
         return mag(weightField);
     }
-    else
-    {
-        // pass through
-        return weightField;
-    }
+
+    // pass through
+    return weightField;
 }
 
 
@@ -788,10 +865,8 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::weightingFactor
     {
         return mag(weightField * mag(Sf));
     }
-    else
-    {
-        return (weightField * mag(Sf));
-    }
+
+    return (weightField * mag(Sf));
 }
 
 
@@ -813,10 +888,8 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::weightingFactor
     {
         return mag(weightField & Sf);
     }
-    else
-    {
-        return (weightField & Sf);
-    }
+
+    return (weightField & Sf);
 }