OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added clear method to make sure all objects are destroyed.

Browse Source 
p4#: 20828
This commit is contained in:
Magne Sjaastad
2013-03-08 08:36:30 +01:00
parent 0a02805a8f
commit 9605a1eec9
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -65,10 +65,7 @@ RimProject::~RimProject(void)
//--------------------------------------------------------------------------------------------------
void RimProject::close()
{
for (size_t i = 0; i < reservoirs.size(); i++)
{
m_gridCollection->removeCase(reservoirs[i]->reservoirData());
}
m_gridCollection->clear();
reservoirs.deleteAllChildObjects();
caseGroups.deleteAllChildObjects();

8
ApplicationCode/ReservoirDataModel/RigGridCollection.cpp
View File

@@ -88,6 +88,14 @@ bool RigGridCollection::isEqual(RigMainGrid* gridA, RigMainGrid* gridB)
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigGridCollection::clear()
{
m_caseToGrid.clear();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ReservoirDataModel/RigGridCollection.h
View File

@@ -36,6 +36,8 @@ public:
RigMainGrid* findEqualGrid(RigMainGrid* candidateGrid);
void clear();
private:
static bool isEqual(RigMainGrid* gridA, RigMainGrid* gridB);