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: force clearing of Time objectRegistry on destruction (#1276)

Browse Source 
- the objectRegistry destructor seems to be called too late.
  Explicitly clear the objectRegistry within the Time destructor to
  ensure that it always happens.
This commit is contained in:
Mark Olesen
2019-04-10 11:30:31 +02:00
parent 335dfa14a5
commit 88e891cfb1
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenFOAM/db/Time/Time.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2004-2011, 2015-2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2004-2011, 2015-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -727,6 +727,9 @@ Foam::Time::~Time()
// Clean up profiling
profiling::stop(*this);
// Ensure all owned objects are also cleaned up now
objectRegistry::clear();
}

9
src/OpenFOAM/db/objectRegistry/objectRegistry.C
View File

@ -323,6 +323,14 @@ void Foam::objectRegistry::clear()
if (ptr && ptr->ownedByRegistry())
{
// TBD: may wish to have ptr->clearWatches();
if (objectRegistry::debug)
{
Pout<< "objectRegistry::clear : " << ptr->name()
<< " watches :" << flatOutput(ptr->watchIndices()) << nl;
}
delete ptr;
}
}
@ -350,6 +358,7 @@ bool Foam::objectRegistry::erase(const iterator& iter)
if (ptr && ptr->ownedByRegistry())
{
// TBD: may wish to have ptr->clearWatches();
delete ptr;
}