clang-format : Set PenaltyBreakAssignment to 130

This commit is contained in:
Magne Sjaastad
2019-11-04 15:08:09 +01:00
parent 7c8cf60dba
commit 57cab2457e
105 changed files with 596 additions and 711 deletions

View File

@@ -490,11 +490,11 @@ WellFractureIntersectionData
std::vector<double> betaFactorResultValues;
{
auto nameUnit = betaFactorParameterNameAndUnit();
betaFactorResultValues = m_stimPlanFractureDefinitionData
->fractureGridResults( nameUnit.first,
nameUnit.second,
m_activeTimeStepIndex );
auto nameUnit = betaFactorParameterNameAndUnit();
betaFactorResultValues =
m_stimPlanFractureDefinitionData->fractureGridResults( nameUnit.first,
nameUnit.second,
m_activeTimeStepIndex );
}
RiaWeightedMeanCalculator<double> widthCalc;
@@ -596,11 +596,11 @@ WellFractureIntersectionData
}
{
auto nameUnit = betaFactorParameterNameAndUnit();
std::vector<double> betaFactorResultValues = m_stimPlanFractureDefinitionData
->fractureGridResults( nameUnit.first,
nameUnit.second,
m_activeTimeStepIndex );
auto nameUnit = betaFactorParameterNameAndUnit();
std::vector<double> betaFactorResultValues =
m_stimPlanFractureDefinitionData->fractureGridResults( nameUnit.first,
nameUnit.second,
m_activeTimeStepIndex );
if ( wellCellIndex < betaFactorResultValues.size() )
{
@@ -625,8 +625,8 @@ std::pair<QString, QString> RimStimPlanFractureTemplate::widthParameterNameAndUn
{
if ( m_stimPlanFractureDefinitionData.notNull() )
{
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData
->getStimPlanPropertyNamesUnits();
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile =
m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits();
for ( const auto& nameUnit : propertyNamesUnitsOnFile )
{
@@ -652,8 +652,8 @@ std::pair<QString, QString> RimStimPlanFractureTemplate::conductivityParameterNa
{
if ( m_stimPlanFractureDefinitionData.notNull() )
{
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData
->getStimPlanPropertyNamesUnits();
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile =
m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits();
for ( const auto& nameUnit : propertyNamesUnitsOnFile )
{
@@ -674,8 +674,8 @@ std::pair<QString, QString> RimStimPlanFractureTemplate::betaFactorParameterName
{
if ( m_stimPlanFractureDefinitionData.notNull() )
{
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData
->getStimPlanPropertyNamesUnits();
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile =
m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits();
for ( const auto& nameUnit : propertyNamesUnitsOnFile )
{
@@ -848,8 +848,8 @@ std::vector<std::pair<QString, QString>> RimStimPlanFractureTemplate::uiResultNa
std::vector<std::pair<QString, QString>> tmp;
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData
->getStimPlanPropertyNamesUnits();
std::vector<std::pair<QString, QString>> propertyNamesUnitsOnFile =
m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits();
for ( const auto& nameUnitPair : propertyNamesUnitsOnFile )
{
if ( nameUnitPair.first.contains( RiaDefines::conductivityResultName(), Qt::CaseInsensitive ) )

View File

@@ -385,8 +385,8 @@ std::map<QString, const std::vector<double>*>
RigFlowDiagResultAddress resAddr( RIG_FLD_CELL_FRACTION_RESNAME,
RigFlowDiagResultAddress::PHASE_ALL,
tracerName.toStdString() );
const std::vector<double>* tracerCellFractions = m_flowDiagSolution->flowDiagResults()
->resultValues( resAddr, m_timeStep );
const std::vector<double>* tracerCellFractions =
m_flowDiagSolution->flowDiagResults()->resultValues( resAddr, m_timeStep );
if ( tracerCellFractions ) tracerCellFractionValues[tracerName] = tracerCellFractions;
}
}

View File

@@ -473,8 +473,8 @@ public:
m_pipeBranchCLCoords.push_back( intersections[wpExIdx].endPoint );
m_pipeBranchMeasuredDepths.push_back( intersections[wpExIdx].endMD );
const RigWellResultPoint& resPoint = resFrame.m_wellResultBranches[it->second.first]
.m_branchResultPoints[it->second.second];
const RigWellResultPoint& resPoint =
resFrame.m_wellResultBranches[it->second.first].m_branchResultPoints[it->second.second];
m_pipeBranchWellResultPoints.push_back( resPoint );
if ( wpExIdx < intersections.size() - 1 )
@@ -570,8 +570,8 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
QString curveUnitText = RimWellPlotTools::flowUnitText( RimWellLogFile::WELL_FLOW_COND_RESERVOIR,
unitSet );
const std::vector<double> accFlow = wfTotalAccumulator
.accumulatedTracerFlowPrPseudoLength( RIG_FLOW_TOTAL_NAME, 0 );
const std::vector<double> accFlow =
wfTotalAccumulator.accumulatedTracerFlowPrPseudoLength( RIG_FLOW_TOTAL_NAME, 0 );
addStackedCurve( curveName + ", " + RIG_FLOW_TOTAL_NAME + " " + curveUnitText,
depthValues,
accFlow,
@@ -615,8 +615,8 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
unitSet,
flowPhase );
const std::vector<double>& accFlow = wfPhaseAccumulator
.accumulatedTracerFlowPrPseudoLength( tracerName, 0 );
const std::vector<double>& accFlow =
wfPhaseAccumulator.accumulatedTracerFlowPrPseudoLength( tracerName, 0 );
addStackedCurve( curveName + ", " + tracerName + " " + curveUnitText,
depthValues,
accFlow,
@@ -860,7 +860,8 @@ QList<caf::PdmOptionItemInfo> RimWellPltPlot::calculateValueOptions( const caf::
}
else if ( fieldNeedingOptions == &m_selectedTimeSteps )
{
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse = RifEclipseRftAddress::pltPlotChannelTypes();
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse =
RifEclipseRftAddress::pltPlotChannelTypes();
RimWellPlotTools::calculateValueOptionsForTimeSteps( RimWellPlotTools::simWellName( m_wellPathName ),
selectedSourcesExpanded(),

View File

@@ -271,7 +271,8 @@ void RimWellRftPlot::applyInitialSelections()
m_selectedSources = sourcesToSelect;
{
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse = RifEclipseRftAddress::rftPlotChannelTypes();
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse =
RifEclipseRftAddress::rftPlotChannelTypes();
auto relevantTimeSteps = RimWellPlotTools::calculateRelevantTimeStepsFromCases( m_wellPathNameOrSimWellName,
m_selectedSources,
@@ -508,10 +509,10 @@ void RimWellRftPlot::updateCurvesInPlot( const std::set<RiaRftPltCurveDefinition
}
else if ( m_showStatisticsCurves && curveDefToAdd.address().sourceType() == RifDataSourceForRftPlt::ENSEMBLE_RFT )
{
RimSummaryCaseCollection* ensemble = curveDefToAdd.address().ensemble();
std::set<RifEclipseRftAddress> rftAddresses = ensemble->rftStatisticsReader()
->eclipseRftAddresses( m_wellPathNameOrSimWellName,
curveDefToAdd.timeStep() );
RimSummaryCaseCollection* ensemble = curveDefToAdd.address().ensemble();
std::set<RifEclipseRftAddress> rftAddresses =
ensemble->rftStatisticsReader()->eclipseRftAddresses( m_wellPathNameOrSimWellName,
curveDefToAdd.timeStep() );
for ( auto rftAddress : rftAddresses )
{
if ( rftAddress.wellLogChannel() != RifEclipseRftAddress::TVD )
@@ -799,7 +800,8 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptions( const caf::
}
else if ( fieldNeedingOptions == &m_selectedTimeSteps )
{
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse = RifEclipseRftAddress::rftPlotChannelTypes();
std::set<RifEclipseRftAddress::RftWellLogChannelType> channelTypesToUse =
RifEclipseRftAddress::rftPlotChannelTypes();
RimWellPlotTools::calculateValueOptionsForTimeSteps( m_wellPathNameOrSimWellName,
selectedSourcesExpanded(),

View File

@@ -566,8 +566,8 @@ QString Rim3dOverlayInfoConfig::caseInfoText( RimEclipseView* eclipseView )
QString weightingParameterString;
if ( contourMap->contourMapProjection()->weightingParameter() != "None" )
{
weightingParameterString += QString( " (Weight: %1)" )
.arg( contourMap->contourMapProjection()->weightingParameter() );
weightingParameterString +=
QString( " (Weight: %1)" ).arg( contourMap->contourMapProjection()->weightingParameter() );
}
infoText += QString( "<p><b>-- Contour Map: %1 --</b><p> "

View File

@@ -1449,11 +1449,8 @@ double RimContourMapProjection::interpolateValue( const cvf::Vec2d& gridPos2d )
x[2] = cvf::Vec3d( cellCenter + cvf::Vec2d( m_sampleSpacing * 0.5, m_sampleSpacing * 0.5 ), 0.0 );
x[3] = cvf::Vec3d( cellCenter + cvf::Vec2d( -m_sampleSpacing * 0.5, m_sampleSpacing * 0.5 ), 0.0 );
cvf::Vec4d baryCentricCoords = cvf::GeometryTools::barycentricCoords( x[0],
x[1],
x[2],
x[3],
cvf::Vec3d( gridPos2d, 0.0 ) );
cvf::Vec4d baryCentricCoords =
cvf::GeometryTools::barycentricCoords( x[0], x[1], x[2], x[3], cvf::Vec3d( gridPos2d, 0.0 ) );
std::array<cvf::Vec2ui, 4> v;
v[0] = cellContainingPoint;

View File

@@ -269,9 +269,8 @@ std::vector<double> RimEclipseContourMapProjection::calculateColumnResult( Resul
resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PORO" ), 0 );
const std::vector<double>& ntgResults =
resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ), 0 );
const std::vector<double>& dzResults = resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE,
"DZ" ),
0 );
const std::vector<double>& dzResults =
resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "DZ" ), 0 );
CVF_ASSERT( poroResults.size() == ntgResults.size() && ntgResults.size() == dzResults.size() );
@@ -434,8 +433,8 @@ double RimEclipseContourMapProjection::calculateRayLengthInCell( size_t
if ( RigHexIntersectionTools::lineHexCellIntersection( highestPoint, lowestPoint, hexCorners.data(), 0, &intersections ) )
{
double lengthInCell = ( intersections.back().m_intersectionPoint - intersections.front().m_intersectionPoint )
.length();
double lengthInCell =
( intersections.back().m_intersectionPoint - intersections.front().m_intersectionPoint ).length();
return lengthInCell;
}
return 0.0;

View File

@@ -485,11 +485,8 @@ void RimEclipseResultCase::updateFilePathsFromProjectPath( const QString& newPro
const std::vector<QString>& orgFilesContainingFaults = filesContainingFaults();
for ( auto faultFileName : orgFilesContainingFaults )
{
QString relocatedFaultFile = RimTools::relocateFile( faultFileName,
newProjectPath,
oldProjectPath,
&foundFile,
&searchedPaths );
QString relocatedFaultFile =
RimTools::relocateFile( faultFileName, newProjectPath, oldProjectPath, &foundFile, &searchedPaths );
relocatedFaultFiles.push_back( relocatedFaultFile );
}

View File

@@ -1967,10 +1967,10 @@ void RimEclipseResultDefinition::syncInjectorToProducerSelection()
{
for ( const QString& producer : producers )
{
std::pair<double, double> commFluxes = flowSol->flowDiagResults()
->injectorProducerPairFluxes( selectedInjector.toStdString(),
producer.toStdString(),
timeStep );
std::pair<double, double> commFluxes =
flowSol->flowDiagResults()->injectorProducerPairFluxes( selectedInjector.toStdString(),
producer.toStdString(),
timeStep );
if ( std::abs( commFluxes.first ) > epsilon || std::abs( commFluxes.second ) > epsilon )
{
newProducerSelection.insert( producer );
@@ -2013,10 +2013,10 @@ void RimEclipseResultDefinition::syncProducerToInjectorSelection()
{
for ( const QString& injector : injectors )
{
std::pair<double, double> commFluxes = flowSol->flowDiagResults()
->injectorProducerPairFluxes( injector.toStdString(),
selectedProducer.toStdString(),
timeStep );
std::pair<double, double> commFluxes =
flowSol->flowDiagResults()->injectorProducerPairFluxes( injector.toStdString(),
selectedProducer.toStdString(),
timeStep );
if ( std::abs( commFluxes.first ) > epsilon || std::abs( commFluxes.second ) > epsilon )
{
newInjectorSelection.insert( injector );

View File

@@ -547,8 +547,8 @@ void RimEclipseStatisticsCase::fieldChangedByUi( const caf::PdmFieldHandle* chan
// Propagate well info to statistics case
if ( sourceResultCase->eclipseCaseData() )
{
const cvf::Collection<RigSimWellData>& sourceCaseSimWellData = sourceResultCase->eclipseCaseData()
->wellResults();
const cvf::Collection<RigSimWellData>& sourceCaseSimWellData =
sourceResultCase->eclipseCaseData()->wellResults();
setWellResultsAndUpdateViews( sourceCaseSimWellData );
}
}

View File

@@ -285,9 +285,9 @@ void RimFaultInViewCollection::syncronizeFaults()
{
size_t gridLocalCellIndex;
const RigGridBase* hostGrid = mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( nncConnections[connIndex]
.m_c1GlobIdx,
&gridLocalCellIndex );
const RigGridBase* hostGrid =
mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( nncConnections[connIndex].m_c1GlobIdx,
&gridLocalCellIndex );
size_t i, j, k;
if ( hostGrid->ijkFromCellIndex( gridLocalCellIndex, &i, &j, &k ) )
@@ -308,9 +308,9 @@ void RimFaultInViewCollection::syncronizeFaults()
{
size_t gridLocalCellIndex;
const RigGridBase* hostGrid = mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( nncConnections[connIndex]
.m_c2GlobIdx,
&gridLocalCellIndex );
const RigGridBase* hostGrid =
mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( nncConnections[connIndex].m_c2GlobIdx,
&gridLocalCellIndex );
size_t i, j, k;
if ( hostGrid->ijkFromCellIndex( gridLocalCellIndex, &i, &j, &k ) )

View File

@@ -171,11 +171,8 @@ void RimFormationNames::readFormationNamesFile( QString* errorMessage )
//--------------------------------------------------------------------------------------------------
void RimFormationNames::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{
m_formationNamesFileName = RimTools::relocateFile( m_formationNamesFileName(),
newProjectPath,
oldProjectPath,
nullptr,
nullptr );
m_formationNamesFileName =
RimTools::relocateFile( m_formationNamesFileName(), newProjectPath, oldProjectPath, nullptr, nullptr );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -474,8 +474,8 @@ double RimGeoMechContourMapProjection::calculateRayLengthInCell( size_t
if ( RigHexIntersectionTools::lineHexCellIntersection( highestPoint, lowestPoint, hexCorners.data(), 0, &intersections ) )
{
double lengthInCell = ( intersections.back().m_intersectionPoint - intersections.front().m_intersectionPoint )
.length();
double lengthInCell =
( intersections.back().m_intersectionPoint - intersections.front().m_intersectionPoint ).length();
return lengthInCell;
}
return 0.0;

View File

@@ -235,8 +235,8 @@ QList<caf::PdmOptionItemInfo>
{
if ( m_geomCase->geoMechData() )
{
size_t kCount = m_geomCase->geoMechData()->femParts()->part( 0 )->getOrCreateStructGrid()->gridPointCountK() -
1;
size_t kCount =
m_geomCase->geoMechData()->femParts()->part( 0 )->getOrCreateStructGrid()->gridPointCountK() - 1;
for ( size_t layerIdx = 0; layerIdx < kCount; ++layerIdx )
{
options.push_back( caf::PdmOptionItemInfo( QString::number( layerIdx + 1 ), (int)layerIdx ) );

View File

@@ -413,11 +413,8 @@ void RimProject::setProjectFileNameAndUpdateDependencies( const QString& project
bool foundFile = false;
std::vector<QString> searchedPaths;
QString newFilePath = RimTools::relocateFile( filePath->path(),
newProjectPath,
oldProjectPath,
&foundFile,
&searchedPaths );
QString newFilePath =
RimTools::relocateFile( filePath->path(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths );
filePath->setPath( newFilePath );
}

View File

@@ -198,7 +198,8 @@ void RimSummaryCalculationVariable::readDataFromApplicationStore( RiuSummaryCurv
sumAddress = lastUsedAddress;
}
QString lastUsedSummaryCaseString = RiaApplication::instance()->cacheDataObject( "CalculatorSummaryCase" ).toString();
QString lastUsedSummaryCaseString =
RiaApplication::instance()->cacheDataObject( "CalculatorSummaryCase" ).toString();
auto* lastUsedSummaryCase = dynamic_cast<RimSummaryCase*>(
caf::PdmReferenceHelper::objectFromReference( RiaApplication::instance()->project(),

View File

@@ -245,11 +245,8 @@ void RimWellLogFile::updateFilePathsFromProjectPath( const QString& newProjectPa
bool foundFile = false;
std::vector<QString> searchedPaths;
QString fileNameCandidate = RimTools::relocateFile( m_fileName(),
newProjectPath,
oldProjectPath,
&foundFile,
&searchedPaths );
QString fileNameCandidate =
RimTools::relocateFile( m_fileName(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths );
if ( foundFile )
{
m_fileName = fileNameCandidate;

View File

@@ -74,11 +74,8 @@ QString RimFileSummaryCase::caseName() const
//--------------------------------------------------------------------------------------------------
void RimFileSummaryCase::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{
m_summaryHeaderFilename = RimTools::relocateFile( m_summaryHeaderFilename(),
newProjectPath,
oldProjectPath,
nullptr,
nullptr );
m_summaryHeaderFilename =
RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -68,11 +68,8 @@ QString RimObservedSummaryData::caseName() const
//--------------------------------------------------------------------------------------------------
void RimObservedSummaryData::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{
m_summaryHeaderFilename = RimTools::relocateFile( m_summaryHeaderFilename(),
newProjectPath,
oldProjectPath,
nullptr,
nullptr );
m_summaryHeaderFilename =
RimTools::relocateFile( m_summaryHeaderFilename(), newProjectPath, oldProjectPath, nullptr, nullptr );
}
//--------------------------------------------------------------------------------------------------

View File

@@ -780,8 +780,8 @@ QString RimSummaryCurve::curveExportDescription( const RifEclipseSummaryAddress&
auto addressUiText = addr.uiText();
if ( addr.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS )
{
addressUiText = RiaStatisticsTools::replacePercentileByPValueText( QString::fromStdString( addressUiText ) )
.toStdString();
addressUiText =
RiaStatisticsTools::replacePercentileByPValueText( QString::fromStdString( addressUiText ) ).toStdString();
}
if ( group && group->isEnsemble() )

View File

@@ -219,8 +219,8 @@ QString RimSummaryPlotYAxisFormatter::autoAxisTitle() const
{
if ( m_axisProperties->showDescription() )
{
quantityNameForDisplay = RiuSummaryQuantityNameInfoProvider::instance()
->longNameFromQuantityName( quantityName, true );
quantityNameForDisplay =
RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( quantityName, true );
}
if ( m_axisProperties->showAcronym() )

View File

@@ -692,8 +692,8 @@ void RimSummaryTimeAxisProperties::defineEditorAttribute( const caf::PdmFieldHan
auto timeAttrib = dynamic_cast<caf::PdmUiTimeEditorAttribute*>( attribute );
if ( timeAttrib )
{
timeAttrib->timeFormat = RiaQDateTimeTools::timeFormatString( m_timeFormat(),
RiaQDateTimeTools::TIME_FORMAT_HOUR_MINUTE_SECOND );
timeAttrib->timeFormat =
RiaQDateTimeTools::timeFormatString( m_timeFormat(), RiaQDateTimeTools::TIME_FORMAT_HOUR_MINUTE_SECOND );
}
}
}