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

#1835 Tof Acc Sat Plot: Add a max TOF range field

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-08-29 15:32:11 +02:00
parent d50e40854a
commit fa943226bc
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp
View File

@@ -154,7 +154,8 @@ RimViewWindow* RiuTofAccumulatedPhaseFractionsPlot::ownerViewWindow() const
void RiuTofAccumulatedPhaseFractionsPlot::setSamples(std::vector<double> xSamples,
std::vector<double> watValues,
std::vector<double> oilValues,
std::vector<double> gasValues)
std::vector<double> gasValues,
int maxTofYears)
{
m_xValues.clear();
m_watValues.clear();
@@ -164,9 +165,13 @@ void RiuTofAccumulatedPhaseFractionsPlot::setSamples(std::vector<double> xSample
m_watValues.swap(watValues);
for (size_t i = 0; i < xSamples.size(); ++i)
{
m_xValues.push_back(xSamples[i] / 365.2425);
m_oilValues.push_back(oilValues[i] + m_watValues[i]);
m_gasValues.push_back(gasValues[i] + m_oilValues[i]);
double tofYears = xSamples[i] / 365.2425;
if (tofYears <= maxTofYears)
{
m_xValues.push_back(tofYears);
m_oilValues.push_back(oilValues[i] + m_watValues[i]);
m_gasValues.push_back(gasValues[i] + m_oilValues[i]);
}
}
m_watCurve->setSamples(m_xValues.data(), m_watValues.data(), static_cast<int>(m_xValues.size()));
m_oilCurve->setSamples(m_xValues.data(), m_oilValues.data(), static_cast<int>(m_xValues.size()));