One shared active cell info for all statistical cases

Invalidate existing statisticsCases when adding/removing source cases
Moved computation of active cell union from RigStatistics to RimIdenticalGridCaseGroup
Recompute active cell union when opening project file
p4#: 21023
This commit is contained in:
Magne Sjaastad
2013-03-21 10:31:58 +01:00
parent 92bd95d683
commit a5fb1e1764
14 changed files with 244 additions and 138 deletions

View File

@@ -28,6 +28,7 @@
class RimReservoir;
class RigMainGrid;
class RigActiveCellInfo;
//==================================================================================================
//
@@ -47,15 +48,29 @@ public:
void addCase(RimReservoir* reservoir);
void removeCase(RimReservoir* reservoir);
RimStatisticalCalculation* createAndAppendStatisticalCalculation();
caf::PdmField<RimCaseCollection*> caseCollection;
caf::PdmField<RimStatisticalCollection*> statisticalReservoirCollection;
RigMainGrid* mainGrid();
void computeUnionOfActiveCells();
protected:
virtual caf::PdmFieldHandle* userDescriptionField();
virtual void initAfterRead();
private:
void updateMainGridAndActiveCellsForStatisticsCases();
void clearStatisticsResults();
void clearActiveCellUnions();
private:
RigMainGrid* m_mainGrid;
cvf::ref<RigActiveCellInfo> m_unionOfMatrixActiveCells;
cvf::ref<RigActiveCellInfo> m_unionOfFractureActiveCells;
};