ENH: upgrade from NamedEnum to Enum (issue #515)

src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.C

@@ -47,32 +47,21 @@ namespace runTimeControls
 }
 }
 }
-template<>
-const char* Foam::NamedEnum
-<
-    Foam
-  ::functionObjects
-  ::runTimeControls
-  ::equationInitialResidualCondition
-  ::operatingMode,
-    2
->::names[] =
-{
-    "minimum",
-    "maximum"
-};
 
-const Foam::NamedEnum
+const Foam::Enum
 <
     Foam
   ::functionObjects
   ::runTimeControls
   ::equationInitialResidualCondition
-  ::operatingMode,
-    2
+  ::operatingMode
 >
 Foam::functionObjects::runTimeControls::equationInitialResidualCondition::
-    operatingModeNames;
+operatingModeNames
+{
+    { operatingMode::omMin, "minimum" },
+    { operatingMode::omMax, "maximum" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -90,7 +79,7 @@ equationInitialResidualCondition
     fieldNames_(dict.lookup("fields")),
     value_(readScalar(dict.lookup("value"))),
     timeStart_(dict.lookupOrDefault("timeStart", -GREAT)),
-    mode_(operatingModeNames.read(dict.lookup("mode")))
+    mode_(operatingModeNames.lookup("mode", dict))
 {
     if (fieldNames_.size())
     {

src/functionObjects/utilities/runTimeControl/runTimeCondition/equationInitialResidualCondition/equationInitialResidualCondition.H

@@ -37,7 +37,7 @@ SourceFiles
 #define functionObjects_runTimeControls_equationInitialResidualCondition_H
 
 #include "runTimeCondition.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,7 +64,7 @@ public:
         omMax           //!< Maximum
     };
 
-    static const NamedEnum<operatingMode, 2> operatingModeNames;
+    static const Enum<operatingMode> operatingModeNames;
 
 
 protected:

src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.C

@@ -57,27 +57,19 @@ namespace runTimeControls
 }
 }
 
-template<>
-const char* Foam::NamedEnum
-<
-    Foam::functionObjects::runTimeControls::minMaxCondition::modeType,
-    2
->::names[] =
-{
-    "minimum",
-    "maximum"
-};
-
-const Foam::NamedEnum
+const Foam::Enum
 <
     Foam
   ::functionObjects
   ::runTimeControls
   ::minMaxCondition
-  ::modeType,
-   2
+  ::modeType
 >
-    Foam::functionObjects::runTimeControls::minMaxCondition::modeTypeNames_;
+Foam::functionObjects::runTimeControls::minMaxCondition::modeTypeNames_
+{
+    { modeType::mdMin, "minimum" },
+    { modeType::mdMax, "maximum" },
+};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -92,7 +84,7 @@ Foam::functionObjects::runTimeControls::minMaxCondition::minMaxCondition
 :
     runTimeCondition(name, obr, dict, state),
     functionObjectName_(dict.lookup("functionObject")),
-    mode_(modeTypeNames_.read(dict.lookup("mode"))),
+    mode_(modeTypeNames_.lookup("mode", dict)),
     fieldNames_(dict.lookup("fields")),
     value_(readScalar(dict.lookup("value")))
 {}

src/functionObjects/utilities/runTimeControl/runTimeCondition/minMaxCondition/minMaxCondition.H

@@ -38,7 +38,7 @@ SourceFiles
 #define functionObjects_runTimeControls_minMaxCondition_H
 
 #include "runTimeCondition.H"
-#include "NamedEnum.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,7 +68,7 @@ public:
             mdMax           //!< Maximum
         };
 
-        static const NamedEnum<modeType, 2> modeTypeNames_;
+        static const Enum<modeType> modeTypeNames_;
 
 
 protected:

src/functionObjects/utilities/runTimeControl/runTimeCondition/minTimeStepCondition/minTimeStepCondition.H

@@ -37,7 +37,6 @@ SourceFiles
 #define functionObjects_runTimeConditions_minTimeStepCondition_H
 
 #include "runTimeCondition.H"
-#include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //