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

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

Browse Source
This commit is contained in:
Jacob Støren
2017-06-01 17:21:46 +02:00
parent 665ee684b3
commit ac5e43337c
1 changed files with 16 additions and 16 deletions
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); QTextStream stream(&exportFile);
RifEclipseDataTableFormatter formatter(stream); RifEclipseDataTableFormatter formatter(stream);
std::map<IJKCellIndex, RigCompletionData> completionData;
for (auto wellPath : wellPaths) for (auto wellPath : wellPaths)
{ {
// Generate completion data // Generate completion data
std::map<IJKCellIndex, RigCompletionData> completionData;
if (exportSettings.includePerforations) if (exportSettings.includePerforations)
{ {
@@ -168,6 +169,7 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
std::vector<RigCompletionData> fishbonesWellPathCompletionData = generateFishbonesWellPathCompdatValues(wellPath, exportSettings); std::vector<RigCompletionData> fishbonesWellPathCompletionData = generateFishbonesWellPathCompdatValues(wellPath, exportSettings);
appendCompletionData(&completionData, fishbonesWellPathCompletionData); appendCompletionData(&completionData, fishbonesWellPathCompletionData);
} }
}
// Merge map into a vector of values // Merge map into a vector of values
std::vector<RigCompletionData> completions; std::vector<RigCompletionData> completions;
@@ -177,14 +179,12 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
} }
// Sort by well name / cell index // Sort by well name / cell index
std::sort(completions.begin(), completions.end()); std::sort(completions.begin(), completions.end());
// Print completion data // Print completion data
generateCompdatTable(formatter, completions); generateCompdatTable(formatter, completions);
if (exportSettings.includeWpimult) if (exportSettings.includeWpimult)
{ {
generateWpimultTable(formatter, completions); generateWpimultTable(formatter, completions);
} }
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------