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: downgrade lookupObject failure from abort() to exit()

Browse Source 
- lets function objects catch and handle errors
  (fixes #2144, related to #1779)
This commit is contained in:
Mark Olesen
2021-07-01 14:36:03 +02:00
parent cc5aa20931
commit 8cda8e5c3a
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -449,11 +449,11 @@ const Type& Foam::objectRegistry::lookupObject
FatalErrorInFunction
<< nl
<< " lookup of " << name << " from objectRegistry "
<< " bad lookup of " << name << " (objectRegistry "
<< this->name()
<< " successful\n but it is not a " << Type::typeName
<< ", it is a " << (*iter)->type()
<< abort(FatalError);
<< ")\n expected a " << Type::typeName
<< ", found a " << (*iter)->type() << nl
<< exit(FatalError);
}
else if (recursive && this->parentNotTime())
{
@ -462,12 +462,12 @@ const Type& Foam::objectRegistry::lookupObject
FatalErrorInFunction
<< nl
<< " request for " << Type::typeName
<< " " << name << " from objectRegistry " << this->name()
<< " failed\n available objects of type " << Type::typeName
<< " are" << nl
<< names<Type>()
<< abort(FatalError);
<< " failed lookup of " << name << " (objectRegistry "
<< this->name()
<< ")\n available objects of type " << Type::typeName
<< ':' << nl
<< names<Type>() << nl
<< exit(FatalError);
return NullObjectRef<Type>();
}