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

#2153 Curve Creator : Clear results before trying to assign values from curve merging

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-21 09:19:39 +01:00
parent 9d5bf4ce5e
commit 4d6d48dc18
2 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@@ -291,21 +291,27 @@ bool RimSummaryCalculation::calculate()
if (evaluatedOk)
{
size_t firstValidTimeStep = timeHistoryCurveMerger.validIntervalsForAllTimeSteps().front().first;
size_t lastValidTimeStep = timeHistoryCurveMerger.validIntervalsForAllTimeSteps().back().second + 1;
m_timesteps.v().clear();
m_calculatedValues.v().clear();
if (lastValidTimeStep > firstValidTimeStep &&
lastValidTimeStep <= timeHistoryCurveMerger.allTimeSteps().size())
if (timeHistoryCurveMerger.validIntervalsForAllTimeSteps().size() > 0)
{
std::vector<time_t> validTimeSteps(timeHistoryCurveMerger.allTimeSteps().begin() + firstValidTimeStep,
timeHistoryCurveMerger.allTimeSteps().begin() + lastValidTimeStep);
size_t firstValidTimeStep = timeHistoryCurveMerger.validIntervalsForAllTimeSteps().front().first;
size_t lastValidTimeStep = timeHistoryCurveMerger.validIntervalsForAllTimeSteps().back().second + 1;
if (lastValidTimeStep > firstValidTimeStep &&
lastValidTimeStep <= timeHistoryCurveMerger.allTimeSteps().size())
{
std::vector<time_t> validTimeSteps(timeHistoryCurveMerger.allTimeSteps().begin() + firstValidTimeStep,
timeHistoryCurveMerger.allTimeSteps().begin() + lastValidTimeStep);
std::vector<double> validValues(resultValues.begin() + firstValidTimeStep,
resultValues.begin() + lastValidTimeStep);
std::vector<double> validValues(resultValues.begin() + firstValidTimeStep,
resultValues.begin() + lastValidTimeStep);
m_timesteps = validTimeSteps;
m_calculatedValues = validValues;
m_timesteps = validTimeSteps;
m_calculatedValues = validValues;
}
}
m_isDirty = false;