From 68f52536442d5d53e0928d5649913a6b8ece7927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 12 Dec 2017 15:00:14 +0100 Subject: [PATCH] #1858 Move method to WellLogExtractor base class --- .../ReservoirDataModel/RigEclipseWellLogExtractor.cpp | 7 ------- .../ReservoirDataModel/RigEclipseWellLogExtractor.h | 1 - .../ReservoirDataModel/RigWellLogExtractor.cpp | 8 ++++++++ ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp index 06a0f8e269..a9e2e57dca 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp @@ -134,13 +134,6 @@ void RigEclipseWellLogExtractor::curveData(const RigResultAccessor* resultAccess } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -const std::vector& RigEclipseWellLogExtractor::intersectedCellsGlobIdx() -{ - return m_intersectedCellsGlobIdx; -} //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h index 20ed0e13c9..b30286c870 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h @@ -40,7 +40,6 @@ public: void curveData(const RigResultAccessor* resultAccessor, std::vector* values ); const RigEclipseCaseData* caseData() { return m_caseData.p();} - const std::vector& intersectedCellsGlobIdx(); protected: void calculateIntersection(); diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp index 4cf7cb02e0..6f4c54818e 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp @@ -71,6 +71,14 @@ std::vector RigWellLogExtractor::intersectionInfo( return infoVector; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +const std::vector& RigWellLogExtractor::intersectedCellsGlobIdx() +{ + return m_intersectedCellsGlobIdx; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h index 0adb457b03..cec06669d4 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h @@ -61,6 +61,7 @@ public: const std::vector& measuredDepth() { return m_measuredDepth; } const std::vector& trueVerticalDepth() { return m_trueVerticalDepth; } + const std::vector& intersectedCellsGlobIdx(); const RigWellPath* wellPathData() { return m_wellPath.p();}