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

Rename RifEclipseOutputDataTable* to RifTextDataTable*

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-10-15 11:30:06 +02:00
committed by Kristian Bendiksen
parent 98f9eef0da
commit d681b75d24
26 changed files with 611 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/Commands/ExportCommands/RicExportCarfin.cpp
View File

@@ -25,7 +25,7 @@
#include "RicExportCarfinUi.h"
#include "RicExportFeatureImpl.h"
#include "RifEclipseDataTableFormatter.h"
#include "RifTextDataTableFormatter.h"
#include "RimDialogData.h"
#include "RimEclipseCase.h"
@@ -79,20 +79,20 @@ void RicExportCarfin::onActionTriggered( bool isChecked )
return;
}
QTextStream stream( &exportFile );
RifEclipseDataTableFormatter formatter( stream );
QTextStream stream( &exportFile );
RifTextDataTableFormatter formatter( stream );
std::vector<RifEclipseOutputTableColumn> header = {RifEclipseOutputTableColumn( "I1" ),
RifEclipseOutputTableColumn( "I2" ),
RifEclipseOutputTableColumn( "J1" ),
RifEclipseOutputTableColumn( "J2" ),
RifEclipseOutputTableColumn( "K1" ),
RifEclipseOutputTableColumn( "K2" ),
RifEclipseOutputTableColumn( "NX" ),
RifEclipseOutputTableColumn( "NY" ),
RifEclipseOutputTableColumn( "NZ" ),
RifEclipseOutputTableColumn( "NWMAX" ),
RifEclipseOutputTableColumn( "Parent LGR" )};
std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( "I1" ),
RifTextDataTableColumn( "I2" ),
RifTextDataTableColumn( "J1" ),
RifTextDataTableColumn( "J2" ),
RifTextDataTableColumn( "K1" ),
RifTextDataTableColumn( "K2" ),
RifTextDataTableColumn( "NX" ),
RifTextDataTableColumn( "NY" ),
RifTextDataTableColumn( "NZ" ),
RifTextDataTableColumn( "NWMAX" ),
RifTextDataTableColumn( "Parent LGR" )};
formatter.keyword( "CARFIN" );
formatter.header( header );

26
ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeature.h"
#include "RicExportLgrUi.h"
#include "RifEclipseDataTableFormatter.h"
#include "RifTextDataTableFormatter.h"
#include "RigCaseCellResultsData.h"
#include "RigMainGrid.h"
@@ -367,19 +367,19 @@ void RicExportLgrFeature::writeLgrs( QTextStream& stream, const std::vector<LgrI
for ( auto lgrInfo : lgrInfos )
{
{
RifEclipseDataTableFormatter formatter( stream );
RifTextDataTableFormatter formatter( stream );
formatter.comment( QString( "LGR: " ) + lgrInfo.name );
formatter.keyword( "CARFIN" );
formatter.header( {RifEclipseOutputTableColumn( "Name" ),
RifEclipseOutputTableColumn( "I1" ),
RifEclipseOutputTableColumn( "I2" ),
RifEclipseOutputTableColumn( "J1" ),
RifEclipseOutputTableColumn( "J2" ),
RifEclipseOutputTableColumn( "K1" ),
RifEclipseOutputTableColumn( "K2" ),
RifEclipseOutputTableColumn( "NX" ),
RifEclipseOutputTableColumn( "NY" ),
RifEclipseOutputTableColumn( "NZ" )} );
formatter.header( {RifTextDataTableColumn( "Name" ),
RifTextDataTableColumn( "I1" ),
RifTextDataTableColumn( "I2" ),
RifTextDataTableColumn( "J1" ),
RifTextDataTableColumn( "J2" ),
RifTextDataTableColumn( "K1" ),
RifTextDataTableColumn( "K2" ),
RifTextDataTableColumn( "NX" ),
RifTextDataTableColumn( "NY" ),
RifTextDataTableColumn( "NZ" )} );
formatter.add( lgrInfo.name );
formatter.addOneBasedCellIndex( lgrInfo.mainGridStartCell.i() );
@@ -396,7 +396,7 @@ void RicExportLgrFeature::writeLgrs( QTextStream& stream, const std::vector<LgrI
}
{
RifEclipseDataTableFormatter formatter( stream );
RifTextDataTableFormatter formatter( stream );
formatter.keyword( "ENDFIN" );
formatter.tableCompleted( "", true );
}

6
ApplicationCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
View File

@@ -23,7 +23,7 @@
#include "RicExportWellPathsUi.h"
#include "RifEclipseDataTableFormatter.h"
#include "RifTextDataTableFormatter.h"
#include "RigWellPath.h"
@@ -103,7 +103,7 @@ void RicExportSelectedWellPathsFeature::writeWellPathGeometryToStream( QTextStre
double currMd = wellPathGeom->measureDepths().front() - mdStepSize;
double endMd = wellPathGeom->measureDepths().back();
RifEclipseDataTableFormatter formatter( stream );
RifTextDataTableFormatter formatter( stream );
formatter.setCommentPrefix( "# " );
formatter.setTableRowPrependText( " " );
@@ -115,7 +115,7 @@ void RicExportSelectedWellPathsFeature::writeWellPathGeometryToStream( QTextStre
stream << "WELLNAME: '" << caf::Utils::makeValidFileBasename( exportName ) << "'" << endl;
auto numberFormat = RifEclipseOutputTableDoubleFormatting( RIF_FLOAT, 2 );
auto numberFormat = RifTextDataTableDoubleFormatting( RIF_FLOAT, 2 );
formatter.header( {{"X", numberFormat, RIGHT},
{"Y", numberFormat, RIGHT},
{"TVDMSL", numberFormat, RIGHT},