diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index 42152e78a6..040e22007a 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -534,7 +534,7 @@ cvf::Vec3d RimEclipseCase::displayModelOffset() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimReservoirCellResultsStorage* RimEclipseCase::results(RifReaderInterface::PorosityModelResultType porosityModel) +RimReservoirCellResultsStorage* RimEclipseCase::results(RifReaderInterface::PorosityModelResultType porosityModel) const { if (porosityModel == RifReaderInterface::MATRIX_RESULTS) { diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.h b/ApplicationCode/ProjectDataModel/RimEclipseCase.h index e6060f8f64..a156f2dedb 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h @@ -72,7 +72,7 @@ public: const RigEclipseCaseData* eclipseCaseData() const; cvf::Color3f defaultWellColor(const QString& wellName); - RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel); + RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel) const ; RimEclipseView* createAndAddReservoirView(); RimEclipseView* createCopyAndAddView(const RimEclipseView* sourceView); diff --git a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp index 33810175fb..5281d2de14 100644 --- a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp @@ -27,7 +27,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigAllGridCellsResultAccessor::RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector* reservoirResultValues) +RigAllGridCellsResultAccessor::RigAllGridCellsResultAccessor(const RigGridBase* grid, const std::vector* reservoirResultValues) : m_grid(grid), m_reservoirResultValues(reservoirResultValues) { diff --git a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h index 57ab007bc7..81c9298b33 100644 --- a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h +++ b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h @@ -30,7 +30,7 @@ class RigGridBase; class RigAllGridCellsResultAccessor : public RigResultAccessor { public: - RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector* reservoirResultValues); + RigAllGridCellsResultAccessor(const RigGridBase* grid, const std::vector* reservoirResultValues); virtual double cellScalar(size_t gridLocalCellIndex) const; virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const; @@ -39,7 +39,7 @@ public: private: const RigGridBase* m_grid; - std::vector* m_reservoirResultValues; + const std::vector* m_reservoirResultValues; }; diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp index 5b1411e14e..e0fdc6bea8 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp @@ -39,7 +39,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromUiResultName(RigEclipseCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromUiResultName(const RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -50,7 +50,7 @@ cvf::ref RigResultAccessorFactory::createFromUiResultName(Rig CVF_ASSERT(eclipseCase->results(porosityModel)); CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel)); - RigGridBase* grid = eclipseCase->grid(gridIndex); + const RigGridBase* grid = eclipseCase->grid(gridIndex); if (uiResultName == RimDefines::combinedTransmissibilityResultName()) { @@ -132,7 +132,7 @@ cvf::ref RigResultAccessorFactory::createFromUiResultName(Rig //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromNameAndType(RigEclipseCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromNameAndType(const RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -167,7 +167,7 @@ cvf::ref RigResultAccessorFactory::createFromNameAndType(RigE //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromResultDefinition(RigEclipseCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromResultDefinition(const RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t timeStepIndex, RimEclipseResultDefinition* resultDefinition) @@ -197,7 +197,7 @@ cvf::ref RigResultAccessorFactory::createFromResultDefinition const std::vector* resultValues = flowSol->flowDiagResults()->resultValues( resultDefinition->flowDiagResAddress(), timeStepIndex); if (!resultValues) return new RigHugeValResultAccessor; - RigGridBase* grid = eclipseCase->grid(gridIndex); + const RigGridBase* grid = eclipseCase->grid(gridIndex); if ( !grid ) return new RigHugeValResultAccessor; cvf::ref object = new RigActiveCellsResultAccessor(grid, resultValues, eclipseCase->activeCellInfo(porosityModel)); @@ -209,7 +209,7 @@ cvf::ref RigResultAccessorFactory::createFromResultDefinition //-------------------------------------------------------------------------------------------------- /// This function must be harmonized with RigResultModifierFactory::createResultModifier() //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createNativeFromUiResultName(RigEclipseCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createNativeFromUiResultName(const RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -237,7 +237,7 @@ cvf::ref RigResultAccessorFactory::createNativeFromUiResultNa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RigResultAccessorFactory::createFromResultIdx(RigEclipseCaseData* eclipseCase, +cvf::ref RigResultAccessorFactory::createFromResultIdx(const RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -250,17 +250,17 @@ cvf::ref RigResultAccessorFactory::createFromResultIdx(RigEcl if (!eclipseCase) return NULL; - RigGridBase* grid = eclipseCase->grid(gridIndex); + const RigGridBase* grid = eclipseCase->grid(gridIndex); if (!grid) return NULL; - std::vector< std::vector >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(resultIndex); + const std::vector< std::vector >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(resultIndex); if (timeStepIndex >= scalarSetResults.size()) { return new RigHugeValResultAccessor; } - std::vector* resultValues = NULL; + const std::vector* resultValues = NULL; if (timeStepIndex < scalarSetResults.size()) { resultValues = &(scalarSetResults[timeStepIndex]); diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h index 5cb2e83b13..4594cf8fbc 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h @@ -33,20 +33,20 @@ class RigResultAccessorFactory { public: static cvf::ref - createFromResultDefinition(RigEclipseCaseData* eclipseCase, + createFromResultDefinition(const RigEclipseCaseData* eclipseCase, size_t gridIndex, size_t timeStepIndex, RimEclipseResultDefinition* resultDefinition); static cvf::ref - createFromUiResultName(RigEclipseCaseData* eclipseCase, + createFromUiResultName(const RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, const QString& uiResultName); static cvf::ref - createFromNameAndType(RigEclipseCaseData* eclipseCase, + createFromNameAndType(const RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -54,7 +54,7 @@ public: RimDefines::ResultCatType resultType); static cvf::ref - createFromResultIdx(RigEclipseCaseData* eclipseCase, + createFromResultIdx(const RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex, @@ -62,7 +62,7 @@ public: private: static cvf::ref - createNativeFromUiResultName(RigEclipseCaseData* eclipseCase, + createNativeFromUiResultName(const RigEclipseCaseData* eclipseCase, size_t gridIndex, RifReaderInterface::PorosityModelResultType porosityModel, size_t timeStepIndex,