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

(#397) (#398) Added globalGridCellIndex access to the ResultAccessors

Browse Source 
To prepare for well log extraction
This commit is contained in:
Jacob Støren
2015-08-30 21:25:31 +02:00
parent 371902378e
commit 7794a66b04
10 changed files with 123 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp
View File

@@ -57,3 +57,26 @@ double RigActiveCellsResultAccessor::cellFaceScalar(size_t gridLocalCellIndex, c
return cellScalar(gridLocalCellIndex);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigActiveCellsResultAccessor::cellScalarGlobIdx(size_t reservoirCellIndex) const
{
if (m_reservoirResultValues == NULL || m_reservoirResultValues->size() == 0) return HUGE_VAL;
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);
if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
CVF_TIGHT_ASSERT(resultValueIndex < m_reservoirResultValues->size());
return m_reservoirResultValues->at(resultValueIndex);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigActiveCellsResultAccessor::cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const
{
return cellScalarGlobIdx(globCellIndex);
}

3
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.h
View File

@@ -36,6 +36,9 @@ public:
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
private:
const RigActiveCellInfo* m_activeCellInfo;
const RigGridBase* m_grid;

26
ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.cpp
View File

@@ -64,3 +64,29 @@ double RigCellEdgeResultAccessor::cellFaceScalar(size_t gridLocalCellIndex, cvf:
return HUGE_VAL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCellEdgeResultAccessor::cellScalarGlobIdx(size_t globCellIndex) const
{
// TODO: How to handle when we get here?
CVF_ASSERT(false);
return cvf::UNDEFINED_DOUBLE;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCellEdgeResultAccessor::cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const
{
const RigResultAccessor* resultAccessObj = m_resultAccessObjects[faceId].p();
if (resultAccessObj != NULL)
{
return resultAccessObj->cellFaceScalarGlobIdx(globCellIndex, faceId);
}
return HUGE_VAL;
}

3
ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.h
View File

@@ -37,6 +37,9 @@ public:
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
private:
caf::FixedArray<cvf::ref<RigResultAccessor>, 6> m_resultAccessObjects;
};

21
ApplicationCode/ReservoirDataModel/RigCombMultResultAccessor.cpp
View File

@@ -22,6 +22,8 @@
#include "RigGridBase.h"
#include <cmath>
#include "RigCell.h"
#include "RigMainGrid.h"
//--------------------------------------------------------------------------------------------------
@@ -147,3 +149,22 @@ double RigCombMultResultAccessor::nativeMultScalar(size_t gridLocalCellIndex, cv
return faceScalar;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCombMultResultAccessor::cellScalarGlobIdx(size_t globCellIndex) const
{
CVF_TIGHT_ASSERT(false);
return HUGE_VAL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCombMultResultAccessor::cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const
{
size_t gridLocalCellIndex = m_grid->mainGrid()->cell(globCellIndex).gridLocalCellIndex();
return this->cellFaceScalar(gridLocalCellIndex, faceId);
}

2
ApplicationCode/ReservoirDataModel/RigCombMultResultAccessor.h
View File

@@ -44,6 +44,8 @@ public:
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
private:
double nativeMultScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;

21
ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.cpp
View File

@@ -22,6 +22,8 @@
#include "RigGridBase.h"
#include <cmath>
#include "RigCell.h"
#include "RigMainGrid.h"
//--------------------------------------------------------------------------------------------------
@@ -137,3 +139,22 @@ double RigCombTransResultAccessor::cellFaceScalar(size_t gridLocalCellIndex, cvf
return HUGE_VAL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCombTransResultAccessor::cellScalarGlobIdx(size_t globCellIndex) const
{
CVF_TIGHT_ASSERT(false);
return HUGE_VAL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigCombTransResultAccessor::cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const
{
size_t gridLocalCellIndex = m_grid->mainGrid()->cell(globCellIndex).gridLocalCellIndex();
return this->cellFaceScalar(gridLocalCellIndex, faceId);
}

4
ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.h
View File

@@ -40,9 +40,13 @@ public:
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
private:
double neighborCellTran(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId, const RigResultAccessor* transAccessor) const;
cvf::ref<RigResultAccessor> m_xTransAccessor;
cvf::ref<RigResultAccessor> m_yTransAccessor;
cvf::ref<RigResultAccessor> m_zTransAccessor;

16
ApplicationCode/ReservoirDataModel/RigResultAccessor.cpp
View File

@@ -36,3 +36,19 @@ double RigHugeValResultAccessor::cellFaceScalar(size_t gridLocalCellIndex, cvf::
{
return cellScalar(gridLocalCellIndex);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigHugeValResultAccessor::cellScalarGlobIdx(size_t globCellIndex) const
{
return HUGE_VAL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigHugeValResultAccessor::cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const
{
return HUGE_VAL;
}

4
ApplicationCode/ReservoirDataModel/RigResultAccessor.h
View File

@@ -34,6 +34,8 @@ class RigResultAccessor : public cvf::Object
public:
virtual double cellScalar(size_t gridLocalCellIndex) const = 0;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const = 0;
virtual double cellScalarGlobIdx(size_t globCellIndex) const = 0;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const = 0;
};
//==================================================================================================
@@ -44,4 +46,6 @@ class RigHugeValResultAccessor : public RigResultAccessor
public:
virtual double cellScalar(size_t gridLocalCellIndex) const;
virtual double cellFaceScalar(size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId) const;
virtual double cellScalarGlobIdx(size_t globCellIndex) const;
virtual double cellFaceScalarGlobIdx(size_t globCellIndex, cvf::StructGridInterface::FaceType faceId) const;
};