Added grid collection and reuse of MainGrid if the grids are equal

p4#: 20517

ApplicationCode/ProjectDataModel/RimInputReservoir.cpp

@@ -94,8 +94,9 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames)
              {
                  m_gridFileName = filenames[i];
 
+                 registerEclipseCase();
+
                  m_rigEclipseCase->computeCachedData();
-                 m_rigEclipseCase->mainGrid()->computeCachedData();
 
                  break;
              }
@@ -175,6 +176,8 @@ bool RimInputReservoir::openEclipseGridFile()
             }
 
             m_rigEclipseCase = eclipseCase;
+            
+            registerEclipseCase();
             loadAndSyncronizeInputProperties();
         }
 
@@ -184,7 +187,6 @@ bool RimInputReservoir::openEclipseGridFile()
         m_rigEclipseCase->results(RifReaderInterface::MATRIX_RESULTS)->setReaderInterface(readerInterface.p());
         m_rigEclipseCase->results(RifReaderInterface::FRACTURE_RESULTS)->setReaderInterface(readerInterface.p());
         m_rigEclipseCase->computeCachedData();
-        m_rigEclipseCase->mainGrid()->computeCachedData();
     }
 
     

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -22,6 +22,9 @@
 #include "RIApplication.h"
 #include "RIVersionInfo.h"
 #include "RimScriptCollection.h"
+#include "RigGridCollection.h"
+#include "RigEclipseCase.h"
+
 
 CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject");
 //--------------------------------------------------------------------------------------------------
@@ -38,6 +41,8 @@ RimProject::RimProject(void)
     scriptCollection = new RimScriptCollection();
     scriptCollection->directory.setUiHidden(true);
 
+    m_gridCollection = new RigGridCollection;
+
     initAfterRead();
 }
 
@@ -46,6 +51,8 @@ RimProject::RimProject(void)
 //--------------------------------------------------------------------------------------------------
 RimProject::~RimProject(void)
 {
+    close();
+
     if (scriptCollection()) delete scriptCollection();
 
     reservoirs.deleteAllChildObjects();
@@ -56,6 +63,11 @@ RimProject::~RimProject(void)
 //--------------------------------------------------------------------------------------------------
 void RimProject::close()
 {
+    for (size_t i = 0; i < reservoirs.size(); i++)
+    {
+        m_gridCollection->removeCase(reservoirs[i]->reservoirData());
+    }
+
     reservoirs.deleteAllChildObjects();
 
     fileName = "";
@@ -113,3 +125,35 @@ QString RimProject::projectFileVersionString() const
 {
     return m_projectFileVersionString;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimProject::registerEclipseCase(RigEclipseCase* eclipseCase)
+{
+    CVF_ASSERT(eclipseCase);
+
+    RigMainGrid* equalGrid = m_gridCollection->findEqualGrid(eclipseCase->mainGrid());
+
+    if (equalGrid)
+    {
+        // Replace the grid with an already registered grid
+        eclipseCase->setMainGrid(equalGrid);
+    }
+    else
+    {
+        // This is the first insertion of this grid, compute cached data
+        eclipseCase->mainGrid()->computeCachedData();
+
+        std::vector<RigGridBase*> grids;
+        eclipseCase->allGrids(&grids);
+
+        size_t i;
+        for (i = 0; i < grids.size(); i++)
+        {
+            grids[i]->computeFaults();
+        }
+    }
+
+    m_gridCollection->addCase(eclipseCase);
+}

ApplicationCode/ProjectDataModel/RimProject.h

@@ -22,6 +22,8 @@
 #include "RimScriptCollection.h"
 
 class RimReservoir;
+class RigGridCollection;
+class RigEclipseCase;
 
 //==================================================================================================
 ///  
@@ -45,6 +47,8 @@ public:
 
     void close();
 
+    void registerEclipseCase(RigEclipseCase* eclipseCase);
+
 protected:
     // Overridden methods
     virtual void initAfterRead();
@@ -52,4 +56,6 @@ protected:
 
 private:
     caf::PdmField<QString> m_projectFileVersionString;
+
+    cvf::ref<RigGridCollection>       m_gridCollection;
 };

ApplicationCode/ProjectDataModel/RimReservoir.cpp

@@ -33,6 +33,7 @@
 #include "cafPdmUiPushButtonEditor.h"
 
 #include <QString>
+#include "RimProject.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -226,3 +227,27 @@ void RimReservoir::fieldChangedByUi(const caf::PdmFieldHandle* changedField, con
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimReservoir::registerEclipseCase()
+{
+    std::vector<caf::PdmObject*> parentObjects;
+    this->parentObjects(parentObjects);
+
+    RimProject* proj = NULL;
+    for (size_t i = 0; i < parentObjects.size(); i++)
+    {
+        if (proj) continue;
+
+        caf::PdmObject* obj = parentObjects[i];
+        proj = dynamic_cast<RimProject*>(obj);
+    }
+
+    CVF_ASSERT(proj);
+    if (proj)
+    {
+        proj->registerEclipseCase(m_rigEclipseCase.p());
+    }
+}
+

ApplicationCode/ProjectDataModel/RimReservoir.h

@@ -70,6 +70,8 @@ protected:
 
     virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
 
+    void registerEclipseCase();
+
 protected:
     cvf::ref<RigEclipseCase>        m_rigEclipseCase;
 };

ApplicationCode/ProjectDataModel/RimResultReservoir.cpp

@@ -84,12 +84,13 @@ bool RimResultReservoir::openEclipseGridFile()
     CVF_ASSERT(m_rigEclipseCase.notNull());
     CVF_ASSERT(readerInterface.notNull());
 
-    progInfo.setProgressDescription("Computing Faults");
-    m_rigEclipseCase->computeCachedData();
+
+    progInfo.setProgressDescription("Registering Case and Grid");
+    registerEclipseCase();
 
     progInfo.incrementProgress();
-    progInfo.setProgressDescription("Computing Cache");
-    m_rigEclipseCase->mainGrid()->computeCachedData();
+    progInfo.setProgressDescription("Computing Case Cache");
+    m_rigEclipseCase->computeCachedData();
 
     return true;
  }

ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigReservoir-Test.cpp

