From ec9fc5b099622e3998c62c333153496f114bd183 Mon Sep 17 00:00:00 2001 From: Henry <Henry> Date: Thu, 22 Jan 2015 13:32:30 +0000 Subject: [PATCH] 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 --- .../primitives/functions/DataEntry/DataEntry/DataEntryNew.C | 4 ++-- src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C index 8a355ca9a61..ef023e4c3c4 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,7 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New } else { -// DataEntryType = CompatibilityConstant<Type>::typeName; + // DataEntryType = CompatibilityConstant<Type>::typeName; DataEntryType = "CompatibilityConstant"; } diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C index 56c7a2b6694..eacfc0e1eb9 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ template<class Type> Foam::Table<Type>::Table(const word& entryName, const dictionary& dict) : DataEntry<Type>(entryName), - TableBase<Type>(entryName, dictionary::null) + TableBase<Type>(entryName, dict) { Istream& is(dict.lookup(entryName)); word entryType(is); -- GitLab