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 dev into pre-proto.

Browse Source
This commit is contained in:
Jacob Støren
2017-06-02 08:05:07 +02:00
parent 4c873b6925 d024baab95
commit e7244d0b0b
28 changed files with 407 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,10 +152,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)
{
@@ -177,21 +178,21 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
appendCompletionData(&completionData, fractureCompletionData);
}
// Merge map into a vector of values
std::vector<RigCompletionData> completions;
for (auto& data : completionData)
{
completions.push_back(data.second);
}
// Sort by well name / cell index
std::sort(completions.begin(), completions.end());
}
// Print completion data
generateCompdatTable(formatter, completions);
if (exportSettings.includeWpimult)
{
generateWpimultTable(formatter, completions);
}
// Merge map into a vector of values
std::vector<RigCompletionData> completions;
for (auto& data : completionData)
{
completions.push_back(data.second);
}
// Sort by well name / cell index
std::sort(completions.begin(), completions.end());
// Print completion data
generateCompdatTable(formatter, completions);
if (exportSettings.includeWpimult)
{
generateWpimultTable(formatter, completions);
}
}