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

#7678 Fishbones MSW : Include WSEGVALV in MSW-file for LGR section

Browse Source
This commit is contained in:
Magne Sjaastad
2021-05-11 14:02:22 +02:00
parent 466b2cbcd9
commit c430e7343a
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp
View File

@@ -272,12 +272,12 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForPerforations( Rim
assignBranchNumbersToBranch( eclipseCase, &exportInfo, exportInfo.mainBoreBranch(), &branchNumber ); assignBranchNumbersToBranch( eclipseCase, &exportInfo, exportInfo.mainBoreBranch(), &branchNumber );
double maxSegmentLength = mswParameters->maxSegmentLength();
{ {
QTextStream stream( exportFile.get() ); QTextStream stream( exportFile.get() );
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
double maxSegmentLength = mswParameters->maxSegmentLength();
RicMswTableFormatterTools::generateWelsegsTable( formatter, RicMswTableFormatterTools::generateWelsegsTable( formatter,
exportInfo, exportInfo,
maxSegmentLength, maxSegmentLength,
@@ -293,14 +293,14 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForPerforations( Rim
QTextStream stream( lgrExportFile.get() ); QTextStream stream( lgrExportFile.get() );
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
double maxSegmentLength = mswParameters->maxSegmentLength();
RicMswTableFormatterTools::generateWelsegsTable( formatter, RicMswTableFormatterTools::generateWelsegsTable( formatter,
exportInfo, exportInfo,
maxSegmentLength, maxSegmentLength,
completionSegmentsAfterMainBore ); completionSegmentsAfterMainBore );
bool exportLgrData = true; bool exportLgrData = true;
RicMswTableFormatterTools::generateCompsegTables( formatter, exportInfo, exportLgrData ); RicMswTableFormatterTools::generateCompsegTables( formatter, exportInfo, exportLgrData );
RicMswTableFormatterTools::generateWsegvalvTable( formatter, exportInfo );
RicMswTableFormatterTools::generateWsegAicdTable( formatter, exportInfo );
} }
} }
} }
@@ -430,20 +430,19 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForFishbones( RimEcl
assignBranchNumbersToBranch( eclipseCase, &exportInfo, exportInfo.mainBoreBranch(), &branchNumber ); assignBranchNumbersToBranch( eclipseCase, &exportInfo, exportInfo.mainBoreBranch(), &branchNumber );
double maxSegmentLength = wellPath->mswCompletionParameters()->maxSegmentLength();
{ {
QTextStream stream( exportFile.get() ); QTextStream stream( exportFile.get() );
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setOptionalComment( exportDataSourceAsComment ); formatter.setOptionalComment( exportDataSourceAsComment );
double maxSegmentLength = wellPath->mswCompletionParameters()->maxSegmentLength();
RicMswTableFormatterTools::generateWelsegsTable( formatter, RicMswTableFormatterTools::generateWelsegsTable( formatter,
exportInfo, exportInfo,
maxSegmentLength, maxSegmentLength,
completionSegmentsAfterMainBore ); completionSegmentsAfterMainBore );
bool exportLgrData = false; bool exportLgrData = false;
RicMswTableFormatterTools::generateCompsegTables( formatter, exportInfo, exportLgrData ); RicMswTableFormatterTools::generateCompsegTables( formatter, exportInfo, exportLgrData );
RicMswTableFormatterTools::generateWsegvalvTable( formatter, exportInfo ); RicMswTableFormatterTools::generateWsegvalvTable( formatter, exportInfo );
} }
@@ -453,8 +452,6 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForFishbones( RimEcl
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setOptionalComment( exportDataSourceAsComment ); formatter.setOptionalComment( exportDataSourceAsComment );
double maxSegmentLength = wellPath->mswCompletionParameters()->maxSegmentLength();
RicMswTableFormatterTools::generateWelsegsTable( formatter, RicMswTableFormatterTools::generateWelsegsTable( formatter,
exportInfo, exportInfo,
maxSegmentLength, maxSegmentLength,
@@ -462,6 +459,7 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForFishbones( RimEcl
bool exportLgr = true; bool exportLgr = true;
RicMswTableFormatterTools::generateCompsegTables( formatter, exportInfo, exportLgr ); RicMswTableFormatterTools::generateCompsegTables( formatter, exportInfo, exportLgr );
RicMswTableFormatterTools::generateWsegvalvTable( formatter, exportInfo );
} }
} }