OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 17:32:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor RimWellPath and RigWellPath

Browse Source
This commit is contained in:
Gaute Lindkvist committed 2020-10-26 10:43:14 +01:00
1 parent c29cf315d2
commit aceac43652
83 files changed
+853 -723
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/UnitTests/RiaPolyArcLineSampler-Test.cpp
+4 -16
View File
@@ -10,10 +10,7 @@ TEST( RiaPolyArcLineSampler, Basic )
RiaPolyArcLineSampler sampler( {0, 0, -1}, points );
std::vector<cvf::Vec3d> sampledPoints;
std::vector<double> mds;
sampler.sampledPointsAndMDs( 2, true, &sampledPoints, &mds );
auto [sampledPoints, mds] = sampler.sampledPointsAndMDs( 2, true );
#if 1
for ( size_t pIdx = 0; pIdx < sampledPoints.size(); ++pIdx )
{
@@ -40,10 +37,7 @@ TEST( RiaPolyArcLineSampler, TestInvalidInput )
RiaPolyArcLineSampler sampler( {0, 0, -1}, points );
std::vector<cvf::Vec3d> sampledPoints;
std::vector<double> mds;
sampler.sampledPointsAndMDs( 2, true, &sampledPoints, &mds );
auto [sampledPoints, mds] = sampler.sampledPointsAndMDs( 2, true );
EXPECT_EQ( 0, (int)sampledPoints.size() );
}
@@ -53,10 +47,7 @@ TEST( RiaPolyArcLineSampler, TestInvalidInput )
RiaPolyArcLineSampler sampler( {0, 0, -1}, points );
std::vector<cvf::Vec3d> sampledPoints;
std::vector<double> mds;
sampler.sampledPointsAndMDs( 2, true, &sampledPoints, &mds );
auto [sampledPoints, mds] = sampler.sampledPointsAndMDs( 2, true );
EXPECT_EQ( 0, (int)sampledPoints.size() );
}
@@ -66,10 +57,7 @@ TEST( RiaPolyArcLineSampler, TestInvalidInput )
RiaPolyArcLineSampler sampler( {0, 0, -1}, points );
std::vector<cvf::Vec3d> sampledPoints;
std::vector<double> mds;
sampler.sampledPointsAndMDs( 2, true, &sampledPoints, &mds );
auto [sampledPoints, mds] = sampler.sampledPointsAndMDs( 2, true );
EXPECT_EQ( 0, (int)sampledPoints.size() );
}
ApplicationCode/UnitTests/RigWellLogExtractor-Test.cpp
+2 -2
View File
@@ -68,8 +68,8 @@ TEST( RigEclipseWellLogExtractor, ShortWellPathInsideOneCell )
mdValues.push_back( offset );
}
wellPathGeometry->m_wellPathPoints = wellPathPoints;
wellPathGeometry->m_measuredDepths = mdValues;
wellPathGeometry->setWellPathPoints( wellPathPoints );
wellPathGeometry->setMeasuredDepths( mdValues );
}
cvf::ref<RigEclipseWellLogExtractor> e = new RigEclipseWellLogExtractor( reservoir.p(), wellPathGeometry.p(), "" );
ApplicationCode/UnitTests/RigWellPathGeometryExporter-Test.cpp
+3 -3
View File
@@ -39,8 +39,8 @@ TEST( RigWellPathGeometryExporter, VerticalPath )
for ( double md : inputMds )
{
rigWellPath.m_measuredDepths.push_back( md );
rigWellPath.m_wellPathPoints.push_back( cvf::Vec3d( x, y, -md ) );
rigWellPath.addMeasuredDepth( md );
rigWellPath.addWellPathPoint( cvf::Vec3d( x, y, -md ) );
}
double mdStepSize = 5.0;
@@ -49,7 +49,7 @@ TEST( RigWellPathGeometryExporter, VerticalPath )
std::vector<double> yValues;
std::vector<double> tvdValues;
std::vector<double> mdValues;
RigWellPathGeometryExporter::exportWellPathGeometry( &rigWellPath, mdStepSize, rkbOffset, xValues, yValues, tvdValues, mdValues );
RigWellPathGeometryExporter::exportWellPathGeometry( rigWellPath, mdStepSize, rkbOffset, xValues, yValues, tvdValues, mdValues );
double firstMd = inputMds.front();
double lastMd = inputMds.back();
ApplicationCode/UnitTests/RigWellPathIntersectionTools-Test.cpp
+2 -2
View File
@@ -46,8 +46,8 @@ TEST( RigWellPathTest, FindWellPathCoordsIncludingIntersectionPoint )
mdValues.push_back( 3.0 );
mdValues.push_back( 4.0 );
wellPathGeometry.m_wellPathPoints = wellPathPoints;
wellPathGeometry.m_measuredDepths = mdValues;
wellPathGeometry.setWellPathPoints( wellPathPoints );
wellPathGeometry.setMeasuredDepths( mdValues );
}
// Before first MD