#1068 Avoid include of RigMainGrid.h in RigCaseData.h

2025-02-25 18:55:39 -06:00 · 2017-01-09 19:04:45 +01:00 · 2017-01-09 19:04:45 +01:00 · ccd4cb24c9
commit ccd4cb24c9
parent 9cacf0db6c
22 changed files with 77 additions and 45 deletions
--- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
@ -23,6 +23,7 @@
 #include "RifReaderEclipseOutput.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"

 #include "cafProgressInfo.h"
--- a/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp
+++ b/ApplicationCode/FileInterface/RifReaderEclipseInput.cpp
@ -21,7 +21,9 @@
 #include "RifReaderEclipseInput.h"

 #include "RifEclipseInputFileTools.h"
+
 #include "RigCaseData.h"
+#include "RigMainGrid.h"

 //==================================================================================================
 //
--- a/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp
+++ b/ApplicationCode/FileInterface/RifReaderOpmParserInput.cpp
@ -21,10 +21,14 @@
 #include "RifReaderEclipseOutput.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
+
 #include "RimEclipseInputCaseOpm.h"
 #include "RimEclipseInputProperty.h"
 #include "RimEclipseInputPropertyCollection.h"
+
 #include "RiuMainWindow.h"
+
 #include "RiuProcessMonitor.h"

 #include "cafProgressInfo.h"
--- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
@ -23,7 +23,7 @@
 #include "RiaPreferences.h"

 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "RigMainGrid.h"
 #include "RigResultAccessor.h"

 #include "RimEclipseCase.h"
--- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
@ -22,6 +22,8 @@

 #include "RigCaseData.h"
 #include "RigCell.h"
+#include "RigMainGrid.h"
+#include "RigSimulationWellCenterLineCalculator.h"

 #include "Rim3dOverlayInfoConfig.h"
 #include "RimCellEdgeColors.h"
@ -49,7 +51,6 @@
 #include "cvfRay.h"
 #include "cvfScalarMapperDiscreteLinear.h"
 #include "cvfTransform.h"
-#include "RigSimulationWellCenterLineCalculator.h"


 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
@ -26,6 +26,7 @@

 #include "RigCaseData.h"
 #include "RigCell.h"
+#include "RigMainGrid.h"

 #include "Rim3dOverlayInfoConfig.h"
 #include "RimCellEdgeColors.h"
--- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@ -28,6 +28,7 @@
 #include "RigFemPartResultsCollection.h"
 #include "RigFemResultAddress.h"
 #include "RigGeoMechCaseData.h"
+#include "RigMainGrid.h"
 #include "RigStatisticsDataCache.h"

 #include "RimCellEdgeColors.h"
--- a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
@ -25,7 +25,7 @@
 #include "RigFemPartCollection.h"
 #include "RigFemPartGrid.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGridBase.h"
+#include "RigMainGrid.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
@ -25,6 +25,7 @@

 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"

 #include "RimCaseCollection.h"
 #include "RimCellEdgeColors.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp
@ -21,13 +21,16 @@
 #include "RimEclipseCaseCollection.h"

 #include "RiaApplication.h"
+
 #include "RigCaseData.h"
 #include "RigGridManager.h"
-#include "RimEclipseCase.h"
+#include "RigMainGrid.h"
+
 #include "RimCaseCollection.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseStatisticsCase.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimProject.h"
-#include "RimEclipseStatisticsCase.h"


 CAF_PDM_SOURCE_INIT(RimEclipseCaseCollection, "ResInsightAnalysisModels");
--- a/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp
@ -26,6 +26,7 @@

 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseInputProperty.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp
@ -22,6 +22,7 @@

 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
 #include "RigResultModifier.h"
 #include "RigResultModifierFactory.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@ -25,23 +25,27 @@

 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigFlowDiagResults.h"
 #include "RigFormationNames.h"
+#include "RigMainGrid.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"

 #include "Rim3dOverlayInfoConfig.h"
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimIntersection.h"
-#include "RimIntersectionCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseFaultColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseResultDefinition.h"
 #include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 #include "RimFaultCollection.h"
+#include "RimFlowDiagSolution.h"
 #include "RimGridCollection.h"
+#include "RimIntersection.h"
+#include "RimIntersectionCollection.h"
 #include "RimLegendConfig.h"
 #include "RimOilField.h"
 #include "RimProject.h"
@ -76,9 +80,6 @@
 #include <QMessageBox>

 #include <limits.h>
-#include "RimEclipseResultDefinition.h"
-#include "RimFlowDiagSolution.h"
-#include "RigFlowDiagResults.h"



--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
@ -23,6 +23,7 @@
 #include "RiaPreferences.h"

 #include "RigCaseData.h"
+#include "RigMainGrid.h"

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
--- a/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp
@ -17,11 +17,13 @@
 /////////////////////////////////////////////////////////////////////////////////

 #include "RimFlowDiagSolution.h"
-#include "RimEclipseResultCase.h"
-#include "RigCaseData.h"

