mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Added clear method to make sure all objects are destroyed.
p4#: 20828
This commit is contained in:
@@ -65,10 +65,7 @@ RimProject::~RimProject(void)
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimProject::close()
|
void RimProject::close()
|
||||||
{
|
{
|
||||||
for (size_t i = 0; i < reservoirs.size(); i++)
|
m_gridCollection->clear();
|
||||||
{
|
|
||||||
m_gridCollection->removeCase(reservoirs[i]->reservoirData());
|
|
||||||
}
|
|
||||||
|
|
||||||
reservoirs.deleteAllChildObjects();
|
reservoirs.deleteAllChildObjects();
|
||||||
caseGroups.deleteAllChildObjects();
|
caseGroups.deleteAllChildObjects();
|
||||||
|
|||||||
@@ -88,6 +88,14 @@ bool RigGridCollection::isEqual(RigMainGrid* gridA, RigMainGrid* gridB)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
void RigGridCollection::clear()
|
||||||
|
{
|
||||||
|
m_caseToGrid.clear();
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ public:
|
|||||||
|
|
||||||
RigMainGrid* findEqualGrid(RigMainGrid* candidateGrid);
|
RigMainGrid* findEqualGrid(RigMainGrid* candidateGrid);
|
||||||
|
|
||||||
|
void clear();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
static bool isEqual(RigMainGrid* gridA, RigMainGrid* gridB);
|
static bool isEqual(RigMainGrid* gridA, RigMainGrid* gridB);
|
||||||
|
|||||||
Reference in New Issue
Block a user