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

32
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,22 +169,21 @@ 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;
for (auto& data : completionData) for (auto& data : completionData)
{ {
completions.push_back(data.second); completions.push_back(data.second);
} }
// 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);
}
} }
} }

7
ApplicationCode/ReservoirDataModel/RigCompletionData.cpp
View File

@ -87,10 +87,11 @@ RigCompletionData RigCompletionData::combine(const RigCompletionData& first, con
//================================================================================================== //==================================================================================================
bool RigCompletionData::operator<(const RigCompletionData& other) const 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; return m_cellIndex < other.m_cellIndex;
} }