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

#3096 Implemented ensemble calulations

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-25 15:14:47 +02:00
parent 2ea84bdb63
commit 898df5b68a
44 changed files with 1378 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifReaderObservedData.cpp
View File

@@ -79,7 +79,7 @@ bool RifReaderObservedData::open(const QString& headerFileName,
m_allResultAddresses.clear();
for (auto s : m_asciiParser->tableData().columnInfos())
{
m_allResultAddresses.push_back(s.summaryAddress);
m_allResultAddresses.insert(s.summaryAddress);
}
}
@@ -95,12 +95,14 @@ bool RifReaderObservedData::values(const RifEclipseSummaryAddress& resultAddress
{
size_t columnIndex = m_allResultAddresses.size();
for (size_t i = 0; i < m_allResultAddresses.size(); i++)
int i = 0;
for(auto& address : m_allResultAddresses)
{
if (resultAddress == m_allResultAddresses[i])
if (address == resultAddress)
{
columnIndex = i;
}
i++;
}
if (columnIndex != m_allResultAddresses.size())