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

riTRANSXYZ: Moving the calculation to ReservoirCellResultsStorage

Browse Source 
Create stored native riTRANX,Y,Z results instead of doing everyting in
one go.
This makes the statistics calculation work automatically instead of
beeing custoized and require a compplete calculation of its own.
This commit is contained in:
Jacob Støren
2014-08-22 08:07:00 +02:00
parent 9e22c90a4a
commit 57a049d39f
6 changed files with 269 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
View File

@@ -30,6 +30,7 @@
class RifReaderInterface;
class RigMainGrid;
class RigStatisticsDataCache;
class RigActiveCellInfo;
//==================================================================================================
/// Class containing the results for the complete number of active cells. Both main grid and LGR's
@@ -40,6 +41,9 @@ public:
RigCaseCellResultsData(RigMainGrid* ownerGrid);
void setMainGrid(RigMainGrid* ownerGrid);
void setActiveCellInfo(RigActiveCellInfo* activeCellInfo) { m_activeCellInfo = activeCellInfo;}
RigActiveCellInfo* activeCellInfo() { return m_activeCellInfo;}
const RigActiveCellInfo* activeCellInfo() const { return m_activeCellInfo;}
// Max and min values of the results
void recalculateStatistics(size_t scalarResultIndex);
@@ -123,5 +127,6 @@ private:
std::vector<ResultInfo> m_resultInfos;
RigMainGrid* m_ownerMainGrid;
RigActiveCellInfo* m_activeCellInfo;
};

5
ApplicationCode/ReservoirDataModel/RigCaseData.cpp
View File

@@ -33,6 +33,9 @@ RigCaseData::RigCaseData()
m_activeCellInfo = new RigActiveCellInfo;
m_fractureActiveCellInfo = new RigActiveCellInfo;
m_matrixModelResults->setActiveCellInfo(m_activeCellInfo.p());
m_fractureModelResults->setActiveCellInfo(m_fractureActiveCellInfo.p());
}
//--------------------------------------------------------------------------------------------------
@@ -397,10 +400,12 @@ void RigCaseData::setActiveCellInfo(RifReaderInterface::PorosityModelResultType
if (porosityModel == RifReaderInterface::MATRIX_RESULTS)
{
m_activeCellInfo = activeCellInfo;
m_matrixModelResults->setActiveCellInfo(m_activeCellInfo.p());
}
else
{
m_fractureActiveCellInfo = activeCellInfo;
m_fractureModelResults->setActiveCellInfo(m_fractureActiveCellInfo.p());
}
}

27
ApplicationCode/ReservoirDataModel/RigCombRiTransResultAccessor.cpp
View File

