MRG: resolved merge conflicts from merge from develop branch

src/functionObjects/field/ddt2/ddt2.C

@@ -27,7 +27,7 @@ License
 
 #include "volFields.H"
 #include "dictionary.H"
-#include "wordReListMatcher.H"
+#include "wordRes.H"
 #include "steadyStateDdtScheme.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -142,7 +142,7 @@ bool Foam::functionObjects::ddt2::read(const dictionary& dict)
         return false;
     }
 
-    selectFields_ = wordReListMatcher::uniq
+    selectFields_ = wordRes::uniq
     (
         wordReList(dict.lookup("fields"))
     );

src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C

@@ -46,7 +46,7 @@ Foam::functionObjects::fieldValue::New
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
         FatalErrorInFunction
             << "Unknown " << typeName << " type "

src/functionObjects/field/zeroGradient/zeroGradient.C

@@ -27,7 +27,7 @@ License
 
 #include "volFields.H"
 #include "dictionary.H"
-#include "wordReListMatcher.H"
+#include "wordRes.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -120,7 +120,7 @@ bool Foam::functionObjects::zeroGradient::read(const dictionary& dict)
 {
     fvMeshFunctionObject::read(dict);
 
-    selectFields_ = wordReListMatcher::uniq
+    selectFields_ = wordRes::uniq
     (
         wordReList(dict.lookup("fields"))
     );

src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C

@@ -480,8 +480,7 @@ void Foam::functionObjects::fieldVisualisationBase::addGlyphs
     else
     {
         WarningInFunction
-            << "Glyphs can only be added to " << pTraits<scalar>::typeName
-            << " and " << pTraits<vector>::typeName << " fields. "
+            << "Glyphs can only be added to scalar and vector fields."
             << " Field " << scaleFieldName << " has " << nComponents
             << " components" << endl;
 

src/functionObjects/graphics/runTimePostProcessing/pathline.C

@@ -195,7 +195,7 @@ Foam::functionObjects::runTimePostPro::pathline::New
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(pathlineType);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
         FatalErrorInFunction
             << "Unknown pathline type "

src/functionObjects/graphics/runTimePostProcessing/pointData.C

@@ -153,7 +153,7 @@ Foam::autoPtr<Foam::functionObjects::runTimePostPro::pointData> Foam::functionOb
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(pointDataType);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
         FatalErrorInFunction
             << "Unknown pointData type "

src/functionObjects/graphics/runTimePostProcessing/surface.C

@@ -220,7 +220,7 @@ Foam::functionObjects::runTimePostPro::surface::New
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(surfaceType);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
         FatalErrorInFunction
             << "Unknown surface type "

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

@@ -43,7 +43,7 @@ Foam::functionObjects::runTimeControls::runTimeCondition::New
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(conditionType);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
         FatalErrorInFunction
             << "Unknown runTimeCondition type "