zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

functionObjectList: Added error message for functionObject configuration file name not specified

Browse Source 
token: Changed parseError to use cerr rather than FatalIOError so that it can
report errors when reading debug switches from the case controlDict at start-up.
This commit is contained in:
Henry Weller
2022-10-18 21:13:45 +01:00
parent f8bcaeb588
commit d01b37a949
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/OpenFOAM/db/IOstreams/token/token.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 | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -42,9 +42,8 @@ namespace Foam
void Foam::token::parseError(const char* expected) const void Foam::token::parseError(const char* expected) const
{ {
FatalIOError cerr<< "Parse error, expected a " << expected
<< "Parse error, expected a " << expected << ", found \n " << info() << std::endl;
<< ", found \n " << info() << endl;
} }

13
src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
View File

@ -245,6 +245,17 @@ bool Foam::functionObjectList::readFunctionObject
fileName path = findDict(funcType, region); fileName path = findDict(funcType, region);
if (path == fileName::null) if (path == fileName::null)
{
if (funcType == word::null)
{
FatalIOErrorInFunction(functionsDict)
<< "functionObject configuration file name not specified"
<< nl << nl
<< "Available configured functionObjects:"
<< list()
<< exit(FatalIOError);
}
else
{ {
FatalIOErrorInFunction(functionsDict) FatalIOErrorInFunction(functionsDict)
<< "Cannot find functionObject configuration file " << "Cannot find functionObject configuration file "
@ -252,6 +263,8 @@ bool Foam::functionObjectList::readFunctionObject
<< "Available configured functionObjects:" << "Available configured functionObjects:"
<< list() << list()
<< exit(FatalIOError); << exit(FatalIOError);
}
return false; return false;
} }