#1493 Accumulate completions for all wellpaths before combinig to make it possible to erro check unhandled overlaps

This commit is contained in:
Jacob Støren 2017-06-01 17:21:46 +02:00
parent 665ee684b3
commit ac5e43337c

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,22 +169,21 @@ 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;
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);
}
}