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

#1758 Rename to gridName

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-30 10:41:51 +01:00
parent 5cc6877afa
commit c7b5e091c6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,14 +605,18 @@ void RicWellPathExportCompletionDataFeature::printCompletionsToFile(const QStrin
lgrFileName += gridName; lgrFileName += gridName;
} }
printCompletionsToFileLgr(folderName, lgrFileName, it.second, exportType); printCompletionsToFileLgr(folderName, lgrFileName, gridName, it.second, exportType);
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeature::printCompletionsToFileLgr(const QString& folderName, const QString& fileName, std::vector<RigCompletionData>& completions, RicExportCompletionDataSettingsUi::CompdatExportType exportType) void RicWellPathExportCompletionDataFeature::printCompletionsToFileLgr(const QString& folderName,
const QString& fileName,
const QString& gridName,
std::vector<RigCompletionData>& completions,
RicExportCompletionDataSettingsUi::CompdatExportType exportType)
{ {
if (completions.empty()) return; if (completions.empty()) return;
@ -640,7 +644,7 @@ void RicWellPathExportCompletionDataFeature::printCompletionsToFileLgr(const QSt
std::sort(completions.begin(), completions.end()); std::sort(completions.begin(), completions.end());
// Print completion data // Print completion data
generateCompdatTable(formatter, completions[0].completionDataGridCell().lgrName(), completions); generateCompdatTable(formatter, gridName, completions);
if (exportType == RicExportCompletionDataSettingsUi::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS) if (exportType == RicExportCompletionDataSettingsUi::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS)
{ {
@ -692,11 +696,11 @@ std::map<RigCompletionDataGridCell, std::vector<RigCompletionData> > RicWellPath
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeature::generateCompdatTable(RifEclipseDataTableFormatter& formatter, const QString& lgrName, const std::vector<RigCompletionData>& completionData) void RicWellPathExportCompletionDataFeature::generateCompdatTable(RifEclipseDataTableFormatter& formatter, const QString& gridName, const std::vector<RigCompletionData>& completionData)
{ {
std::vector<RifEclipseOutputTableColumn> header; std::vector<RifEclipseOutputTableColumn> header;
if (lgrName.isEmpty()) if (gridName.isEmpty())
{ {
header = { header = {
RifEclipseOutputTableColumn("Well"), RifEclipseOutputTableColumn("Well"),
@ -755,9 +759,9 @@ void RicWellPathExportCompletionDataFeature::generateCompdatTable(RifEclipseData
} }
formatter.add(data.wellName()); formatter.add(data.wellName());
if (!lgrName.isEmpty()) if (!gridName.isEmpty())
{ {
formatter.add(lgrName); formatter.add(gridName);
} }
formatter.addZeroBasedCellIndex(data.completionDataGridCell().localCellIndexI()).addZeroBasedCellIndex(data.completionDataGridCell().localCellIndexJ()).addZeroBasedCellIndex(data.completionDataGridCell().localCellIndexK()).addZeroBasedCellIndex(data.completionDataGridCell().localCellIndexK()); formatter.addZeroBasedCellIndex(data.completionDataGridCell().localCellIndexI()).addZeroBasedCellIndex(data.completionDataGridCell().localCellIndexJ()).addZeroBasedCellIndex(data.completionDataGridCell().localCellIndexK()).addZeroBasedCellIndex(data.completionDataGridCell().localCellIndexK());