Consolidated cache data computations

Removed automatic insertion of grids into identical grid groups
p4#: 20607

ApplicationCode/Application/RIApplication.cpp

@@ -1253,6 +1253,8 @@ void RIApplication::runRegressionTest(const QString& testRootPath)
                     qDebug() << "Error comparing :" << imgComparator.errorMessage() << "\n" << imgComparator.errorDetails();
                  }
              }
+
+             closeProject(false);
         }
     }
 }
@@ -1311,6 +1313,8 @@ bool RIApplication::addEclipseCase(const QString& fileName)
 
     rimResultReservoir->openEclipseGridFile();
 
+    m_project->moveEclipseCaseIntoCaseGroup(rimResultReservoir);
+
     onProjectOpenedOrClosed();
 
     return true;

ApplicationCode/ProjectDataModel/RimInputReservoir.cpp

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

ApplicationCode/ProjectDataModel/RimReservoir.cpp

@@ -230,24 +230,23 @@ void RimReservoir::fieldChangedByUi(const caf::PdmFieldHandle* changedField, con
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimReservoir::registerEclipseCase()
+void RimReservoir::computeCachedData()
 {
-    std::vector<caf::PdmObject*> parentObjects;
-    this->parentObjects(parentObjects);
-
-    RimProject* proj = NULL;
-    for (size_t i = 0; i < parentObjects.size(); i++)
+    RigEclipseCase* rigEclipseCase = reservoirData();
+    if (rigEclipseCase)
     {
-        if (proj) continue;
+        rigEclipseCase->computeCachedData();
 
-        caf::PdmObject* obj = parentObjects[i];
-        proj = dynamic_cast<RimProject*>(obj);
-    }
+        rigEclipseCase->mainGrid()->computeCachedData();
 
-    CVF_ASSERT(proj);
-    if (proj)
-    {
-        proj->moveEclipseCaseIntoCaseGroup(this);
+        std::vector<RigGridBase*> grids;
+        rigEclipseCase->allGrids(&grids);
+
+        size_t i;
+        for (i = 0; i < grids.size(); i++)
+        {
+            grids[i]->computeFaults();
+        }
     }
 }
 

ApplicationCode/ProjectDataModel/RimReservoir.h

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

ApplicationCode/ProjectDataModel/RimResultReservoir.cpp

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