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

Merge remote-tracking branch 'origin/2018.01.01-patch' into dev

Browse Source
This commit is contained in:
Magne Sjaastad
2018-01-25 11:14:09 +01:00
parent 3d2e5b6088 08a46c2307
commit 1e4b4dbf62
17 changed files with 667 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@@ -249,9 +249,9 @@ void RimEclipseInputCase::loadAndSyncronizeInputProperties()
// Then read the properties from all the files referenced by the InputReservoir
std::vector<QString> filenames;
for (const RimEclipseInputProperty* inputProperty : m_inputPropertyCollection()->inputProperties())
for (const QString& fileName : additionalFiles())
{
filenames.push_back(inputProperty->fileName);
filenames.push_back(fileName);
}
filenames.push_back(m_gridFileName);

2
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp
View File

@@ -236,7 +236,7 @@ void RigNumberOfFloodedPoreVolumesCalculator::calculate(RigMainGrid* mainGrid,
const std::vector<double>* flowrateNNC = flowrateNNCatAllTimeSteps[timeStep-1];
if (flowrateNNC->size() > 0)
if (flowrateNNC && flowrateNNC->size() > 0)
{
distributeNNCflow(connections,
caseToApply,

5
ApplicationCode/UserInterface/RiuResultQwtPlot.cpp
View File

@@ -66,6 +66,11 @@ RiuResultQwtPlot::~RiuResultQwtPlot()
//--------------------------------------------------------------------------------------------------
void RiuResultQwtPlot::addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues)
{
if (dateTimes.empty() || timeHistoryValues.empty())
{
return;
}
RiuLineSegmentQwtPlotCurve* plotCurve = new RiuLineSegmentQwtPlotCurve("Curve 1");
plotCurve->setSamplesFromDatesAndYValues(dateTimes, timeHistoryValues, false);