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

RFT Plot. Bugfix and minor refactoring

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-10-16 12:22:13 +02:00
parent d9a29a6c9a
commit 4ca757f1b5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@@ -346,7 +346,7 @@ std::vector<RimWellLogFileChannel*> RimWellRftPlot::getPressureChannelsFromWellP
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimEclipseCase* RimWellRftPlot::eclipseCaseFromCaseId(int caseId) RimEclipseCase* RimWellRftPlot::eclipseCaseFromCaseId(int caseId)
{ {
const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCases = eclipseCasesContainingPressure(m_wellName); const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCases = eclipseCasesForWell(m_wellName);
auto itr = std::find_if(eclipseCases.begin(), eclipseCases.end(), auto itr = std::find_if(eclipseCases.begin(), eclipseCases.end(),
[caseId](std::tuple<RimEclipseResultCase*,bool,bool> eclCase) { return std::get<0>(eclCase)->caseId == caseId; }); [caseId](std::tuple<RimEclipseResultCase*,bool,bool> eclCase) { return std::get<0>(eclCase)->caseId == caseId; });
return itr != eclipseCases.end() ? std::get<0>(*itr) : nullptr; return itr != eclipseCases.end() ? std::get<0>(*itr) : nullptr;
@@ -375,7 +375,7 @@ RimWellPath* RimWellRftPlot::wellPathForObservedData(const QString& wellName, co
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<std::tuple<RimEclipseResultCase*, bool/*hasPressure*/, bool /*hasRftData*/>> std::vector<std::tuple<RimEclipseResultCase*, bool/*hasPressure*/, bool /*hasRftData*/>>
RimWellRftPlot::eclipseCasesContainingPressure(const QString& wellName) const RimWellRftPlot::eclipseCasesForWell(const QString& wellName) const
{ {
std::vector<std::tuple<RimEclipseResultCase*, bool, bool>> cases; std::vector<std::tuple<RimEclipseResultCase*, bool, bool>> cases;
auto project = RiaApplication::instance()->project(); auto project = RiaApplication::instance()->project();
@@ -416,7 +416,7 @@ RimWellRftPlot::gridCasesFromEclipseCases(const std::vector<std::tuple<RimEclips
{ {
bool hasPressureData = std::get<1>(eclCaseTuple); bool hasPressureData = std::get<1>(eclCaseTuple);
size_t timeStepCount = timeStepsFromGridCase(std::get<0>(eclCaseTuple)).size(); size_t timeStepCount = timeStepsFromGridCase(std::get<0>(eclCaseTuple)).size();
if (timeStepCount > 0) if (hasPressureData && timeStepCount > 0)
{ {
cases.push_back(std::get<0>(eclCaseTuple)); cases.push_back(std::get<0>(eclCaseTuple));
} }
@@ -561,7 +561,7 @@ bool RimWellRftPlot::mapContainsTimeStep(const std::map<QDateTime, std::set<RimW
std::set < std::pair<RimWellRftAddress, QDateTime>> RimWellRftPlot::selectedCurveDefs() const std::set < std::pair<RimWellRftAddress, QDateTime>> RimWellRftPlot::selectedCurveDefs() const
{ {
std::set<std::pair<RimWellRftAddress, QDateTime>> curveDefs; std::set<std::pair<RimWellRftAddress, QDateTime>> curveDefs;
const std::vector<std::tuple<RimEclipseResultCase*,bool,bool>>& eclipseCases = eclipseCasesContainingPressure(m_wellName); const std::vector<std::tuple<RimEclipseResultCase*,bool,bool>>& eclipseCases = eclipseCasesForWell(m_wellName);
auto rftCases = rftCasesFromEclipseCases(eclipseCases); auto rftCases = rftCasesFromEclipseCases(eclipseCases);
auto gridCases = gridCasesFromEclipseCases(eclipseCases); auto gridCases = gridCasesFromEclipseCases(eclipseCases);
auto wellPaths = wellPathsContainingPressure(m_wellName); auto wellPaths = wellPathsContainingPressure(m_wellName);
@@ -872,7 +872,7 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptions(const caf::P
} }
else if (fieldNeedingOptions == &m_selectedSources) else if (fieldNeedingOptions == &m_selectedSources)
{ {
const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCases = eclipseCasesContainingPressure(m_wellName); const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCases = eclipseCasesForWell(m_wellName);
auto rftCases = rftCasesFromEclipseCases(eclipseCases); auto rftCases = rftCasesFromEclipseCases(eclipseCases);
if (rftCases.size() > 0) if (rftCases.size() > 0)
@@ -1077,7 +1077,7 @@ void RimWellRftPlot::calculateValueOptionsForWells(QList<caf::PdmOptionItemInfo>
void RimWellRftPlot::calculateValueOptionsForTimeSteps(const QString& wellName, QList<caf::PdmOptionItemInfo>& options) void RimWellRftPlot::calculateValueOptionsForTimeSteps(const QString& wellName, QList<caf::PdmOptionItemInfo>& options)
{ {
std::map<QDateTime, std::set<RimWellRftAddress>> displayTimeStepsMap, obsAndRftTimeStepsMap, gridTimeStepsMap; std::map<QDateTime, std::set<RimWellRftAddress>> displayTimeStepsMap, obsAndRftTimeStepsMap, gridTimeStepsMap;
const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCases = eclipseCasesContainingPressure(wellName); const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCases = eclipseCasesForWell(wellName);
auto rftCases = rftCasesFromEclipseCases(eclipseCases); auto rftCases = rftCasesFromEclipseCases(eclipseCases);
auto gridCases = gridCasesFromEclipseCases(eclipseCases); auto gridCases = gridCasesFromEclipseCases(eclipseCases);
auto observedWellPaths = wellPathsContainingPressure(m_wellName); auto observedWellPaths = wellPathsContainingPressure(m_wellName);

2
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h
View File

@@ -121,7 +121,7 @@ private:
RimWellPath* wellPathForObservedData(const QString& wellName, const QDateTime& date) const; RimWellPath* wellPathForObservedData(const QString& wellName, const QDateTime& date) const;
std::vector<std::tuple<RimEclipseResultCase*, bool, bool>> eclipseCasesContainingPressure(const QString& wellName) const; std::vector<std::tuple<RimEclipseResultCase*, bool, bool>> eclipseCasesForWell(const QString& wellName) const;
std::vector<RimEclipseResultCase*> gridCasesFromEclipseCases(const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCasesTuple) const; std::vector<RimEclipseResultCase*> gridCasesFromEclipseCases(const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCasesTuple) const;
std::vector<RimEclipseResultCase*> rftCasesFromEclipseCases(const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCasesTuple) const; std::vector<RimEclipseResultCase*> rftCasesFromEclipseCases(const std::vector<std::tuple<RimEclipseResultCase*, bool, bool>>& eclipseCasesTuple) const;
std::map<QDateTime, std::set<RimWellRftAddress>> timeStepsFromRftCase(RimEclipseResultCase* gridCase) const; std::map<QDateTime, std::set<RimWellRftAddress>> timeStepsFromRftCase(RimEclipseResultCase* gridCase) const;