@@ -112,7 +112,7 @@ double RigCombRiTransResultAccessor::getNtgValue(size_t gridLocalCellIndex, cvf:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double halfCellTransmissibility( double perm , double ntg, const cvf::Vec3d& centerToFace, const cvf::Vec3d& faceAreaVec)
double RigCombRiTransResultAccessor::halfCellTransmissibility(double perm, double ntg, const cvf::Vec3d& centerToFace, const cvf::Vec3d& faceAreaVec)
{
return perm*ntg*(faceAreaVec*centerToFace) / (centerToFace*centerToFace);
}
@@ -120,11 +120,12 @@ double halfCellTransmissibility( double perm , double ntg, const cvf::Vec3d& cen
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double newtran(double cdarchy, double mult, double halfCellTrans, double neighborHalfCellTrans)
double RigCombRiTransResultAccessor::newtran(double cdarchy, double mult, double halfCellTrans, double neighborHalfCellTrans)
{
return cdarchy * mult / ( ( 1 / halfCellTrans) + (1 / neighborHalfCellTrans) );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -139,7 +140,7 @@ double RigCombRiTransResultAccessor::calculateHalfCellTrans(size_t gridLocalCell
if (isFaultFace)
{
calculateConnectionGeometry( gridLocalCellIndex, neighborGridCellIdx, faceId, &faceCenter, &faceAreaVec);
calculateConnectionGeometry( m_grid, gridLocalCellIndex, neighborGridCellIdx, faceId, &faceCenter, &faceAreaVec);
}
else
{
@@ -157,18 +158,18 @@ double RigCombRiTransResultAccessor::calculateHalfCellTrans(size_t gridLocalCell
return halfCellTransmissibility(perm, ntg, centerToFace, faceAreaVec);
}
void RigCombRiTransResultAccessor::calculateConnectionGeometry( size_t gridLocalCellIndex, size_t neighborGridCellIdx,
void RigCombRiTransResultAccessor::calculateConnectionGeometry( const RigGridBase* grid, size_t gridLocalCellIndex, size_t neighborGridCellIdx,
cvf::StructGridInterface::FaceType faceId,
cvf::Vec3d* faceCenter, cvf::Vec3d* faceAreaVec) const
cvf::Vec3d* faceCenter, cvf::Vec3d* faceAreaVec)
{
CVF_TIGHT_ASSERT(faceCenter && faceAreaVec);
*faceCenter = cvf::Vec3d::ZERO;
*faceAreaVec = cvf::Vec3d::ZERO;
const RigMainGrid* mainGrid = m_grid->mainGrid();
const RigMainGrid* mainGrid = grid->mainGrid();
const RigCell& c1 = m_grid->cell(gridLocalCellIndex);
const RigCell& c2 = m_grid->cell(neighborGridCellIdx);
const RigCell& c1 = grid->cell(gridLocalCellIndex);
const RigCell& c2 = grid->cell(neighborGridCellIdx);
std::vector<size_t> polygon;
std::vector<cvf::Vec3d> intersections;
@@ -193,10 +194,10 @@ void RigCombRiTransResultAccessor::calculateConnectionGeometry( size_t gridLocal
for (size_t pIdx = 0; pIdx < polygon.size(); ++pIdx)
{
if (polygon[pIdx] < m_grid->mainGrid()->nodes().size())
realPolygon.push_back(m_grid->mainGrid()->nodes()[polygon[pIdx]]);
if (polygon[pIdx] < grid->mainGrid()->nodes().size())
realPolygon.push_back(grid->mainGrid()->nodes()[polygon[pIdx]]);
else
realPolygon.push_back(intersections[polygon[pIdx] - m_grid->mainGrid()->nodes().size()]);
realPolygon.push_back(intersections[polygon[pIdx] - grid->mainGrid()->nodes().size()]);
}
// Polygon center
@@ -216,8 +217,8 @@ void RigCombRiTransResultAccessor::calculateConnectionGeometry( size_t gridLocal
}
//--------------------------------------------------------------------------------------------------
///
/// Neighbour cell transmisibilities only is calculated here
/// Not NNC transmisibilities. Thart has to be done separatly elsewhere
/// Neighbor cell transmisibilities only is calculated here
/// Not NNC transmisibilities. That has to be done separately elsewhere
///
/// Todo: What about Grid to Grid connections ?
/// Todo: needs optimization. Things are done several times. Caching of the results should be considered. etc.

4
ApplicationCode/ReservoirDataModel/RigCombRiTransResultAccessor.h
View File

@@ -53,8 +53,10 @@ private:
double calculateHalfCellTrans( size_t gridLocalCellIndex, size_t neighborGridCellIdx, cvf::StructGridInterface::FaceType faceId, bool isFaultFace) const;
double getNtgValue( size_t gridLocalCellIndex, cvf::StructGridInterface::FaceType faceId ) const;
void calculateConnectionGeometry( size_t gridLocalCellIndex, size_t neighborGridCellIdx, cvf::StructGridInterface::FaceType faceId, cvf::Vec3d* centerToFace, cvf::Vec3d* faceAreaVec) const;
static void calculateConnectionGeometry( const RigGridBase* grid, size_t gridLocalCellIndex, size_t neighborGridCellIdx, cvf::StructGridInterface::FaceType faceId, cvf::Vec3d* centerToFace, cvf::Vec3d* faceAreaVec);
static double halfCellTransmissibility(double perm, double ntg, const cvf::Vec3d& centerToFace, const cvf::Vec3d& faceAreaVec);
static double newtran(double cdarchy, double mult, double halfCellTrans, double neighborHalfCellTrans);
cvf::ref<RigResultAccessor> m_xPermAccessor;
cvf::ref<RigResultAccessor> m_yPermAccessor;