diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 63d7ae02bc..9b46af6d7d 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -346,7 +346,7 @@ std::vector RimWellRftPlot::getPressureChannelsFromWellP //-------------------------------------------------------------------------------------------------- RimEclipseCase* RimWellRftPlot::eclipseCaseFromCaseId(int caseId) { - const std::vector>& eclipseCases = eclipseCasesContainingPressure(m_wellName); + const std::vector>& eclipseCases = eclipseCasesForWell(m_wellName); auto itr = std::find_if(eclipseCases.begin(), eclipseCases.end(), [caseId](std::tuple eclCase) { return std::get<0>(eclCase)->caseId == caseId; }); return itr != eclipseCases.end() ? std::get<0>(*itr) : nullptr; @@ -375,7 +375,7 @@ RimWellPath* RimWellRftPlot::wellPathForObservedData(const QString& wellName, co /// //-------------------------------------------------------------------------------------------------- std::vector> -RimWellRftPlot::eclipseCasesContainingPressure(const QString& wellName) const +RimWellRftPlot::eclipseCasesForWell(const QString& wellName) const { std::vector> cases; auto project = RiaApplication::instance()->project(); @@ -416,7 +416,7 @@ RimWellRftPlot::gridCasesFromEclipseCases(const std::vector(eclCaseTuple); size_t timeStepCount = timeStepsFromGridCase(std::get<0>(eclCaseTuple)).size(); - if (timeStepCount > 0) + if (hasPressureData && timeStepCount > 0) { cases.push_back(std::get<0>(eclCaseTuple)); } @@ -561,7 +561,7 @@ bool RimWellRftPlot::mapContainsTimeStep(const std::map> RimWellRftPlot::selectedCurveDefs() const { std::set> curveDefs; - const std::vector>& eclipseCases = eclipseCasesContainingPressure(m_wellName); + const std::vector>& eclipseCases = eclipseCasesForWell(m_wellName); auto rftCases = rftCasesFromEclipseCases(eclipseCases); auto gridCases = gridCasesFromEclipseCases(eclipseCases); auto wellPaths = wellPathsContainingPressure(m_wellName); @@ -872,7 +872,7 @@ QList RimWellRftPlot::calculateValueOptions(const caf::P } else if (fieldNeedingOptions == &m_selectedSources) { - const std::vector>& eclipseCases = eclipseCasesContainingPressure(m_wellName); + const std::vector>& eclipseCases = eclipseCasesForWell(m_wellName); auto rftCases = rftCasesFromEclipseCases(eclipseCases); if (rftCases.size() > 0) @@ -1077,7 +1077,7 @@ void RimWellRftPlot::calculateValueOptionsForWells(QList void RimWellRftPlot::calculateValueOptionsForTimeSteps(const QString& wellName, QList& options) { std::map> displayTimeStepsMap, obsAndRftTimeStepsMap, gridTimeStepsMap; - const std::vector>& eclipseCases = eclipseCasesContainingPressure(wellName); + const std::vector>& eclipseCases = eclipseCasesForWell(wellName); auto rftCases = rftCasesFromEclipseCases(eclipseCases); auto gridCases = gridCasesFromEclipseCases(eclipseCases); auto observedWellPaths = wellPathsContainingPressure(m_wellName); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h index 53d560e77b..4615d651b2 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h @@ -121,7 +121,7 @@ private: RimWellPath* wellPathForObservedData(const QString& wellName, const QDateTime& date) const; - std::vector> eclipseCasesContainingPressure(const QString& wellName) const; + std::vector> eclipseCasesForWell(const QString& wellName) const; std::vector gridCasesFromEclipseCases(const std::vector>& eclipseCasesTuple) const; std::vector rftCasesFromEclipseCases(const std::vector>& eclipseCasesTuple) const; std::map> timeStepsFromRftCase(RimEclipseResultCase* gridCase) const;