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

Use TOPS as property name for top face of cells. Use positive K for BOTTOM, use negative K for TOPS.

Browse Source 
p4#: 19294
This commit is contained in:
Magne Sjaastad 2012-10-24 13:05:42 +02:00
parent 2b85dbd264
commit 73c370a299
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ReservoirDataModel/RigReservoirCellResults.cpp
View File

@ -451,14 +451,14 @@ void RigReservoirCellResults::computeDepthRelatedResults()
size_t dxResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DX"); size_t dxResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DX");
size_t dyResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DY"); size_t dyResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DY");
size_t dzResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DZ"); size_t dzResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DZ");
size_t topResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "TOP"); size_t topsResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "TOPS");
size_t bottomResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "BOTTOM"); size_t bottomResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "BOTTOM");
bool computeDepth = false; bool computeDepth = false;
bool computeDx = false; bool computeDx = false;
bool computeDy = false; bool computeDy = false;
bool computeDz = false; bool computeDz = false;
bool computeTop = false; bool computeTops = false;
bool computeBottom = false; bool computeBottom = false;
size_t resultValueCount = m_ownerMainGrid->cells().size(); size_t resultValueCount = m_ownerMainGrid->cells().size();
@ -487,10 +487,10 @@ void RigReservoirCellResults::computeDepthRelatedResults()
computeDz = true; computeDz = true;
} }
if (topResultGridIndex == cvf::UNDEFINED_SIZE_T) if (topsResultGridIndex == cvf::UNDEFINED_SIZE_T)
{ {
topResultGridIndex = addStaticScalarResult(RimDefines::STATIC_NATIVE, "TOP", resultValueCount); topsResultGridIndex = addStaticScalarResult(RimDefines::STATIC_NATIVE, "TOPS", resultValueCount);
computeTop = true; computeTops = true;
} }
if (bottomResultGridIndex == cvf::UNDEFINED_SIZE_T) if (bottomResultGridIndex == cvf::UNDEFINED_SIZE_T)
@ -503,7 +503,7 @@ void RigReservoirCellResults::computeDepthRelatedResults()
std::vector< std::vector<double> >& dx = cellScalarResults(dxResultGridIndex); std::vector< std::vector<double> >& dx = cellScalarResults(dxResultGridIndex);
std::vector< std::vector<double> >& dy = cellScalarResults(dyResultGridIndex); std::vector< std::vector<double> >& dy = cellScalarResults(dyResultGridIndex);
std::vector< std::vector<double> >& dz = cellScalarResults(dzResultGridIndex); std::vector< std::vector<double> >& dz = cellScalarResults(dzResultGridIndex);
std::vector< std::vector<double> >& top = cellScalarResults(topResultGridIndex); std::vector< std::vector<double> >& tops = cellScalarResults(topsResultGridIndex);
std::vector< std::vector<double> >& bottom = cellScalarResults(bottomResultGridIndex); std::vector< std::vector<double> >& bottom = cellScalarResults(bottomResultGridIndex);
bool computeValuesForActiveCellsOnly = m_ownerMainGrid->numActiveCells() > 0; bool computeValuesForActiveCellsOnly = m_ownerMainGrid->numActiveCells() > 0;
@ -541,14 +541,14 @@ void RigReservoirCellResults::computeDepthRelatedResults()
dz[0][cellIdx] = cellWidth.length(); dz[0][cellIdx] = cellWidth.length();
} }
if (computeTop) if (computeTops)
{ {
top[0][cellIdx] = cvf::Math::abs(cell.faceCenter(cvf::StructGridInterface::POS_K).z()); tops[0][cellIdx] = cvf::Math::abs(cell.faceCenter(cvf::StructGridInterface::NEG_K).z());
} }
if (computeBottom) if (computeBottom)
{ {
bottom[0][cellIdx] = cvf::Math::abs(cell.faceCenter(cvf::StructGridInterface::NEG_K).z()); bottom[0][cellIdx] = cvf::Math::abs(cell.faceCenter(cvf::StructGridInterface::POS_K).z());
} }
} }
} }