Skip to content

GitLab

Commit 12d9a159 authored by mattijs's avatar mattijs Committed by Andrew Heather
Browse files

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

parent 9580a0e2
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 7 deletions
src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
View file @ 12d9a159
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
......@@ -52,13 +52,13 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
if (!cstrIter.found())
{
FatalErrorInFunction
FatalIOErrorInFunction(dict)
<< "Unknown Function1 type "
<< Function1Type << " for Function1 "
<< entryName << nl << nl
<< "Valid Function1 types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
<< exit(FatalIOError);
}
return cstrIter()(entryName, coeffsDict);
......@@ -90,23 +90,31 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
Function1Type = firstToken.wordToken();
}
}
else
else if (redirectType != word::null)
{
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);
if (!cstrIter.found())
{
FatalErrorInFunction
FatalIOErrorInFunction(dict)
<< "Unknown Function1 type "
<< Function1Type << " for Function1 "
<< entryName << nl << nl
<< "Valid Function1 types :" << nl
<< dictionaryConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
<< exit(FatalIOError);
}
return cstrIter()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment