functionObjects: Rationalised use of enumerations by using the C++11 scoped form

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

@@ -430,17 +430,17 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::initialise
 
     switch (regionType_)
     {
-        case stFaceZone:
+        case regionTypes::faceZone:
         {
             setFaceZoneFaces();
             break;
         }
-        case stPatch:
+        case regionTypes::patch:
         {
             setPatchFaces();
             break;
         }
-        case stSampledSurface:
+        case regionTypes::sampledSurface:
         {
             sampledSurfaceFaces(dict);
             break;
@@ -480,7 +480,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::initialise
     {
         Info<< "    weight field = " << weightFieldName_ << nl;
 
-        if (regionType_ == stSampledSurface)
+        if (regionType_ == regionTypes::sampledSurface)
         {
             FatalIOErrorInFunction(dict)
                 << "Cannot use weightField for a sampledSurface"
@@ -541,7 +541,7 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::writeFileHeader
     const label i
 )
 {
-    if (operation_ != opNone)
+    if (operation_ != operationType::none)
     {
         writeCommented(file(), "Region type : ");
         file() << regionTypeNames_[regionType_] << " " << regionName_ << endl;
@@ -579,12 +579,12 @@ processValues
 {
     switch (operation_)
     {
-        case opSumDirection:
+        case operationType::sumDirection:
         {
             vector n(dict_.lookup("direction"));
             return sum(pos0(values*(Sf & n))*mag(values));
         }
-        case opSumDirectionBalance:
+        case operationType::sumDirectionBalance:
         {
             vector n(dict_.lookup("direction"));
             const scalarField nv(values*(Sf & n));
@@ -611,7 +611,7 @@ processValues
 {
     switch (operation_)
     {
-        case opSumDirection:
+        case operationType::sumDirection:
         {
             vector n(dict_.lookup("direction"));
             n /= mag(n) + rootVSmall;
@@ -619,7 +619,7 @@ processValues
 
             return sum(pos0(nv)*n*(nv));
         }
-        case opSumDirectionBalance:
+        case operationType::sumDirectionBalance:
         {
             vector n(dict_.lookup("direction"));
             n /= mag(n) + rootVSmall;
@@ -627,12 +627,12 @@ processValues
 
             return sum(pos0(nv)*n*(nv));
         }
-        case opAreaNormalAverage:
+        case operationType::areaNormalAverage:
         {
             scalar result = sum(values & Sf)/sum(mag(Sf));
             return vector(result, 0.0, 0.0);
         }
-        case opAreaNormalIntegrate:
+        case operationType::areaNormalIntegrate:
         {
             scalar result = sum(values & Sf);
             return vector(result, 0.0, 0.0);
@@ -719,7 +719,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::read
 
 bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
 {
-    if (operation_ != opNone)
+    if (operation_ != operationType::none)
     {
         fieldValue::write();
     }
@@ -729,7 +729,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
         surfacePtr_().update();
     }
 
-    if (operation_ != opNone && Pstream::master())
+    if (operation_ != operationType::none && Pstream::master())
     {
         writeTime(file());
     }
@@ -737,7 +737,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
     if (writeArea_)
     {
         totalArea_ = totalArea();
-        if (operation_ != opNone && Pstream::master())
+        if (operation_ != operationType::none && Pstream::master())
         {
             file() << tab << totalArea_;
         }
@@ -811,7 +811,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()
         }
     }
 
-    if (operation_ != opNone && Pstream::master())
+    if (operation_ != operationType::none && Pstream::master())
     {
         file() << endl;
     }

src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H

@@ -192,11 +192,11 @@ public:
     // Public data types
 
         //- region type enumeration
-        enum regionTypes
+        enum class regionTypes
         {
-            stFaceZone,
-            stPatch,
-            stSampledSurface
+            faceZone,
+            patch,
+            sampledSurface
         };
 
         //- region type names
@@ -204,25 +204,25 @@ public:
 
 
         //- Operation type enumeration
-        enum operationType
+        enum class operationType
         {
-            opNone,
-            opSum,
-            opWeightedSum,
-            opSumMag,
-            opSumDirection,
-            opSumDirectionBalance,
-            opAverage,
-            opWeightedAverage,
-            opAreaAverage,
-            opWeightedAreaAverage,
-            opAreaIntegrate,
-            opWeightedAreaIntegrate,
-            opMin,
-            opMax,
-            opCoV,
-            opAreaNormalAverage,
-            opAreaNormalIntegrate
+            none,
+            sum,
+            weightedSum,
+            sumMag,
+            sumDirection,
+            sumDirectionBalance,
+            average,
+            weightedAverage,
+            areaAverage,
+            weightedAreaAverage,
+            areaIntegrate,
+            weightedAreaIntegrate,
+            min,
+            max,
+            CoV,
+            areaNormalAverage,
+            areaNormalIntegrate
         };
 
         //- Operation type names

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

@@ -41,7 +41,11 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::validField
     typedef GeometricField<Type, fvsPatchField, surfaceMesh> sf;
     typedef GeometricField<Type, fvPatchField, volMesh> vf;
 
-    if (regionType_ != stSampledSurface && obr_.foundObject<sf>(fieldName))
+    if
+    (
+        regionType_ != regionTypes::sampledSurface
+     && obr_.foundObject<sf>(fieldName)
+    )
     {
         return true;
     }
@@ -66,7 +70,11 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::getFieldValues
     typedef GeometricField<Type, fvsPatchField, surfaceMesh> sf;
     typedef GeometricField<Type, fvPatchField, volMesh> vf;
 
-    if (regionType_ != stSampledSurface && obr_.foundObject<sf>(fieldName))
+    if
+    (
+        regionType_ != regionTypes::sampledSurface
+     && obr_.foundObject<sf>(fieldName)
+    )
     {
         return filterField(obr_.lookupObject<sf>(fieldName), applyOrientation);
     }
@@ -136,12 +144,12 @@ processSameTypeValues
     Type result = Zero;
     switch (operation_)
     {
-        case opSum:
+        case operationType::sum:
         {
             result = sum(values);
             break;
         }
-        case opWeightedSum:
+        case operationType::weightedSum:
         {
             if (weightField.size())
             {
@@ -153,12 +161,12 @@ processSameTypeValues
             }
             break;
         }
-        case opSumMag:
+        case operationType::sumMag:
         {
             result = sum(cmptMag(values));
             break;
         }
-        case opSumDirection:
+        case operationType::sumDirection:
         {
             FatalErrorInFunction
                 << "Operation " << operationTypeNames_[operation_]
@@ -169,7 +177,7 @@ processSameTypeValues
             result = Zero;
             break;
         }
-        case opSumDirectionBalance:
+        case operationType::sumDirectionBalance:
         {
             FatalErrorInFunction
                 << "Operation " << operationTypeNames_[operation_]
@@ -180,12 +188,12 @@ processSameTypeValues
             result = Zero;
             break;
         }
-        case opAverage:
+        case operationType::average:
         {
             result = sum(values)/values.size();
             break;
         }
-        case opWeightedAverage:
+        case operationType::weightedAverage:
         {
             if (weightField.size())
             {
@@ -197,14 +205,14 @@ processSameTypeValues
             }
             break;
         }
-        case opAreaAverage:
+        case operationType::areaAverage:
         {
             const scalarField magSf(mag(Sf));
 
             result = sum(magSf*values)/sum(magSf);
             break;
         }
-        case opWeightedAreaAverage:
+        case operationType::weightedAreaAverage:
         {
             const scalarField magSf(mag(Sf));
 
@@ -218,14 +226,14 @@ processSameTypeValues
             }
             break;
         }
-        case opAreaIntegrate:
+        case operationType::areaIntegrate:
         {
             const scalarField magSf(mag(Sf));
 
             result = sum(magSf*values);
             break;
         }
-        case opWeightedAreaIntegrate:
+        case operationType::weightedAreaIntegrate:
         {
             const scalarField magSf(mag(Sf));
 
@@ -239,17 +247,17 @@ processSameTypeValues
             }
             break;
         }
-        case opMin:
+        case operationType::min:
         {
             result = min(values);
             break;
         }
-        case opMax:
+        case operationType::max:
         {
             result = max(values);
             break;
         }
-        case opCoV:
+        case operationType::CoV:
         {
             const scalarField magSf(mag(Sf));
 
@@ -268,11 +276,11 @@ processSameTypeValues
 
             break;
         }
-        case opAreaNormalAverage:
+        case operationType::areaNormalAverage:
         {}
-        case opAreaNormalIntegrate:
+        case operationType::areaNormalIntegrate:
         {}
-        case opNone:
+        case operationType::none:
         {}
     }
 
@@ -355,7 +363,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues
             }
         }
 
-        if (operation_ != opNone)
+        if (operation_ != operationType::none)
         {
             // Apply scale factor
             values *= scaleFactor_;