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

#3123 Compdat export. Always show all colomns. Remove r0 column

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-09-06 08:29:32 +02:00
parent e2fbade5bd
commit 4204aa7319
1 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@ -1256,7 +1256,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte
if (gridName.isEmpty()) if (gridName.isEmpty())
{ {
header = {RifEclipseOutputTableColumn("Well"), header = { RifEclipseOutputTableColumn("Well"),
RifEclipseOutputTableColumn("I"), RifEclipseOutputTableColumn("I"),
RifEclipseOutputTableColumn("J"), RifEclipseOutputTableColumn("J"),
RifEclipseOutputTableColumn("K1"), RifEclipseOutputTableColumn("K1"),
@ -1271,8 +1271,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte
RifEclipseOutputTableColumn("S"), RifEclipseOutputTableColumn("S"),
RifEclipseOutputTableColumn( RifEclipseOutputTableColumn(
"Df", RifEclipseOutputTableDoubleFormatting(RifEclipseOutputTableDoubleFormat::RIF_SCIENTIFIC)), "Df", RifEclipseOutputTableDoubleFormatting(RifEclipseOutputTableDoubleFormat::RIF_SCIENTIFIC)),
RifEclipseOutputTableColumn("DIR"), RifEclipseOutputTableColumn("DIR") };
RifEclipseOutputTableColumn("r0")};
formatter.keyword("COMPDAT"); formatter.keyword("COMPDAT");
} }
@ -1294,8 +1293,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte
RifEclipseOutputTableColumn("S"), RifEclipseOutputTableColumn("S"),
RifEclipseOutputTableColumn( RifEclipseOutputTableColumn(
"Df", RifEclipseOutputTableDoubleFormatting(RifEclipseOutputTableDoubleFormat::RIF_SCIENTIFIC)), "Df", RifEclipseOutputTableDoubleFormatting(RifEclipseOutputTableDoubleFormat::RIF_SCIENTIFIC)),
RifEclipseOutputTableColumn("DIR"), RifEclipseOutputTableColumn("DIR") };
RifEclipseOutputTableColumn("r0")};
formatter.keyword("COMPDATL"); formatter.keyword("COMPDATL");
} }
@ -1354,43 +1352,27 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte
} }
formatter.addValueOrDefaultMarker(data.saturation(), RigCompletionData::defaultValue()); formatter.addValueOrDefaultMarker(data.saturation(), RigCompletionData::defaultValue());
formatter.addValueOrDefaultMarker(data.transmissibility(), RigCompletionData::defaultValue());
if (data.isNonDarcyFlow() || RigCompletionData::isDefaultValue(data.transmissibility())) formatter.addValueOrDefaultMarker(data.diameter(), RigCompletionData::defaultValue());
{ formatter.addValueOrDefaultMarker(data.kh(), RigCompletionData::defaultValue());
formatter.addValueOrDefaultMarker(data.transmissibility(), RigCompletionData::defaultValue()); formatter.addValueOrDefaultMarker(data.skinFactor(), RigCompletionData::defaultValue());
formatter.addValueOrDefaultMarker(data.diameter(), RigCompletionData::defaultValue()); if (RigCompletionData::isDefaultValue(data.dFactor()))
formatter.addValueOrDefaultMarker(data.kh(), RigCompletionData::defaultValue()); formatter.add("1*");
formatter.addValueOrDefaultMarker(data.skinFactor(), RigCompletionData::defaultValue());
if (RigCompletionData::isDefaultValue(data.dFactor()))
formatter.add("1*");
else
formatter.add(-data.dFactor());
switch (data.direction())
{
case DIR_I:
formatter.add("'X'");
break;
case DIR_J:
formatter.add("'Y'");
break;
case DIR_K:
formatter.add("'Z'");
break;
default:
formatter.add("'Z'");
break;
}
}
else else
{ formatter.add(-data.dFactor());
formatter.add(data.transmissibility());
// Based on feedback from Shunping for COMPDATL, hhgs required COMPDAT switch (data.direction())
// Always include diameter {
// See https://github.com/OPM/ResInsight/issues/2517 case DIR_I:
// See https://github.com/OPM/ResInsight/issues/2709 formatter.add("'X'");
formatter.addValueOrDefaultMarker(data.diameter(), RigCompletionData::defaultValue()); break;
case DIR_J:
formatter.add("'Y'");
break;
case DIR_K:
default:
formatter.add("'Z'");
break;
} }
formatter.rowCompleted(); formatter.rowCompleted();