From 1a5db83046ec9f0cf61cb829d6c5710e2968bbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Mon, 6 Nov 2017 14:14:55 +0100 Subject: [PATCH] RFT plot. Made some methods static --- ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp | 4 ++-- ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 41e856191d..e1cf5e1f96 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -562,7 +562,7 @@ std::map> RimWellRftPlot::timeStepsFromRf //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::map> RimWellRftPlot::timeStepsFromGridCase(RimEclipseCase* gridCase) const +std::map> RimWellRftPlot::timeStepsFromGridCase(RimEclipseCase* gridCase) { const RigEclipseCaseData* const eclipseCaseData = gridCase->eclipseCaseData(); std::pair resultDataInfo = pressureResultDataInfo(eclipseCaseData); @@ -585,7 +585,7 @@ std::map> RimWellRftPlot::timeStepsFromGr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::map > RimWellRftPlot::timeStepsFromWellLogFile(RimWellLogFile* wellLogFile) const +std::map > RimWellRftPlot::timeStepsFromWellLogFile(RimWellLogFile* wellLogFile) { std::map > timeStepsMap; diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h index ce1e6ffed9..0732b58064 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h @@ -127,9 +127,9 @@ private: std::vector gridCasesFromEclipseCases(const std::vector>& eclipseCasesTuple) const; std::vector rftCasesFromEclipseCases(const std::vector>& eclipseCasesTuple) const; std::map> timeStepsFromRftCase(RimEclipseResultCase* gridCase) const; - std::map> timeStepsFromGridCase(RimEclipseCase* gridCase) const; - std::map> timeStepsFromWellLogFile(RimWellLogFile* wellLogFile) const; - std::map> adjacentTimeSteps(const std::vector>>& allTimeSteps, + static std::map> timeStepsFromGridCase(RimEclipseCase* gridCase); + static std::map> timeStepsFromWellLogFile(RimWellLogFile* wellLogFile); + static std::map> adjacentTimeSteps(const std::vector>>& allTimeSteps, const std::pair>& searchTimeStepPair); static bool mapContainsTimeStep(const std::map>& map, const QDateTime& timeStep);