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

Removed setCellScalar and resultName from Resultaccessor

Browse Source
This commit is contained in:
Magne Sjaastad 2014-08-07 14:56:29 +02:00
parent 322823754b
commit b4d8067a74
10 changed files with 14 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp
View File

@ -24,11 +24,10 @@
#include <cmath> #include <cmath>
RigActiveCellsResultAccessor::RigActiveCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo, const QString& resultName) RigActiveCellsResultAccessor::RigActiveCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo)
: m_grid(grid), : m_grid(grid),
m_reservoirResultValues(reservoirResultValues), m_reservoirResultValues(reservoirResultValues),
m_activeCellInfo(activeCellInfo), m_activeCellInfo(activeCellInfo)
m_resultName(resultName)
{ {
} }
@ -57,23 +56,3 @@ double RigActiveCellsResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::
return cellScalar(localCellIndex); return cellScalar(localCellIndex);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigActiveCellsResultAccessor::resultName() const
{
return m_resultName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigActiveCellsResultAccessor::setCellScalar(size_t localCellIndex, double scalarValue)
{
size_t globalGridCellIndex = m_grid->globalGridCellIndex(localCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex);
CVF_TIGHT_ASSERT(m_reservoirResultValues != NULL && resultValueIndex < m_reservoirResultValues->size());
(*m_reservoirResultValues)[resultValueIndex] = scalarValue;
}

5
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.h
View File

@ -30,17 +30,14 @@ class RigActiveCellInfo;
class RigActiveCellsResultAccessor : public RigResultAccessor class RigActiveCellsResultAccessor : public RigResultAccessor
{ {
public: public:
RigActiveCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo, const QString& resultName); RigActiveCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo);
virtual double cellScalar(size_t localCellIndex) const; virtual double cellScalar(size_t localCellIndex) const;
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual QString resultName() const;
virtual void setCellScalar(size_t localCellIndex, double scalarValue);
private: private:
const RigActiveCellInfo* m_activeCellInfo; const RigActiveCellInfo* m_activeCellInfo;
const RigGridBase* m_grid; const RigGridBase* m_grid;
std::vector<double>* m_reservoirResultValues; std::vector<double>* m_reservoirResultValues;
QString m_resultName;
}; };

23
ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp
View File

@ -26,10 +26,9 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigAllGridCellsResultAccessor::RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const QString& resultName) RigAllGridCellsResultAccessor::RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues)
: m_grid(grid), : m_grid(grid),
m_reservoirResultValues(reservoirResultValues), m_reservoirResultValues(reservoirResultValues)
m_resultName(resultName)
{ {
} }
@ -54,21 +53,3 @@ double RigAllGridCellsResultAccessor::cellFaceScalar(size_t localCellIndex, cvf:
return cellScalar(localCellIndex); return cellScalar(localCellIndex);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigAllGridCellsResultAccessor::resultName() const
{
return m_resultName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigAllGridCellsResultAccessor::setCellScalar(size_t localCellIndex, double scalarValue)
{
size_t globalGridCellIndex = m_grid->globalGridCellIndex(localCellIndex);
CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size());
(*m_reservoirResultValues)[globalGridCellIndex] = scalarValue;
}

5
ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h
View File

@ -29,17 +29,14 @@ class RigGridBase;
class RigAllGridCellsResultAccessor : public RigResultAccessor class RigAllGridCellsResultAccessor : public RigResultAccessor
{ {
public: public:
RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const QString& resultName); RigAllGridCellsResultAccessor(const RigGridBase* grid, std::vector<double>* reservoirResultValues);
virtual double cellScalar(size_t localCellIndex) const; virtual double cellScalar(size_t localCellIndex) const;
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual QString resultName() const;
virtual void setCellScalar(size_t localCellIndex, double scalarValue);
private: private:
const RigGridBase* m_grid; const RigGridBase* m_grid;
std::vector<double>* m_reservoirResultValues; std::vector<double>* m_reservoirResultValues;
QString m_resultName;
}; };

21
ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.cpp
View File

