Renamed files:

RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
p4#: 21069

ApplicationCode/Application/RiaApplication.cpp

@@ -35,8 +35,8 @@
 #include "RIProcessMonitor.h"
 #include "RiaPreferences.h"
 
-#include "RimResultReservoir.h"
+#include "RimResultCase.h"
-#include "RimInputReservoir.h"
+#include "RimInputCase.h"
 #include "RimReservoirView.h"
 
 #include "RigEclipseCase.h"

ApplicationCode/CMakeLists.txt

@@ -64,12 +64,12 @@ list( APPEND CPP_SOURCES
     ProjectDataModel/RimDefines.cpp
     ProjectDataModel/RimLegendConfig.cpp
     ProjectDataModel/RimProject.cpp
-    ProjectDataModel/RimReservoir.cpp
+    ProjectDataModel/RimCase.cpp
     ProjectDataModel/RimIdenticalGridCaseGroup.cpp
     ProjectDataModel/RimInputProperty.cpp
     ProjectDataModel/RimInputPropertyCollection.cpp
-    ProjectDataModel/RimInputReservoir.cpp
+    ProjectDataModel/RimInputCase.cpp
-    ProjectDataModel/RimResultReservoir.cpp
+    ProjectDataModel/RimResultCase.cpp
     ProjectDataModel/RimReservoirView.cpp
     ProjectDataModel/RimResultDefinition.cpp
     ProjectDataModel/RimResultSlot.cpp

ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp

@@ -19,7 +19,7 @@
 
 #include "cvfLibCore.h"
 
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RigEclipseCase.h"
 #include "RivWellPipesPartMgr.h"
 #include "RigCell.h"

ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp

@@ -21,7 +21,7 @@
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimReservoirView.h"
 #include "RIViewer.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RigEclipseCase.h"
 #include "RigMainGrid.h"
 #include "RigReservoirCellResults.h"

ApplicationCode/ProjectDataModel/RimCase.cpp

@@ -21,7 +21,7 @@
 #include "RifReaderEclipseOutput.h"
 #include "RifReaderMockModel.h"
 
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RimReservoirView.h"
 
 #include "RigEclipseCase.h"

ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp

@@ -21,7 +21,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "RimLegendConfig.h"
 #include "RimReservoirView.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RimReservoirView.h"
 #include "RigReservoirCellResults.h"
 #include "RigEclipseCase.h"

ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp

@@ -20,14 +20,14 @@
 #include "RiaStdInclude.h"
 
 #include "RimIdenticalGridCaseGroup.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RimReservoirView.h"
 #include "RigEclipseCase.h"
 #include "RigReservoirCellResults.h"
 
 #include "RimStatisticsCase.h"
 #include "RimStatisticsCaseCollection.h"
-#include "RimResultReservoir.h"
+#include "RimResultCase.h"
 #include "cafProgressInfo.h"
 #include "RigActiveCellInfo.h"
 

ApplicationCode/ProjectDataModel/RimInputCase.cpp

@@ -18,7 +18,7 @@
 
 #include "RiaStdInclude.h"
 
-#include "RimInputReservoir.h"
+#include "RimInputCase.h"
 #include "RimInputProperty.h"
 #include "RimReservoirView.h"
 
@@ -45,7 +45,7 @@ CAF_PDM_SOURCE_INIT(RimInputCase, "RimInputReservoir");
 RimInputCase::RimInputCase()
     : RimCase()
 {
-    CAF_PDM_InitObject("RimInputReservoir", ":/EclipseInput48x48.png", "", "");
+    CAF_PDM_InitObject("RimInputCase", ":/EclipseInput48x48.png", "", "");
     CAF_PDM_InitField(&m_gridFileName, "GridFileName",  QString(), "Case grid filename", "", "" ,"");
     CAF_PDM_InitFieldNoDefault(&m_additionalFileNames, "AdditionalFileNames", "Additional files", "", "" ,"");
 

ApplicationCode/ProjectDataModel/RimInputCase.h

@@ -23,7 +23,7 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RimInputPropertyCollection.h"
 
 
@@ -56,7 +56,7 @@ public:
 
     void removeProperty(RimInputProperty* inputProperty);
 
-    // RimReservoir overrides
+    // RimCase overrides
     virtual bool                openEclipseGridFile(); // Find grid file among file set. Read, Find read and validate property date. Syncronize child property sets.
 
     // PdmObject overrides

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -24,7 +24,7 @@
 
 #include "RigGridCollection.h"
 #include "RigEclipseCase.h"
-#include "RimResultReservoir.h"
+#include "RimResultCase.h"
 
 
 CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject");

ApplicationCode/ProjectDataModel/RimReservoirView.cpp

@@ -41,7 +41,7 @@
 
 #include "cafCadNavigation.h"
 #include "cafCeetronNavigation.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RigGridScalarDataAccess.h"
 

ApplicationCode/ProjectDataModel/RimReservoirView.h

@@ -23,7 +23,7 @@
 #include <QPointer>
 #include <QString>
 
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RimResultSlot.h"
 #include "RimCellEdgeResultSlot.h"
 #include "RimCellRangeFilter.h"

ApplicationCode/ProjectDataModel/RimResultCase.cpp

@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
-#include "RimResultReservoir.h"
+#include "RimResultCase.h"
 #include "RigEclipseCase.h"
 #include "RifReaderEclipseOutput.h"
 #include "RigReservoirCellResults.h"

ApplicationCode/ProjectDataModel/RimResultCase.h

@@ -22,7 +22,7 @@
 #include "cvfObject.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 
 class RifReaderInterface;
 class RigMainGrid;

ApplicationCode/ProjectDataModel/RimResultDefinition.cpp

@@ -21,7 +21,7 @@
 #include "RimResultDefinition.h"
 
 #include "RimReservoirView.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RigReservoirCellResults.h"
 #include "RigEclipseCase.h"
 #include "RigMainGrid.h"

ApplicationCode/ProjectDataModel/RimResultSlot.cpp

@@ -21,7 +21,7 @@
 #include "RimResultSlot.h"
 #include "RimLegendConfig.h"
 #include "RimReservoirView.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RIMainWindow.h"
 #include "RimUiTreeModelPdm.h"
 

ApplicationCode/ProjectDataModel/RimStatisticsCase.h

@@ -23,7 +23,7 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 
-#include "RimReservoir.h"
+#include "RimCase.h"
 
 class RimIdenticalGridCaseGroup;
 class RimResultDefinition;

ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp

@@ -20,7 +20,7 @@
 #include "RimStatisticsCaseEvaluator.h"
 #include "RigReservoirCellResults.h"
 #include "RimReservoirView.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RigEclipseCase.h"
 
 //#include "RigEclipseCase.h"

ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp

@@ -34,9 +34,9 @@
 #include "RimInputProperty.h"
 #include "RimInputPropertyCollection.h"
 #include "cafPdmField.h"
-#include "RimInputReservoir.h"
+#include "RimInputCase.h"
 #include "RimStatisticsCase.h"
-#include "RimResultReservoir.h"
+#include "RimResultCase.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ProjectDataModel/RimUiTreeView.cpp

@@ -30,11 +30,11 @@
 #include "RimExportInputPropertySettings.h"
 #include "RIPreferencesDialog.h"
 #include "RifEclipseInputFileTools.h"
-#include "RimInputReservoir.h"
+#include "RimInputCase.h"
 #include "RimBinaryExportSettings.h"
 #include "RigReservoirCellResults.h"
 #include "RimStatisticsCase.h"
-#include "RimResultReservoir.h"
+#include "RimResultCase.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/SocketInterface/RiaSocketServer.cpp

@@ -25,11 +25,11 @@
 #include "RiaSocketServer.h"
 #include "RiaApplication.h"
 #include "RIMainWindow.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RigEclipseCase.h"
 #include "RigReservoirCellResults.h"
 #include "RimInputProperty.h"
-#include "RimInputReservoir.h"
+#include "RimInputCase.h"
 #include "RimUiTreeModelPdm.h"
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/UserInterface/RIMainWindow.cpp

@@ -29,7 +29,7 @@
 
 #include "RigEclipseCase.h"
 #include "RigReservoirCellResults.h"
-#include "RimReservoir.h"
+#include "RimCase.h"
 #include "RimUiTreeModelPdm.h"
 
 #include "cvfqtBasicAboutDialog.h"