Fixes by clang-format

This commit is contained in:
github-actions[bot] 2020-10-05 06:53:51 +00:00 committed by Gaute Lindkvist
parent 069b427d10
commit 0d360eeea6

View File

@ -640,7 +640,7 @@ std::map<QString, std::vector<RigCompletionData>>
auto it = completions.find( gridName ); auto it = completions.find( gridName );
if ( it == completions.end() ) if ( it == completions.end() )
{ {
completions.insert( std::pair<QString, std::vector<RigCompletionData>>( gridName, { completion } ) ); completions.insert( std::pair<QString, std::vector<RigCompletionData>>( gridName, {completion} ) );
} }
else else
{ {
@ -716,19 +716,19 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspecsToFile( RimEclips
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setColumnSpacing( 2 ); formatter.setColumnSpacing( 2 );
std::vector<RifTextDataTableColumn> header = { RifTextDataTableColumn( "Well" ), std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "Grp" ), RifTextDataTableColumn( "Grp" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "RefDepth" ), RifTextDataTableColumn( "RefDepth" ),
RifTextDataTableColumn( "Type" ), RifTextDataTableColumn( "Type" ),
RifTextDataTableColumn( "DrainRad" ), RifTextDataTableColumn( "DrainRad" ),
RifTextDataTableColumn( "GasInEq" ), RifTextDataTableColumn( "GasInEq" ),
RifTextDataTableColumn( "AutoShut" ), RifTextDataTableColumn( "AutoShut" ),
RifTextDataTableColumn( "XFlow" ), RifTextDataTableColumn( "XFlow" ),
RifTextDataTableColumn( "FluidPVT" ), RifTextDataTableColumn( "FluidPVT" ),
RifTextDataTableColumn( "HydSDens" ), RifTextDataTableColumn( "HydSDens" ),
RifTextDataTableColumn( "FluidInPlReg" ) }; RifTextDataTableColumn( "FluidInPlReg" )};
formatter.keyword( "WELSPECS" ); formatter.keyword( "WELSPECS" );
formatter.header( header ); formatter.header( header );
@ -783,20 +783,20 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspeclToFile(
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setColumnSpacing( 2 ); formatter.setColumnSpacing( 2 );
std::vector<RifTextDataTableColumn> header = { RifTextDataTableColumn( "Well" ), std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( "Well" ),
RifTextDataTableColumn( "Grp" ), RifTextDataTableColumn( "Grp" ),
RifTextDataTableColumn( "LGR" ), RifTextDataTableColumn( "LGR" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "RefDepth" ), RifTextDataTableColumn( "RefDepth" ),
RifTextDataTableColumn( "Type" ), RifTextDataTableColumn( "Type" ),
RifTextDataTableColumn( "DrainRad" ), RifTextDataTableColumn( "DrainRad" ),
RifTextDataTableColumn( "GasInEq" ), RifTextDataTableColumn( "GasInEq" ),
RifTextDataTableColumn( "AutoShut" ), RifTextDataTableColumn( "AutoShut" ),
RifTextDataTableColumn( "XFlow" ), RifTextDataTableColumn( "XFlow" ),
RifTextDataTableColumn( "FluidPVT" ), RifTextDataTableColumn( "FluidPVT" ),
RifTextDataTableColumn( "HydSDens" ), RifTextDataTableColumn( "HydSDens" ),
RifTextDataTableColumn( "FluidInPlReg" ) }; RifTextDataTableColumn( "FluidInPlReg" )};
formatter.keyword( "WELSPECL" ); formatter.keyword( "WELSPECL" );
formatter.header( header ); formatter.header( header );
@ -960,46 +960,44 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte
if ( gridName.isEmpty() ) if ( gridName.isEmpty() )
{ {
header = header = {RifTextDataTableColumn( "Well" ),
{ RifTextDataTableColumn( "Well" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "K1" ),
RifTextDataTableColumn( "K1" ), RifTextDataTableColumn( "K2" ),
RifTextDataTableColumn( "K2" ), RifTextDataTableColumn( "Status" ),
RifTextDataTableColumn( "Status" ), RifTextDataTableColumn( "SAT" ),
RifTextDataTableColumn( "SAT" ), RifTextDataTableColumn( "TR",
RifTextDataTableColumn( "TR", RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "DIAM" ),
RifTextDataTableColumn( "DIAM" ), RifTextDataTableColumn( "KH",
RifTextDataTableColumn( "KH", RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "S" ),
RifTextDataTableColumn( "S" ), RifTextDataTableColumn( "Df",
RifTextDataTableColumn( "Df", RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "DIR" )};
RifTextDataTableColumn( "DIR" ) };
formatter.keyword( "COMPDAT" ); formatter.keyword( "COMPDAT" );
} }
else else
{ {
header = header = {RifTextDataTableColumn( "Well" ),
{ RifTextDataTableColumn( "Well" ), RifTextDataTableColumn( "LgrName" ),
RifTextDataTableColumn( "LgrName" ), RifTextDataTableColumn( "I" ),
RifTextDataTableColumn( "I" ), RifTextDataTableColumn( "J" ),
RifTextDataTableColumn( "J" ), RifTextDataTableColumn( "K1" ),
RifTextDataTableColumn( "K1" ), RifTextDataTableColumn( "K2" ),
RifTextDataTableColumn( "K2" ), RifTextDataTableColumn( "Status" ),
RifTextDataTableColumn( "Status" ), RifTextDataTableColumn( "SAT" ),
RifTextDataTableColumn( "SAT" ), RifTextDataTableColumn( "TR",
RifTextDataTableColumn( "TR", RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "DIAM" ),
RifTextDataTableColumn( "DIAM" ), RifTextDataTableColumn( "KH",
RifTextDataTableColumn( "KH", RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "S" ),
RifTextDataTableColumn( "S" ), RifTextDataTableColumn( "Df",
RifTextDataTableColumn( "Df", RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ),
RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), RifTextDataTableColumn( "DIR" )};
RifTextDataTableColumn( "DIR" ) };
formatter.keyword( "COMPDATL" ); formatter.keyword( "COMPDATL" );
} }
@ -1274,7 +1272,7 @@ void RicWellPathExportCompletionDataFeatureImpl::appendCompletionData(
{ {
completionData->insert( completionData->insert(
std::pair<size_t, std::vector<RigCompletionData>>( completion.completionDataGridCell().globalCellIndex(), std::pair<size_t, std::vector<RigCompletionData>>( completion.completionDataGridCell().globalCellIndex(),
std::vector<RigCompletionData>{ completion } ) ); std::vector<RigCompletionData>{completion} ) );
} }
} }
} }