OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed files:

Browse Source 
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
p4#: 21069
This commit is contained in:
Jacob Støren
2013-03-22 16:40:41 +01:00
parent b903c7f8c2
commit 6a2cbbcf07
23 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Application/RiaApplication.cpp
View File

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

6
ApplicationCode/CMakeLists.txt
View File

@@ -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/RimResultReservoir.cpp
ProjectDataModel/RimInputCase.cpp
ProjectDataModel/RimResultCase.cpp
ProjectDataModel/RimReservoirView.cpp
ProjectDataModel/RimResultDefinition.cpp
ProjectDataModel/RimResultSlot.cpp

2
ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
View File

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

2
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@@ -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"

2
ApplicationCode/ProjectDataModel/RimReservoir.cpp → ApplicationCode/ProjectDataModel/RimCase.cpp
View File

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

0
ApplicationCode/ProjectDataModel/RimReservoir.h → ApplicationCode/ProjectDataModel/RimCase.h
View File

2
ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
View File

@@ -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"

4
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@@ -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"

4
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp → ApplicationCode/ProjectDataModel/RimInputCase.cpp
View File

@@ -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", "", "" ,"");

4
ApplicationCode/ProjectDataModel/RimInputReservoir.h → ApplicationCode/ProjectDataModel/RimInputCase.h
View File

@@ -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

2
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

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

2
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

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

2
ApplicationCode/ProjectDataModel/RimReservoirView.h
View File

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

2
ApplicationCode/ProjectDataModel/RimResultReservoir.cpp → ApplicationCode/ProjectDataModel/RimResultCase.cpp
View File

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

2
ApplicationCode/ProjectDataModel/RimResultReservoir.h → ApplicationCode/ProjectDataModel/RimResultCase.h
View File

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

2
ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
View File

@@ -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"

2
ApplicationCode/ProjectDataModel/RimResultSlot.cpp
View File

@@ -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"

2
ApplicationCode/ProjectDataModel/RimStatisticsCase.h
View File

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

2
ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
View File

@@ -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"

4
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@@ -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"
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@@ -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"
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@@ -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"
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/UserInterface/RIMainWindow.cpp
View File

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