More file renaming:

RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21070

ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake

@@ -8,29 +8,29 @@ endif()
 list(APPEND CODE_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.h
 ${CEE_CURRENT_LIST_DIR}RigCell.h
-${CEE_CURRENT_LIST_DIR}RigEclipseCase.h
+${CEE_CURRENT_LIST_DIR}RigCaseData.h
 ${CEE_CURRENT_LIST_DIR}RigGridBase.h
-${CEE_CURRENT_LIST_DIR}RigGridCollection.h
+${CEE_CURRENT_LIST_DIR}RigGridManager.h
 ${CEE_CURRENT_LIST_DIR}RigGridScalarDataAccess.h
 ${CEE_CURRENT_LIST_DIR}RigLocalGrid.h
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.h
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h
-${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.h
-${CEE_CURRENT_LIST_DIR}RigWellResults.h
+${CEE_CURRENT_LIST_DIR}RigCaseCellResultsData.h
+${CEE_CURRENT_LIST_DIR}RigSingleWellResultsData.h
 )
 
 list(APPEND CODE_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.cpp
 ${CEE_CURRENT_LIST_DIR}RigCell.cpp
-${CEE_CURRENT_LIST_DIR}RigEclipseCase.cpp
+${CEE_CURRENT_LIST_DIR}RigCaseData.cpp
 ${CEE_CURRENT_LIST_DIR}RigGridBase.cpp
-${CEE_CURRENT_LIST_DIR}RigGridCollection.cpp
+${CEE_CURRENT_LIST_DIR}RigGridManager.cpp
 ${CEE_CURRENT_LIST_DIR}RigGridScalarDataAccess.cpp
 ${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp
 ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp
-${CEE_CURRENT_LIST_DIR}RigReservoirCellResults.cpp
-${CEE_CURRENT_LIST_DIR}RigWellResults.cpp
+${CEE_CURRENT_LIST_DIR}RigCaseCellResultsData.cpp
+${CEE_CURRENT_LIST_DIR}RigSingleWellResultsData.cpp
 )
 
 

ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigReservoir-Test.cpp

@@ -21,8 +21,8 @@
 #include "RiaStdInclude.h"
 #include "gtest/gtest.h"
 
-#include "RigEclipseCase.h"
-#include "RigGridCollection.h"
+#include "RigCaseData.h"
+#include "RigGridManager.h"
 
 
 //--------------------------------------------------------------------------------------------------
@@ -96,7 +96,7 @@ TEST(RigGridManager, EqualTests)
 //--------------------------------------------------------------------------------------------------
 TEST(RigReservoirTest, BasicTest)
 {
-    cvf::ref<RigWellResults> wellCellTimeHistory = new RigWellResults;
+    cvf::ref<RigSingleWellResultsData> wellCellTimeHistory = new RigSingleWellResultsData;
 
     QDateTime wellStartTime = QDateTime::currentDateTime();
 

ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RifReaderInterface.h"
 #include "RigMainGrid.h"
 

ApplicationCode/ReservoirDataModel/RigCaseData.cpp

@@ -16,9 +16,9 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigMainGrid.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RigGridScalarDataAccess.h"
 
 //--------------------------------------------------------------------------------------------------
@@ -474,7 +474,7 @@ cvf::ref<cvf::StructGridScalarDataAccess> RigCaseData::dataAccessObject(const Ri
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigEclipseCase::closeReaderInterface()
+void RigCaseData::closeReaderInterface()
 {
     RifReaderInterface* readerInterface = m_matrixModelResults->readerInterface();
 

ApplicationCode/ReservoirDataModel/RigCaseData.h

@@ -24,7 +24,7 @@
 #include "cvfAssert.h"
 #include "cvfObject.h"
 #include "RigMainGrid.h"
-#include "RigWellResults.h"
+#include "RigSingleWellResultsData.h"
 #include "RigActiveCellInfo.h"
 
 class RigCaseCellResultsData;

ApplicationCode/ReservoirDataModel/RigGridBase.cpp

@@ -19,7 +19,7 @@
 #include "RigGridBase.h"
 #include "RigMainGrid.h"
 #include "RigCell.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RigGridScalarDataAccess.h"
 
 #include "cvfAssert.h"

ApplicationCode/ReservoirDataModel/RigGridManager.cpp

@@ -16,8 +16,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigGridCollection.h"
-#include "RigEclipseCase.h"
+#include "RigGridManager.h"
+#include "RigCaseData.h"
 #include "RigMainGrid.h"
 
 

ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp

@@ -25,10 +25,10 @@
 #include "cvfAssert.h"
 
 #include "RigMainGrid.h"
-#include "RigReservoirCellResults.h"
+#include "RigCaseCellResultsData.h"
 #include "RigActiveCellInfo.h"
 #include "RigGridBase.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include <math.h>
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp

@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigReservoirBuilderMock.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 #include "RigActiveCellInfo.h"
 
 

ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h

@@ -23,7 +23,7 @@
 #include "cvfArray.h"
 #include "cvfVector3.h"
 #include "RigCell.h"
-#include "RigEclipseCase.h"
+#include "RigCaseData.h"
 
 class LocalGridRefinement
 {

ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RigWellResults.h"
+#include "RigSingleWellResultsData.h"
 #include <map>
 
 #include <QDebug>