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

Merge branch 'feature-robuster-ioobjectlist-construction' into 'develop'

Browse Source 
Feature robuster IOobjectList construction

See merge request !134
This commit is contained in:
Mark Olesen
2017-08-09 10:58:19 +01:00
parent dafb232e54 9923ec969b
commit 49a5af48d6
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/OpenFOAM/db/IOobjectList/IOobjectList.C
View File

@ -154,14 +154,14 @@ Foam::IOobjectList::IOobjectList
} }
// Create a list of file names in this directory // Create a list of file names in this directory
fileNameList objNames = const auto objNames =
readDir(db.path(newInstance, db.dbDir()/local), fileName::FILE); readDir(db.path(newInstance, db.dbDir()/local), fileName::FILE);
forAll(objNames, i) for (const auto& objName : objNames)
{ {
IOobject* objectPtr = new IOobject IOobject* objectPtr = new IOobject
( (
objNames[i], objName,
newInstance, newInstance,
local, local,
db, db,
@ -170,8 +170,23 @@ Foam::IOobjectList::IOobjectList
registerObject registerObject
); );
// Use object with local scope bool ok = false;
if (objectPtr->typeHeaderOk<IOList<label>>(false)) const bool throwingIOerr = FatalIOError.throwExceptions();
try
{
// Use object with local scope and current instance (no searching)
ok = objectPtr->typeHeaderOk<IOList<label>>(false, false);
}
catch (Foam::IOerror& err)
{
Warning
<< err << nl << endl;
}
FatalIOError.throwExceptions(throwingIOerr);
if (ok)
{ {
insert(objectPtr->name(), objectPtr); insert(objectPtr->name(), objectPtr);
} }