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

(#561) Do not remove duplicate depth values

Browse Source 
Filtering of depth values does not work as expected, disabled for now.
This commit is contained in:
Magne Sjaastad 2015-10-05 18:37:58 +02:00
parent 05a71b79c9
commit c8ec321caf
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ApplicationCode/ProjectDataModel/ProjectDataModel_UnitTests/RimWellLogExtractionCurveImpl-Test.cpp
View File

@ -7,15 +7,46 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
TEST(RimWellLogExtractionCurveImplTest, Dummy) TEST(RimWellLogExtractionCurveImplTest, StripOffInvalidValAtEndsOfVector)
{ {
std::vector<double> values; std::vector<double> values;
values.push_back(0.0); values.push_back(HUGE_VAL);
values.push_back(1.0); values.push_back(HUGE_VAL);
values.push_back(1.0); values.push_back(1.0);
values.push_back(2.0);
values.push_back(3.0);
values.push_back(HUGE_VAL);
std::vector< std::pair<size_t, size_t> > valuesIntervals; std::vector< std::pair<size_t, size_t> > valuesIntervals;
RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals); RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals);
EXPECT_EQ(1, valuesIntervals.size()); EXPECT_EQ(1, valuesIntervals.size());
EXPECT_EQ(2, valuesIntervals[0].first);
EXPECT_EQ(4, valuesIntervals[0].second);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RimWellLogExtractionCurveImplTest, StripOffHugeValAtEndsAndInteriorOfVector)
{
std::vector<double> values;
values.push_back(HUGE_VAL);
values.push_back(HUGE_VAL);
values.push_back(1.0);
values.push_back(HUGE_VAL);
values.push_back(HUGE_VAL);
values.push_back(2.0);
values.push_back(3.0);
values.push_back(HUGE_VAL);
std::vector< std::pair<size_t, size_t> > valuesIntervals;
RimWellLogExtractionCurveImpl::validValuesIntervals(values, valuesIntervals);
EXPECT_EQ(2, valuesIntervals.size());
EXPECT_EQ(2, valuesIntervals[0].first);
EXPECT_EQ(2, valuesIntervals[0].second);
EXPECT_EQ(5, valuesIntervals[1].first);
EXPECT_EQ(6, valuesIntervals[1].second);
} }

9
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp
View File

@ -33,6 +33,14 @@ void RimWellLogExtractionCurveImpl::validCurvePointIntervals(const std::vector<d
std::vector< std::pair<size_t, size_t> > valuesIntervals; std::vector< std::pair<size_t, size_t> > valuesIntervals;
validValuesIntervals(values, valuesIntervals); validValuesIntervals(values, valuesIntervals);
intervals = valuesIntervals;
// TODO: The following code does not work as expected
// See issue #459 (original issue) and bugs #557 #560 and #561
// Suggestion: Remove code related to filtering out depth values,
// because we want to see the value difference at element borders
/*
size_t intervalsCount = valuesIntervals.size(); size_t intervalsCount = valuesIntervals.size();
for (size_t intIdx = 0; intIdx < intervalsCount; intIdx++) for (size_t intIdx = 0; intIdx < intervalsCount; intIdx++)
{ {
@ -44,6 +52,7 @@ void RimWellLogExtractionCurveImpl::validCurvePointIntervals(const std::vector<d
intervals.push_back(depthValuesIntervals[dvintIdx]); intervals.push_back(depthValuesIntervals[dvintIdx]);
} }
} }
*/
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------