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

clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-04 14:35:41 +01:00
parent 946f9e7f91
commit 7c8cf60dba
83 changed files with 495 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
View File

@@ -531,7 +531,9 @@ bool RicExportFractureCompletionsImpl::checkForStimPlanConductivity( const RimFr
///
//--------------------------------------------------------------------------------------------------
void RicExportFractureCompletionsImpl::calculateInternalFractureTransmissibilities(
const RigFractureGrid* fractureGrid, double cDarcyInCorrectUnit, RigTransmissibilityCondenser& transCondenser )
const RigFractureGrid* fractureGrid,
double cDarcyInCorrectUnit,
RigTransmissibilityCondenser& transCondenser )
{
for ( size_t i = 0; i < fractureGrid->iCellCount(); i++ )
{
@@ -732,7 +734,8 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
///
//--------------------------------------------------------------------------------------------------
void RicExportFractureCompletionsImpl::computeNonDarcyFlowParameters(
const RimFracture* fracture, std::vector<RigCompletionData>& allCompletionsForOneFracture )
const RimFracture* fracture,
std::vector<RigCompletionData>& allCompletionsForOneFracture )
{
double dFactorForFracture = fracture->nonDarcyProperties().dFactor;
double khForFracture = fracture->nonDarcyProperties().conductivity;

10
ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
View File

@@ -46,8 +46,11 @@
//==================================================================================================
struct WellBorePartForTransCalc
{
WellBorePartForTransCalc(
cvf::Vec3d lengthsInCell, double wellRadius, double skinFactor, bool isMainBore, const QString& metaData )
WellBorePartForTransCalc( cvf::Vec3d lengthsInCell,
double wellRadius,
double skinFactor,
bool isMainBore,
const QString& metaData )
: lengthsInCell( lengthsInCell )
, wellRadius( wellRadius )
, skinFactor( skinFactor )
@@ -79,7 +82,8 @@ struct WellBorePartForTransCalc
//--------------------------------------------------------------------------------------------------
std::vector<RigCompletionData>
RicFishbonesTransmissibilityCalculationFeatureImp::generateFishboneCompdatValuesUsingAdjustedCellVolume(
const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi& settings )
const RimWellPath* wellPath,
const RicExportCompletionDataSettingsUi& settings )
{
std::vector<RigCompletionData> completionData;

4
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@@ -50,7 +50,9 @@ CAF_CMD_SOURCE_INIT( RicWellPathExportCompletionDataFeature, "RicWellPathExportC
///
//--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeature::prepareExportSettingsAndExportCompletions(
const QString& dialogTitle, const std::vector<RimWellPath*>& wellPaths, const std::vector<RimSimWellInView*>& simWells )
const QString& dialogTitle,
const std::vector<RimWellPath*>& wellPaths,
const std::vector<RimSimWellInView*>& simWells )
{
RiaApplication* app = RiaApplication::instance();
RimProject* project = app->project();

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

@@ -460,8 +460,10 @@ std::vector<RigCompletionData>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RigCompletionData> RicWellPathExportCompletionDataFeatureImpl::computeDynamicCompletionsForWellPath(
RimWellPath* wellPath, RimEclipseCase* eclipseCase, size_t timeStepIndex )
std::vector<RigCompletionData>
RicWellPathExportCompletionDataFeatureImpl::computeDynamicCompletionsForWellPath( RimWellPath* wellPath,
RimEclipseCase* eclipseCase,
size_t timeStepIndex )
{
std::vector<RigCompletionData> completionsPerEclipseCell;
@@ -487,7 +489,8 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeatureImpl::compu
///
//==================================================================================================
RigCompletionData RicWellPathExportCompletionDataFeatureImpl::combineEclipseCellCompletions(
const std::vector<RigCompletionData>& completions, const RicExportCompletionDataSettingsUi& settings )
const std::vector<RigCompletionData>& completions,
const RicExportCompletionDataSettingsUi& settings )
{
CVF_ASSERT( !completions.empty() );
@@ -780,7 +783,9 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspecsToFile( RimEclips
///
//--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeatureImpl::exportWelspeclToFile(
RimEclipseCase* gridCase, QFilePtr exportFile, const std::map<QString, std::vector<RigCompletionData>>& completions )
RimEclipseCase* gridCase,
QFilePtr exportFile,
const std::map<QString, std::vector<RigCompletionData>>& completions )
{
QTextStream stream( exportFile.get() );
@@ -958,7 +963,9 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatAndWpimultTables(
///
//--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatter(
RifTextDataTableFormatter& formatter, const QString& gridName, const std::vector<RigCompletionData>& completionData )
RifTextDataTableFormatter& formatter,
const QString& gridName,
const std::vector<RigCompletionData>& completionData )
{
std::vector<RifTextDataTableColumn> header;
@@ -1094,7 +1101,9 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte
///
//--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeatureImpl::exportWpimultTableUsingFormatter(
RifTextDataTableFormatter& formatter, const QString& gridName, const std::vector<RigCompletionData>& completionData )
RifTextDataTableFormatter& formatter,
const QString& gridName,
const std::vector<RigCompletionData>& completionData )
{
std::vector<RifTextDataTableColumn> header;
@@ -1531,8 +1540,11 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateDFactor( RimEclipseC
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAsEclipseDoes(
RimEclipseCase* eclipseCase, double skinFactor, double wellRadius, size_t globalCellIndex, CellDirection direction )
double RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAsEclipseDoes( RimEclipseCase* eclipseCase,
double skinFactor,
double wellRadius,
size_t globalCellIndex,
CellDirection direction )
{
RigEclipseCaseData* eclipseCaseData = eclipseCase->eclipseCaseData();
@@ -1651,8 +1663,10 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAsEc
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<double, cvf::Vec2i> RicWellPathExportCompletionDataFeatureImpl::wellPathUpperGridIntersectionIJ(
const RimEclipseCase* gridCase, const RimWellPath* wellPath, const QString& gridName )
std::pair<double, cvf::Vec2i>
RicWellPathExportCompletionDataFeatureImpl::wellPathUpperGridIntersectionIJ( const RimEclipseCase* gridCase,
const RimWellPath* wellPath,
const QString& gridName )
{
const RigEclipseCaseData* caseData = gridCase->eclipseCaseData();
const RigMainGrid* mainGrid = caseData->mainGrid();

31
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp
View File

@@ -59,8 +59,12 @@
class SubSegmentIntersectionInfo
{
public:
SubSegmentIntersectionInfo(
size_t globCellIndex, double startTVD, double endTVD, double startMD, double endMD, cvf::Vec3d lengthsInCell );
SubSegmentIntersectionInfo( size_t globCellIndex,
double startTVD,
double endTVD,
double startMD,
double endMD,
cvf::Vec3d lengthsInCell );
static std::vector<SubSegmentIntersectionInfo>
spiltIntersectionSegmentsToMaxLength( const RigWellPath* pathGeometry,
const std::vector<WellPathCellIntersectionInfo>& intersections,
@@ -79,7 +83,8 @@ public:
///
//--------------------------------------------------------------------------------------------------
void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForAllCompletions(
const RicExportCompletionDataSettingsUi& exportSettings, const std::vector<RimWellPath*>& wellPaths )
const RicExportCompletionDataSettingsUi& exportSettings,
const std::vector<RimWellPath*>& wellPaths )
{
std::shared_ptr<QFile> unifiedExportFile;
if ( exportSettings.fileSplit() == RicExportCompletionDataSettingsUi::UNIFIED_FILE )
@@ -436,7 +441,8 @@ void RicWellPathExportMswCompletionsImpl::generateWelsegsSegments(
///
//--------------------------------------------------------------------------------------------------
void RicWellPathExportMswCompletionsImpl::generateWelsegsCompletionCommentHeader(
RifTextDataTableFormatter& formatter, RigCompletionData::CompletionType completionType )
RifTextDataTableFormatter& formatter,
RigCompletionData::CompletionType completionType )
{
if ( completionType == RigCompletionData::CT_UNDEFINED )
{
@@ -921,7 +927,9 @@ RicMswExportInfo RicWellPathExportMswCompletionsImpl::generateFracturesMswExport
///
//--------------------------------------------------------------------------------------------------
RicMswExportInfo RicWellPathExportMswCompletionsImpl::generateFracturesMswExportInfo(
RimEclipseCase* caseToApply, const RimWellPath* wellPath, const std::vector<RimWellPathFracture*>& fractures )
RimEclipseCase* caseToApply,
const RimWellPath* wellPath,
const std::vector<RimWellPathFracture*>& fractures )
{
const RigMainGrid* grid = caseToApply->eclipseCaseData()->mainGrid();
const RigActiveCellInfo* activeCellInfo = caseToApply->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL );
@@ -1611,7 +1619,10 @@ void RicWellPathExportMswCompletionsImpl::assignFractureIntersections( const Rim
///
//--------------------------------------------------------------------------------------------------
std::vector<RigCompletionData> RicWellPathExportMswCompletionsImpl::generatePerforationIntersections(
const RimWellPath* wellPath, const RimPerforationInterval* perforationInterval, int timeStep, RimEclipseCase* eclipseCase )
const RimWellPath* wellPath,
const RimPerforationInterval* perforationInterval,
int timeStep,
RimEclipseCase* eclipseCase )
{
std::vector<RigCompletionData> completionData;
const RigActiveCellInfo* activeCellInfo = eclipseCase->eclipseCaseData()->activeCellInfo( RiaDefines::MATRIX_MODEL );
@@ -1757,8 +1768,12 @@ void RicWellPathExportMswCompletionsImpl::assignBranchAndSegmentNumbers( const R
}
}
SubSegmentIntersectionInfo::SubSegmentIntersectionInfo(
size_t globCellIndex, double startTVD, double endTVD, double startMD, double endMD, cvf::Vec3d lengthsInCell )
SubSegmentIntersectionInfo::SubSegmentIntersectionInfo( size_t globCellIndex,
double startTVD,
double endTVD,
double startMD,
double endMD,
cvf::Vec3d lengthsInCell )
: globCellIndex( globCellIndex )
, startTVD( startTVD )
, endTVD( endTVD )

7
ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp
View File

@@ -109,8 +109,8 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::setupActionLook( QAction* acti
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews(
RimCase& gridCase, std::vector<RimIntersection*> intersections )
void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews( RimCase& gridCase,
std::vector<RimIntersection*> intersections )
{
for ( RimIntersection* intersection : intersections )
{
@@ -142,7 +142,8 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews(
///
//--------------------------------------------------------------------------------------------------
void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionBoxesToOtherViews(
RimCase& gridCase, std::vector<RimIntersectionBox*> intersectionBoxes )
RimCase& gridCase,
std::vector<RimIntersectionBox*> intersectionBoxes )
{
for ( RimIntersectionBox* intersectionBox : intersectionBoxes )
{

4
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
View File

@@ -79,8 +79,8 @@ void RicNewWellPathIntersectionFeature::setupActionLook( QAction* actionToSetup
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewWellPathIntersectionFeatureCmd::RicNewWellPathIntersectionFeatureCmd(
RimIntersectionCollection* intersectionCollection, RimWellPath* wellPath )
RicNewWellPathIntersectionFeatureCmd::RicNewWellPathIntersectionFeatureCmd( RimIntersectionCollection* intersectionCollection,
RimWellPath* wellPath )
: CmdExecuteCommand( nullptr )
, m_intersectionCollection( intersectionCollection )
, m_wellPath( wellPath )

6
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
View File

@@ -178,8 +178,10 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells( Rim
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<QString> RicShowContributingWellsFeatureImpl::findContributingTracerNames(
const RimFlowDiagSolution* flowDiagSolution, const RigSimWellData* simWellData, int timeStep )
std::vector<QString>
RicShowContributingWellsFeatureImpl::findContributingTracerNames( const RimFlowDiagSolution* flowDiagSolution,
const RigSimWellData* simWellData,
int timeStep )
{
std::vector<QString> tracerCellFractionValues;

7
ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.cpp
View File

@@ -120,8 +120,11 @@ int VdeCachingHashedIdFactory::lastAssignedId() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int VdeCachingHashedIdFactory::getOrCreateIdForArrOfType(
ArrayRole arrayRole, ElementType elementType, size_t elementSizeInBytes, const void* data, size_t elementCount )
int VdeCachingHashedIdFactory::getOrCreateIdForArrOfType( ArrayRole arrayRole,
ElementType elementType,
size_t elementSizeInBytes,
const void* data,
size_t elementCount )
{
Key key;
key.elementType = elementType;

7
ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h
View File

@@ -64,8 +64,11 @@ private:
};
private:
int getOrCreateIdForArrOfType(
ArrayRole arrayRole, ElementType elementType, size_t elementSizeInBytes, const void* data, size_t elementCount );
int getOrCreateIdForArrOfType( ArrayRole arrayRole,
ElementType elementType,
size_t elementSizeInBytes,
const void* data,
size_t elementCount );
private:
std::map<Key, int> m_keyToIdMap;

6
ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
View File

@@ -166,7 +166,8 @@ void RicNewContourMapViewFeature::setupActionLook( QAction* actionToSetup )
///
//--------------------------------------------------------------------------------------------------
RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMapFromExistingContourMap(
RimEclipseCase* eclipseCase, RimEclipseContourMapView* existingContourMap )
RimEclipseCase* eclipseCase,
RimEclipseContourMapView* existingContourMap )
{
RimEclipseContourMapView* contourMap = dynamic_cast<RimEclipseContourMapView*>(
existingContourMap->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
@@ -260,7 +261,8 @@ RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMap(
///
//--------------------------------------------------------------------------------------------------
RimGeoMechContourMapView* RicNewContourMapViewFeature::createGeoMechContourMapFromExistingContourMap(
RimGeoMechCase* geoMechCase, RimGeoMechContourMapView* existingContourMap )
RimGeoMechCase* geoMechCase,
RimGeoMechContourMapView* existingContourMap )
{
RimGeoMechContourMapView* contourMap = dynamic_cast<RimGeoMechContourMapView*>(
existingContourMap->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );

3
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
View File

@@ -62,7 +62,8 @@ RicSummaryCurveCalculatorEditor::~RicSummaryCurveCalculatorEditor()
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiOrdering(
const caf::PdmUiOrdering& topLevelUiOrdering, const QString& uiConfigName )
const caf::PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName )
{
if ( !m_firstRowLeftLayout || !m_firstRowRightLayout ) return;

3
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp
View File

@@ -76,7 +76,8 @@ void RicSummaryCurveCreatorSplitterUi::updateFromDefaultSources( const std::vect
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorSplitterUi::recursivelyConfigureAndUpdateTopLevelUiOrdering(
const caf::PdmUiOrdering& topLevelUiOrdering, const QString& uiConfigName )
const caf::PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName )
{
const std::vector<caf::PdmUiItem*>& topLevelUiItems = topLevelUiOrdering.uiItems();
if ( m_summaryCurveCreator->isCloseButtonPressed() )

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@@ -755,8 +755,10 @@ std::set<RifEclipseSummaryAddress>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCurve*> RicSummaryPlotFeatureImpl::addCurvesFromAddressFiltersToPlot(
const QStringList& curveFilters, RimSummaryPlot* plot, RimSummaryCase* summaryCase, bool addHistoryCurves )
std::vector<RimSummaryCurve*> RicSummaryPlotFeatureImpl::addCurvesFromAddressFiltersToPlot( const QStringList& curveFilters,
RimSummaryPlot* plot,
RimSummaryCase* summaryCase,
bool addHistoryCurves )
{
std::vector<RimSummaryCurve*> createdCurves;

7
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.h
View File

@@ -83,8 +83,11 @@ public:
{
}
RigGridCellResultAddress(
size_t gridIndex, size_t i, size_t j, size_t k, const RigEclipseResultAddress& eclipseResultAddress )
RigGridCellResultAddress( size_t gridIndex,
size_t i,
size_t j,
size_t k,
const RigEclipseResultAddress& eclipseResultAddress )
: gridIndex( gridIndex )
, i( i )
, j( j )