DataEntry/Table: provide dictionary to base-class to allow the specification of outOfBounds

Resolves bug-reports:
    http://www.openfoam.org/mantisbt/view.php?id=888
    http://www.openfoam.org/mantisbt/view.php?id=788
This commit is contained in:
Henry 2015-01-22 13:26:04 +00:00
parent d728810dd7
commit 8a7519fc14
2 changed files with 4 additions and 4 deletions

View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -53,7 +53,7 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
} }
else else
{ {
// DataEntryType = CompatibilityConstant<Type>::typeName; // DataEntryType = CompatibilityConstant<Type>::typeName;
DataEntryType = "CompatibilityConstant"; DataEntryType = "CompatibilityConstant";
} }

View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,7 +31,7 @@ template<class Type>
Foam::Table<Type>::Table(const word& entryName, const dictionary& dict) Foam::Table<Type>::Table(const word& entryName, const dictionary& dict)
: :
DataEntry<Type>(entryName), DataEntry<Type>(entryName),
TableBase<Type>(entryName, dictionary::null) TableBase<Type>(entryName, dict)
{ {
Istream& is(dict.lookup(entryName)); Istream& is(dict.lookup(entryName));
word entryType(is); word entryType(is);