Merge branch 'HashTable-method-enhancements' into 'develop'

Hash table method enhancements

See merge request !112
This commit is contained in:
Mark Olesen
2017-05-18 12:54:36 +01:00
71 changed files with 2627 additions and 1385 deletions

View File

@ -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"))
);

View File

@ -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"))
);

View File

@ -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;