@ -24,8 +24,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigCellEdgeResultAccessor::RigCellEdgeResultAccessor(const QString& resultName) RigCellEdgeResultAccessor::RigCellEdgeResultAccessor()
: m_resultName(resultName)
{ {
m_resultAccessObjects.resize(6); m_resultAccessObjects.resize(6);
} }
@ -64,21 +63,3 @@ double RigCellEdgeResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::Str
return HUGE_VAL; return HUGE_VAL;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigCellEdgeResultAccessor::resultName() const
{
return m_resultName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigCellEdgeResultAccessor::setCellScalar(size_t localCellIndex, double scalarValue)
{
// TODO: How to handle when we get here?
CVF_ASSERT(false);
}

6
ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.h
View File

@ -29,17 +29,13 @@
class RigCellEdgeResultAccessor : public RigResultAccessor class RigCellEdgeResultAccessor : public RigResultAccessor
{ {
public: public:
RigCellEdgeResultAccessor(const QString& resultName); RigCellEdgeResultAccessor();
void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject); void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject);
virtual double cellScalar(size_t localCellIndex) const; virtual double cellScalar(size_t localCellIndex) const;
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual QString resultName() const;
virtual void setCellScalar(size_t localCellIndex, double scalarValue);
private: private:
cvf::Collection<RigResultAccessor> m_resultAccessObjects; cvf::Collection<RigResultAccessor> m_resultAccessObjects;
QString m_resultName;
}; };

23
ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.cpp
View File

@ -26,9 +26,8 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigCombTransResultAccessor::RigCombTransResultAccessor(const RigGridBase* grid, const QString& resultName) RigCombTransResultAccessor::RigCombTransResultAccessor(const RigGridBase* grid)
: m_grid(grid), : m_grid(grid)
m_resultName(resultName)
{ {
m_resultAccessObjects.resize(6); m_resultAccessObjects.resize(6);
} }
@ -140,21 +139,3 @@ double RigCombTransResultAccessor::cellFaceScalar(size_t localCellIndex, cvf::St
return HUGE_VAL; return HUGE_VAL;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigCombTransResultAccessor::resultName() const
{
return m_resultName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigCombTransResultAccessor::setCellScalar(size_t localCellIndex, double scalarValue)
{
// TODO: How to handle when we get here?
CVF_ASSERT(false);
}

5
ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.h
View File

@ -31,18 +31,15 @@ class RigGridBase;
class RigCombTransResultAccessor : public RigResultAccessor class RigCombTransResultAccessor : public RigResultAccessor
{ {
public: public:
RigCombTransResultAccessor(const RigGridBase* grid, const QString& resultName); RigCombTransResultAccessor(const RigGridBase* grid);
void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject); void setDataAccessObjectForFace(cvf::StructGridInterface::FaceType faceId, RigResultAccessor* resultAccessObject);
virtual double cellScalar(size_t localCellIndex) const; virtual double cellScalar(size_t localCellIndex) const;
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual QString resultName() const;
virtual void setCellScalar(size_t localCellIndex, double scalarValue);
private: private:
cvf::Collection<RigResultAccessor> m_resultAccessObjects; cvf::Collection<RigResultAccessor> m_resultAccessObjects;
const RigGridBase* m_grid; const RigGridBase* m_grid;
QString m_resultName;
}; };

4
ApplicationCode/ReservoirDataModel/RigResultAccessor.h
View File

@ -33,10 +33,6 @@ class RigResultAccessor : public cvf::Object
public: public:
virtual double cellScalar(size_t localCellIndex) const = 0; virtual double cellScalar(size_t localCellIndex) const = 0;
virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const = 0; virtual double cellFaceScalar(size_t localCellIndex, cvf::StructGridInterface::FaceType faceId) const = 0;
virtual QString resultName() const = 0;
virtual void setCellScalar(size_t localCellIndex, double scalarValue) = 0;
}; };
#if 0 #if 0

6
ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
View File

@ -83,12 +83,12 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createNativeResultAccessor
bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarSetIndex); bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarSetIndex);
if (useGlobalActiveIndex) if (useGlobalActiveIndex)
{ {
cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessor(grid, resultValues, eclipseCase->activeCellInfo(porosityModel), uiResultName); cvf::ref<RigResultAccessor> object = new RigActiveCellsResultAccessor(grid, resultValues, eclipseCase->activeCellInfo(porosityModel));
return object; return object;
} }
else else
{ {
cvf::ref<RigResultAccessor> object = new RigAllGridCellsResultAccessor(grid, resultValues, uiResultName); cvf::ref<RigResultAccessor> object = new RigAllGridCellsResultAccessor(grid, resultValues);
return object; return object;
} }
} }
@ -122,7 +122,7 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createResultAccessor(RigCa
// Taken from RivTransmissibilityColorMapper::updateCombinedTransmissibilityTextureCoordinates // Taken from RivTransmissibilityColorMapper::updateCombinedTransmissibilityTextureCoordinates
// //
cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor(grid, uiResultName); cvf::ref<RigCombTransResultAccessor> cellFaceAccessObject = new RigCombTransResultAccessor(grid);
{ {
QString resultName = "TRANX"; QString resultName = "TRANX";