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 branch 'fishbones' into dev

Browse Source 
Fishbones is no longer supposed to be used
This commit is contained in:
Jacob Støren 2017-06-02 07:33:26 +02:00
commit d024baab95
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@ -151,10 +151,11 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
QTextStream stream(&exportFile);
RifEclipseDataTableFormatter formatter(stream);
std::map<IJKCellIndex, RigCompletionData> completionData;
for (auto wellPath : wellPaths)
{
// Generate completion data
std::map<IJKCellIndex, RigCompletionData> completionData;
if (exportSettings.includePerforations)
{
@ -168,6 +169,7 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
std::vector<RigCompletionData> fishbonesWellPathCompletionData = generateFishbonesWellPathCompdatValues(wellPath, exportSettings);
appendCompletionData(&completionData, fishbonesWellPathCompletionData);
}
}
// Merge map into a vector of values
std::vector<RigCompletionData> completions;
@ -177,7 +179,6 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
}
// Sort by well name / cell index
std::sort(completions.begin(), completions.end());
// Print completion data
generateCompdatTable(formatter, completions);
if (exportSettings.includeWpimult)
@ -185,7 +186,6 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
generateWpimultTable(formatter, completions);
}
}
}
//--------------------------------------------------------------------------------------------------
///

5
ApplicationCode/ReservoirDataModel/RigCompletionData.cpp
View File

@ -87,10 +87,11 @@ RigCompletionData RigCompletionData::combine(const RigCompletionData& first, con
//==================================================================================================
bool RigCompletionData::operator<(const RigCompletionData& other) const
{
if (m_wellName < other.m_wellName)
if (m_wellName != other.m_wellName)
{
return true;
return (m_wellName < other.m_wellName);
}
return m_cellIndex < other.m_cellIndex;
}