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

Well Log extraction: Cleaning up a bit

Browse Source
This commit is contained in:
Jacob Støren 2015-10-14 15:14:41 +02:00
parent 21b313f945
commit b2f4f64aca
2 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/ReservoirDataModel/RigWellLogExtractionTools.h
View File

@ -100,42 +100,6 @@ struct RigHexIntersector
}
};
//==================================================================================================
/// Class used to sort the intersections along the wellpath
//==================================================================================================
struct RigMDEnterLeaveKey
{
RigMDEnterLeaveKey(double md, bool entering): measuredDepth(md), isEnteringCell(entering){}
double measuredDepth;
bool isEnteringCell; // As opposed to leaving.
bool isLeavingCell() { return !isEnteringCell;}
// Sorting according to MD first, then Leaving before entering cell
bool operator < (const RigMDEnterLeaveKey& other) const
{
double depthDiff = other.measuredDepth - measuredDepth;
if (RigHexIntersector::isEqualDepth(measuredDepth, other.measuredDepth) )
{
if (isEnteringCell == other.isEnteringCell)
{
// Completely equal, probably hitting between two cells
return false;
}
return !isEnteringCell; // Sort Leaving cell before (less than) entering cell
}
// The depths are not equal
return (measuredDepth < other.measuredDepth);
}
};
//==================================================================================================
/// Class used to sort the intersections along the wellpath,
/// Use as key in a map

15
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp
View File

@ -72,9 +72,8 @@ void RigWellLogExtractor::insertIntersectionsInMap(const std::vector<HexIntersec
//--------------------------------------------------------------------------------------------------
void RigWellLogExtractor::populateReturnArrays(std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo > &uniqueIntersections)
{
// For same MD and same cell, remove enter/leave pairs, as they only touches the wellpath, and should not contribute.
{
// For same MD and same cell, remove enter/leave pairs, as they only touches the wellpath, and should not contribute.
std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo >::iterator it1 = uniqueIntersections.begin();
std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo >::iterator it2 = uniqueIntersections.begin();
@ -108,6 +107,7 @@ void RigWellLogExtractor::populateReturnArrays(std::map<RigMDCellIdxEnterLeaveKe
}
// Copy the map into a different sorting regime, with enter leave more significant than cell index
std::map<RigMDEnterLeaveCellIdxKey, HexIntersectionInfo > sortedUniqueIntersections;
{
std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo >::iterator it = uniqueIntersections.begin();
@ -119,8 +119,7 @@ void RigWellLogExtractor::populateReturnArrays(std::map<RigMDCellIdxEnterLeaveKe
}
}
// Make sure we have sensible pairs of intersections. One pair for each in/out of a cell
// Add points for the endpoint of the wellpath, if it starts/ends inside a cell
{
// Add an intersection for the well startpoint that is inside the first cell
std::map<RigMDEnterLeaveCellIdxKey, HexIntersectionInfo >::iterator it = sortedUniqueIntersections.begin();
@ -148,11 +147,12 @@ void RigWellLogExtractor::populateReturnArrays(std::map<RigMDCellIdxEnterLeaveKe
}
}
// Filter and store the intersections pairwise as cell enter-leave pairs
// Discard points that does not have a match .
{
std::map<RigMDEnterLeaveCellIdxKey, HexIntersectionInfo >::iterator it1 = sortedUniqueIntersections.begin();
std::map<RigMDEnterLeaveCellIdxKey, HexIntersectionInfo >::iterator it2;
// 1-2 3
while (it1 != sortedUniqueIntersections.end())
{
it2 = it1;
@ -218,13 +218,10 @@ void RigWellLogExtractor::populateReturnArrays(std::map<RigMDCellIdxEnterLeaveKe
continue;
}
CVF_ASSERT(false); // Should not come here
CVF_ASSERT(false); // Should never end here
}
}
}
}
void RigWellLogExtractor::appendIntersectionToArrays(double measuredDepth, const HexIntersectionInfo& intersection)