zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: comparison with incorrect construction tables

Browse Source 
- previously hidden when hashtable used a static method and a
  different class for end()
This commit is contained in:
Mark Olesen
2017-05-01 21:27:42 +02:00
parent 805b76d4b9
commit dc57c016ae
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
View File

@ -30,22 +30,24 @@ License
Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
( (
const dictionary& dict, const objectRegistry& obr const dictionary& dict,
const objectRegistry& obr
) )
{ {
if (debug) if (debug)
{ {
Pout<< "coordinateRotation::New(const dictionary&) : " Pout<< "coordinateRotation::New"
"(const dictionary&, const objectRegistry&) : "
<< "constructing coordinateRotation" << "constructing coordinateRotation"
<< endl; << endl;
} }
word rotType = dict.lookup("type"); const word rotType = dict.lookup("type");
objectRegistryConstructorTable::iterator cstrIter = objectRegistryConstructorTable::iterator cstrIter =
objectRegistryConstructorTablePtr_->find(rotType); objectRegistryConstructorTablePtr_->find(rotType);
if (cstrIter == dictionaryConstructorTablePtr_->end()) if (!cstrIter.found())
{ {
FatalIOErrorInFunction FatalIOErrorInFunction
( (
@ -54,7 +56,7 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
<< rotType << nl << nl << rotType << nl << nl
<< "Valid coordinateRotation types are :" << nl << "Valid coordinateRotation types are :" << nl
<< "[default: axes ]" << "[default: axes ]"
<< dictionaryConstructorTablePtr_->sortedToc() << objectRegistryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError); << exit(FatalIOError);
} }
@ -74,12 +76,12 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
<< endl; << endl;
} }
word rotType = dict.lookup("type"); const word rotType = dict.lookup("type");
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(rotType); dictionaryConstructorTablePtr_->find(rotType);
if (cstrIter == dictionaryConstructorTablePtr_->end()) if (!cstrIter.found())
{ {
FatalIOErrorInFunction FatalIOErrorInFunction
( (

4
src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
View File

@ -55,7 +55,7 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
IstreamConstructorTable::iterator cstrIter = IstreamConstructorTable::iterator cstrIter =
IstreamConstructorTablePtr_->find(thermophysicalFunctionType); IstreamConstructorTablePtr_->find(thermophysicalFunctionType);
if (cstrIter == IstreamConstructorTablePtr_->end()) if (!cstrIter.found())
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Unknown thermophysicalFunction type " << "Unknown thermophysicalFunction type "
@ -87,7 +87,7 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(thermophysicalFunctionType); dictionaryConstructorTablePtr_->find(thermophysicalFunctionType);
if (cstrIter == IstreamConstructorTablePtr_->end()) if (!cstrIter.found())
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Unknown thermophysicalFunction type " << "Unknown thermophysicalFunction type "