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

#1487 Tightens constness of eclipse result access.

Browse Source
This commit is contained in:
Jacob Støren 2017-05-16 13:54:32 +02:00
parent fc14531420
commit 2d87ae7566
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -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) if (porosityModel == RifReaderInterface::MATRIX_RESULTS)
{ {

2
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@ -72,7 +72,7 @@ public:
const RigEclipseCaseData* eclipseCaseData() const; const RigEclipseCaseData* eclipseCaseData() const;
cvf::Color3f defaultWellColor(const QString& wellName); cvf::Color3f defaultWellColor(const QString& wellName);
RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel); RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel) const ;
RimEclipseView* createAndAddReservoirView(); RimEclipseView* createAndAddReservoirView();
RimEclipseView* createCopyAndAddView(const RimEclipseView* sourceView); RimEclipseView* createCopyAndAddView(const RimEclipseView* sourceView);

2
ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp
View File

@ -27,7 +27,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigAllGridCellsResultAccessor::RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues) RigAllGridCellsResultAccessor::RigAllGridCellsResultAccessor(const RigGridBase* grid, const std::vector<double>* reservoirResultValues)
: m_grid(grid), : m_grid(grid),
m_reservoirResultValues(reservoirResultValues) m_reservoirResultValues(reservoirResultValues)
{ {

4
ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h
View File

@ -30,7 +30,7 @@ class RigGridBase;
class RigAllGridCellsResultAccessor : public RigResultAccessor class RigAllGridCellsResultAccessor : public RigResultAccessor
{ {
public: public:
RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues); RigAllGridCellsResultAccessor(const RigGridBase* grid, const std::vector<double>* reservoirResultValues);
virtual double cellScalar(size_t gridLocalCellIndex) const; virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
@ -39,7 +39,7 @@ public:
private: private:
const RigGridBase* m_grid; const RigGridBase* m_grid;
std::vector<double>* m_reservoirResultValues; const std::vector<double>* m_reservoirResultValues;
}; };

20
ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
View File

@ -39,7 +39,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromUiResultName(RigEclipseCaseData* eclipseCase, cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromUiResultName(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -50,7 +50,7 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromUiResultName(Rig
CVF_ASSERT(eclipseCase->results(porosityModel)); CVF_ASSERT(eclipseCase->results(porosityModel));
CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel)); CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
RigGridBase* grid = eclipseCase->grid(gridIndex); const RigGridBase* grid = eclipseCase->grid(gridIndex);
if (uiResultName == RimDefines::combinedTransmissibilityResultName()) if (uiResultName == RimDefines::combinedTransmissibilityResultName())
{ {
@ -132,7 +132,7 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromUiResultName(Rig
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromNameAndType(RigEclipseCaseData* eclipseCase, cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromNameAndType(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -167,7 +167,7 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromNameAndType(RigE
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultDefinition(RigEclipseCaseData* eclipseCase, cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultDefinition(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
size_t timeStepIndex, size_t timeStepIndex,
RimEclipseResultDefinition* resultDefinition) RimEclipseResultDefinition* resultDefinition)
@ -197,7 +197,7 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultDefinition
const std::vector<double>* resultValues = flowSol->flowDiagResults()->resultValues( resultDefinition->flowDiagResAddress(), timeStepIndex); const std::vector<double>* resultValues = flowSol->flowDiagResults()->resultValues( resultDefinition->flowDiagResAddress(), timeStepIndex);
if (!resultValues) return new RigHugeValResultAccessor; if (!resultValues) return new RigHugeValResultAccessor;
RigGridBase* grid = eclipseCase->grid(gridIndex); const RigGridBase* grid = eclipseCase->grid(gridIndex);
if ( !grid ) return new RigHugeValResultAccessor; if ( !grid ) return new RigHugeValResultAccessor;
cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessor(grid, resultValues, eclipseCase->activeCellInfo(porosityModel)); cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessor(grid, resultValues, eclipseCase->activeCellInfo(porosityModel));
@ -209,7 +209,7 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultDefinition
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// This function must be harmonized with RigResultModifierFactory::createResultModifier() /// This function must be harmonized with RigResultModifierFactory::createResultModifier()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RigResultAccessorFactory::createNativeFromUiResultName(RigEclipseCaseData* eclipseCase, cvf::ref<RigResultAccessor> RigResultAccessorFactory::createNativeFromUiResultName(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -237,7 +237,7 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createNativeFromUiResultNa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultIdx(RigEclipseCaseData* eclipseCase, cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultIdx(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -250,17 +250,17 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createFromResultIdx(RigEcl
if (!eclipseCase) return NULL; if (!eclipseCase) return NULL;
RigGridBase* grid = eclipseCase->grid(gridIndex); const RigGridBase* grid = eclipseCase->grid(gridIndex);
if (!grid) return NULL; if (!grid) return NULL;
std::vector< std::vector<double> >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(resultIndex); const std::vector< std::vector<double> >& scalarSetResults = eclipseCase->results(porosityModel)->cellScalarResults(resultIndex);
if (timeStepIndex >= scalarSetResults.size()) if (timeStepIndex >= scalarSetResults.size())
{ {
return new RigHugeValResultAccessor; return new RigHugeValResultAccessor;
} }
std::vector<double>* resultValues = NULL; const std::vector<double>* resultValues = NULL;
if (timeStepIndex < scalarSetResults.size()) if (timeStepIndex < scalarSetResults.size())
{ {
resultValues = &(scalarSetResults[timeStepIndex]); resultValues = &(scalarSetResults[timeStepIndex]);

10
ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h
View File

@ -33,20 +33,20 @@ class RigResultAccessorFactory
{ {
public: public:
static cvf::ref<RigResultAccessor> static cvf::ref<RigResultAccessor>
createFromResultDefinition(RigEclipseCaseData* eclipseCase, createFromResultDefinition(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
size_t timeStepIndex, size_t timeStepIndex,
RimEclipseResultDefinition* resultDefinition); RimEclipseResultDefinition* resultDefinition);
static cvf::ref<RigResultAccessor> static cvf::ref<RigResultAccessor>
createFromUiResultName(RigEclipseCaseData* eclipseCase, createFromUiResultName(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
const QString& uiResultName); const QString& uiResultName);
static cvf::ref<RigResultAccessor> static cvf::ref<RigResultAccessor>
createFromNameAndType(RigEclipseCaseData* eclipseCase, createFromNameAndType(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -54,7 +54,7 @@ public:
RimDefines::ResultCatType resultType); RimDefines::ResultCatType resultType);
static cvf::ref<RigResultAccessor> static cvf::ref<RigResultAccessor>
createFromResultIdx(RigEclipseCaseData* eclipseCase, createFromResultIdx(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,
@ -62,7 +62,7 @@ public:
private: private:
static cvf::ref<RigResultAccessor> static cvf::ref<RigResultAccessor>
createNativeFromUiResultName(RigEclipseCaseData* eclipseCase, createNativeFromUiResultName(const RigEclipseCaseData* eclipseCase,
size_t gridIndex, size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel, RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex, size_t timeStepIndex,