OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 12:10:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

System : Removed elements after unique has been called

Browse Source
This commit is contained in:
Magne Sjaastad 2015-10-26 10:15:17 +01:00
parent 930209f527
commit 7d02c794b7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -392,8 +392,6 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC
cvf::Collection<RigFault> faults; cvf::Collection<RigFault> faults;
std::vector< RifKeywordAndFilePos > fileKeywords; std::vector< RifKeywordAndFilePos > fileKeywords;
std::vector<QString> filenamesWithFaults;
for (size_t i = 0; i < this->filenamesWithFaults().size(); i++) for (size_t i = 0; i < this->filenamesWithFaults().size(); i++)
{ {
QString faultFilename = this->filenamesWithFaults()[i]; QString faultFilename = this->filenamesWithFaults()[i];
@ -417,7 +415,9 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC
RigMainGrid* mainGrid = eclipseCase->mainGrid(); RigMainGrid* mainGrid = eclipseCase->mainGrid();
mainGrid->setFaults(faults); mainGrid->setFaults(faults);
std::unique(filenamesWithFaults.begin(), filenamesWithFaults.end()); std::sort(filenamesWithFaults.begin(), filenamesWithFaults.end());
std::vector<QString>::iterator last = std::unique(filenamesWithFaults.begin(), filenamesWithFaults.end());
filenamesWithFaults.erase(last, filenamesWithFaults.end());
this->setFilenamesWithFaults(filenamesWithFaults); this->setFilenamesWithFaults(filenamesWithFaults);
} }
@ -925,8 +925,6 @@ cvf::Vec3d interpolate3DPosition(const std::vector<SegmentPositionContribution>
std::vector<SegmentPositionContribution> filteredPositions; std::vector<SegmentPositionContribution> filteredPositions;
filteredPositions.reserve(positions.size()); filteredPositions.reserve(positions.size());
bool hasContibFromBelow = false;
bool hasContribFromAbove = false;
double minDistFromContribAbove = HUGE_VAL; double minDistFromContribAbove = HUGE_VAL;
double minDistFromContribBelow = HUGE_VAL; double minDistFromContribBelow = HUGE_VAL;
std::vector<SegmentPositionContribution> contrFromAbove; std::vector<SegmentPositionContribution> contrFromAbove;