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

#1960 Use set<> to check if a timestep is already present instead of linear search

Browse Source
This commit is contained in:
Jacob Støren 2017-10-03 16:03:34 +02:00
parent 132c109ff2
commit 9fc3443050
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@ -122,7 +122,10 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
{ {
if (!ecl_file) return; if (!ecl_file) return;
CVF_ASSERT(timeSteps); CVF_ASSERT(timeSteps && daysSinceSimulationStart);
timeSteps->clear();
daysSinceSimulationStart->clear();
// Get the number of occurrences of the INTEHEAD keyword // Get the number of occurrences of the INTEHEAD keyword
int numINTEHEAD = ecl_file_get_num_named_kw(ecl_file, INTEHEAD_KW); int numINTEHEAD = ecl_file_get_num_named_kw(ecl_file, INTEHEAD_KW);
@ -145,6 +148,8 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
} }
} }
std::set<QDateTime> existingTimesteps;
for (int i = 0; i < numINTEHEAD; i++) for (int i = 0; i < numINTEHEAD; i++)
{ {
ecl_kw_type* kwINTEHEAD = ecl_file_iget_named_kw(ecl_file, INTEHEAD_KW, i); ecl_kw_type* kwINTEHEAD = ecl_file_iget_named_kw(ecl_file, INTEHEAD_KW, i);
@ -162,8 +167,7 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
double milliseconds = dayFraction * 24.0 * 60.0 * 60.0 * 1000.0; double milliseconds = dayFraction * 24.0 * 60.0 * 60.0 * 1000.0;
reportDateTime = reportDateTime.addMSecs(milliseconds); reportDateTime = reportDateTime.addMSecs(milliseconds);
if (existingTimesteps.insert(reportDateTime).second)
if (std::find(timeSteps->begin(), timeSteps->end(), reportDateTime) == timeSteps->end())
{ {
timeSteps->push_back(reportDateTime); timeSteps->push_back(reportDateTime);
daysSinceSimulationStart->push_back(dayValue); daysSinceSimulationStart->push_back(dayValue);