@@ -35,7 +35,7 @@ TEST(RigGridCollection, BasicTest)
     cvf::ref<RigEclipseCase> eclipseCase = new RigEclipseCase;
 
     RigGridCollection gridCollection;
-    gridCollection.addGrid(eclipseCase.p(), mainGridA.p());
+    gridCollection.addCase(eclipseCase.p());
 
     int count = mainGridA->refCount();
     EXPECT_TRUE(mainGridA->refCount() == 2);
@@ -60,7 +60,7 @@ TEST(RigGridCollection, EqualTests)
     cvf::ref<RigEclipseCase> eclipseCase = new RigEclipseCase;
 
     RigGridCollection gridCollection;
-    gridCollection.addGrid(eclipseCase.p(), mainGridA.p());
+    gridCollection.addCase(eclipseCase.p());
 
 
     cvf::ref<RigMainGrid> mainGridB = new RigMainGrid;

ApplicationCode/ReservoirDataModel/RigEclipseCase.cpp

@@ -43,16 +43,9 @@ RigEclipseCase::~RigEclipseCase()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigEclipseCase::computeFaults()
+void RigEclipseCase::setMainGrid(RigMainGrid* mainGrid)
 {
-    std::vector<RigGridBase*> grids;
-    allGrids(&grids);
-
-    size_t i;
-    for (i = 0; i < grids.size(); i++)
-    {
-        grids[i]->computeFaults();
-    }
+    m_mainGrid = mainGrid;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -293,7 +286,6 @@ void RigEclipseCase::computeActiveCellData()
 //--------------------------------------------------------------------------------------------------
 void RigEclipseCase::computeCachedData()
 {
-    computeFaults();
     computeActiveCellData();
     computeActiveCellsGeometryBoundingBox();
 }
@@ -395,3 +387,4 @@ cvf::ref<cvf::StructGridScalarDataAccess> RigEclipseCase::dataAccessObject(const
     return NULL;
 
 }
+

ApplicationCode/ReservoirDataModel/RigEclipseCase.h

@@ -38,6 +38,7 @@ public:
 
     RigMainGrid*            mainGrid() { return m_mainGrid.p(); }
     const RigMainGrid*      mainGrid() const { return m_mainGrid.p(); }
+    void                    setMainGrid(RigMainGrid* mainGrid);
 
     void                    allGrids(std::vector<RigGridBase*>* grids);
     void                    allGrids(std::vector<const RigGridBase*>* grids) const;
@@ -66,7 +67,6 @@ public:
 
 
 private:
-    void                    computeFaults();
     void                    computeActiveCellData();
     void                    computeWellCellsPrGrid();
     void                    computeActiveCellsGeometryBoundingBox();

ApplicationCode/ReservoirDataModel/RigGridCollection.cpp

@@ -24,9 +24,10 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigGridCollection::addGrid(RigEclipseCase* eclipseCase, RigMainGrid* mainGrid)
+void RigGridCollection::addCase(RigEclipseCase* eclipseCase)
 {
-    m_caseToGrid.push_back(CaseToGridMap(eclipseCase, mainGrid));
+    cvf::ref<CaseToGridMap> caseAndGrid = new CaseToGridMap(eclipseCase, eclipseCase->mainGrid());
+    m_caseToGrid.push_back(caseAndGrid.p());
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -38,16 +39,12 @@ void RigGridCollection::removeCase(RigEclipseCase* eclipseCase)
 
     for (size_t i = 0; i < m_caseToGrid.size(); i++)
     {
-        if (m_caseToGrid[i].m_eclipseCase == eclipseCase)
+        if (m_caseToGrid[i]->m_eclipseCase == eclipseCase)
         {
-            indexToErase = i;
+            m_caseToGrid.eraseAt(i);
+            return;
         }
     }
-
-    if (indexToErase != cvf::UNDEFINED_SIZE_T)
-    {
-        m_caseToGrid.erase(m_caseToGrid.begin() + indexToErase);
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -57,7 +54,7 @@ RigMainGrid* RigGridCollection::findEqualGrid(RigMainGrid* candidateGrid)
 {
     for (size_t i = 0; i < m_caseToGrid.size(); i++)
     {
-        RigMainGrid* mainGrid = m_caseToGrid.at(i).m_mainGrid.p();
+        RigMainGrid* mainGrid = m_caseToGrid.at(i)->m_mainGrid.p();
         if (RigGridCollection::isEqual(mainGrid, candidateGrid))
         {
             return mainGrid;
@@ -90,3 +87,12 @@ bool RigGridCollection::isEqual(RigMainGrid* gridA, RigMainGrid* gridB)
 
     return true;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RigGridCollection::CaseToGridMap::CaseToGridMap(RigEclipseCase* eclipseCase, RigMainGrid* mainGrid) :
+m_eclipseCase(eclipseCase),
+    m_mainGrid(mainGrid)
+{
+}

ApplicationCode/ReservoirDataModel/RigGridCollection.h

@@ -27,10 +27,11 @@
 class RigMainGrid;
 class RigEclipseCase;
 
-class RigGridCollection
+class RigGridCollection : public cvf::Object
 {
 public:
-    void addGrid(RigEclipseCase* eclipseCase, RigMainGrid* mainGrid);
+    void addCase(RigEclipseCase* eclipseCase);
+    
     void removeCase(RigEclipseCase* eclipseCase);
     
     RigMainGrid* findEqualGrid(RigMainGrid* candidateGrid);
@@ -39,14 +40,10 @@ private:
 
     static bool isEqual(RigMainGrid* gridA, RigMainGrid* gridB);
 
-    class CaseToGridMap
+    class CaseToGridMap : public cvf::Object
     {
     public:
-        CaseToGridMap(RigEclipseCase* eclipseCase, RigMainGrid* mainGrid) :
-            m_eclipseCase(eclipseCase),
-            m_mainGrid(mainGrid)
-        {
-        }
+        CaseToGridMap(RigEclipseCase* eclipseCase, RigMainGrid* mainGrid);
 
         cvf::ref<RigEclipseCase>    m_eclipseCase;
         cvf::ref<RigMainGrid>       m_mainGrid;
@@ -54,5 +51,5 @@ private:
 
 
 private:
-    std::vector<CaseToGridMap> m_caseToGrid;
+    cvf::Collection<CaseToGridMap> m_caseToGrid;
 };