OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-10 08:03:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch into dev with fixes for #2403

Browse Source
This commit is contained in:
Rebecca Cox 2018-02-19 09:30:57 +01:00
commit 542c912df2
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationCode/ReservoirDataModel/RigWellLogCurveData.cpp
View File

@ -274,11 +274,11 @@ void RigWellLogCurveData::calculateIntervalsOfContinousValidValues()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Splits the start stop interval between cells that are not close enough. /// Splits the start stop interval between cells that are not close enough.
/// The depth values are expected to contain pair of depths: Depth at cell enter, and cell leave
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigWellLogCurveData::splitIntervalAtEmptySpace(const std::vector<double>& depthValues, void RigWellLogCurveData::splitIntervalAtEmptySpace(const std::vector<double>& depthValues,
size_t startIdx, size_t stopIdx, size_t startIdx,
std::vector< std::pair<size_t, size_t> >* intervals) size_t stopIdx,
std::vector< std::pair<size_t, size_t> >* intervals)
{ {
CVF_ASSERT(intervals); CVF_ASSERT(intervals);
@ -293,20 +293,31 @@ void RigWellLogCurveData::splitIntervalAtEmptySpace(const std::vector<double>& d
// !! TODO: Find a reasonable tolerance // !! TODO: Find a reasonable tolerance
const double depthDiffTolerance = 0.1; const double depthDiffTolerance = 0.1;
// Find intervals containing depth values that should be connected // Find intervals containing depth values that should be connected:
size_t intStartIdx = startIdx; //
for (size_t vIdx = startIdx + 1; vIdx < stopIdx; vIdx += 2) // vIdx = 0 is the first point of a well, usually outside of the model. Further depth values are
// organized in pairs of depths (in and out of a cell), and sometimes the depths varies slightly. If
// the distance between a depth pair is larger than the depthDiffTolerance, the two sections will be split
// into two intervals.
//
// The first pair is located at vIdx = 1 & 2. If startIdx = 0, an offset of 1 is added to vIdx, to access
// that pair in the loop. If startIdx = 1 (can happen if the start point is inside of the model and invalid),
// the offset is not needed.
size_t intervalStartIdx = startIdx;
size_t offset = 1 - startIdx % 2;
for (size_t vIdx = startIdx + offset; vIdx < stopIdx; vIdx += 2)
{ {
if (cvf::Math::abs(depthValues[vIdx + 1] - depthValues[vIdx]) > depthDiffTolerance) if (cvf::Math::abs(depthValues[vIdx + 1] - depthValues[vIdx]) > depthDiffTolerance)
{ {
intervals->push_back(std::make_pair(intStartIdx, vIdx)); intervals->push_back(std::make_pair(intervalStartIdx, vIdx));
intStartIdx = vIdx + 1; intervalStartIdx = vIdx + 1;
} }
} }
if (intStartIdx <= stopIdx) if (intervalStartIdx <= stopIdx)
{ {
intervals->push_back(std::make_pair(intStartIdx, stopIdx)); intervals->push_back(std::make_pair(intervalStartIdx, stopIdx));
} }
} }