-#include "RigFlowDiagResults.h"
+#include "RimEclipseResultCase.h"
+
 #include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RigFlowDiagResults.h"
+#include "RigMainGrid.h"

 CAF_PDM_SOURCE_INIT(RimFlowDiagSolution, "FlowDiagSolution");

--- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
+++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
@ -22,22 +22,26 @@

 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
+#include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigGridManager.h"
-#include "RimEclipseCase.h"
+#include "RigMainGrid.h"
+
 #include "RimCaseCollection.h"
 #include "RimCellEdgeColors.h"
-#include "RimReservoirCellResultsStorage.h"
-#include "RimEclipseView.h"
-#include "RimEclipseResultCase.h"
+#include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
+#include "RimEclipseResultCase.h"
 #include "RimEclipseStatisticsCase.h"
-#include "RigCaseCellResultsData.h"
+#include "RimEclipseView.h"
+#include "RimReservoirCellResultsStorage.h"
+
+#include "RiuMainWindow.h"

 #include "cafProgressInfo.h"
-#include "RiuMainWindow.h"
-#include <QMessageBox>
+
 #include <QDir>
+#include <QMessageBox>

 CAF_PDM_SOURCE_INIT(RimIdenticalGridCaseGroup, "RimIdenticalGridCaseGroup");

--- a/ApplicationCode/ProjectDataModel/RimViewController.cpp
+++ b/ApplicationCode/ProjectDataModel/RimViewController.cpp
@ -21,11 +21,12 @@

 #include "RiaApplication.h"

-//#include "RigCaseData.h"
+#include "RigCaseData.h"
 #include "RigCaseToCaseCellMapper.h"
 #include "RigCaseToCaseRangeFilterMapper.h"
 #include "RigFemPartCollection.h"
 #include "RigGeoMechCaseData.h"
+#include "RigMainGrid.h"

 #include "RimCase.h"
 #include "RimCellRangeFilterCollection.h"
--- a/ApplicationCode/ReservoirDataModel/RigCaseData.h
+++ b/ApplicationCode/ReservoirDataModel/RigCaseData.h
@ -20,14 +20,15 @@

 #pragma once

-#include <vector>
+#include "RigActiveCellInfo.h"
 #include "RigCell.h"
-#include "cvfVector3.h"
+#include "RigSingleWellResultsData.h"
+
 #include "cvfAssert.h"
 #include "cvfObject.h"
-#include "RigMainGrid.h"
-#include "RigSingleWellResultsData.h"
-#include "RigActiveCellInfo.h"
+#include "cvfVector3.h"
+
+#include <vector>

 class RigCaseCellResultsData;
 class RigFormationNames;
@ -84,6 +85,7 @@ private:
    void                                        computeActiveCellIJKBBox();
    void                                        computeWellCellsPrGrid();
    void                                        computeActiveCellsGeometryBoundingBox();
+
 private:
    cvf::ref<RigMainGrid>                       m_mainGrid;

@ -100,5 +102,4 @@ private:
    cvf::Collection<cvf::UIntArray>             m_gridCellToResultWellIndex; //< Array pr grid with index to well pr cell telling which well a cell is in

    UnitsType                                   m_unitsType;
-
 };
--- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h
+++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h
@ -26,6 +26,7 @@
 #include "cvfVector3.h"
 #include "RigCell.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"

 class LocalGridRefinement
 {
--- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
@ -19,23 +19,25 @@
 /////////////////////////////////////////////////////////////////////////////////

 #include "RiaSocketCommand.h"
+
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"
 #include "RiaApplication.h"
 #include "RiaPreferences.h"

-#include "RimEclipseView.h"
-#include "RimEclipseCellColors.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RigMainGrid.h"
+
+#include "Rim3dOverlayInfoConfig.h"
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
-#include "RimEclipseWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimReservoirCellResultsStorage.h"
 #include "RimEclipseCase.h"
-
-#include "RigCaseData.h"
-#include "RigCaseCellResultsData.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseView.h"
+#include "RimEclipseWellCollection.h"
+#include "RimReservoirCellResultsStorage.h"

 #include <QTcpSocket>

--- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
@ -19,25 +19,27 @@
 /////////////////////////////////////////////////////////////////////////////////

 #include "RiaSocketCommand.h"
+
+#include "RiaApplication.h"
+#include "RiaPreferences.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"

-#include "RimEclipseView.h"
-#include "RimEclipseCellColors.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RigMainGrid.h"
+
+#include "Rim3dOverlayInfoConfig.h"
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCellColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseView.h"
 #include "RimEclipseWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
 #include "RimReservoirCellResultsStorage.h"

-#include "RimEclipseCase.h"
-#include "RigCaseData.h"
-#include "RigCaseCellResultsData.h"
-
 #include <QTcpSocket>
-#include "RiaApplication.h"
-#include "RiaPreferences.h"



--- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
@ -25,6 +25,7 @@

 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 #include "RigResultModifier.h"