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

ENH: Function1: better error message. Fixes #1200.

Browse Source
This commit is contained in:
mattijs
2019-02-11 12:10:47 +00:00
committed by Andrew Heather
parent 9580a0e243
commit 12d9a159dc
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
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) 2018 OpenCFD Ltd. \\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -52,13 +52,13 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
if (!cstrIter.found()) if (!cstrIter.found())
{ {
FatalErrorInFunction FatalIOErrorInFunction(dict)
<< "Unknown Function1 type " << "Unknown Function1 type "
<< Function1Type << " for Function1 " << Function1Type << " for Function1 "
<< entryName << nl << nl << entryName << nl << nl
<< "Valid Function1 types :" << nl << "Valid Function1 types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl << dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError); << exit(FatalIOError);
} }
return cstrIter()(entryName, coeffsDict); return cstrIter()(entryName, coeffsDict);
@ -90,23 +90,31 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
Function1Type = firstToken.wordToken(); Function1Type = firstToken.wordToken();
} }
} }
else else if (redirectType != word::null)
{ {
Function1Type = redirectType; Function1Type = redirectType;
} }
else
{
FatalIOErrorInFunction(dict)
<< "Cannot find specification for Function1 "
<< entryName << nl << nl
<< "Valid Function1 types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalIOError);
}
auto cstrIter = dictionaryConstructorTablePtr_->cfind(Function1Type); auto cstrIter = dictionaryConstructorTablePtr_->cfind(Function1Type);
if (!cstrIter.found()) if (!cstrIter.found())
{ {
FatalErrorInFunction FatalIOErrorInFunction(dict)
<< "Unknown Function1 type " << "Unknown Function1 type "
<< Function1Type << " for Function1 " << Function1Type << " for Function1 "
<< entryName << nl << nl << entryName << nl << nl
<< "Valid Function1 types :" << nl << "Valid Function1 types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl << dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError); << exit(FatalIOError);
} }
return cstrIter() return cstrIter()