diff --git a/ApplicationCode/.clang-format b/ApplicationCode/.clang-format index 4822275e6a..9a57fe3079 100644 --- a/ApplicationCode/.clang-format +++ b/ApplicationCode/.clang-format @@ -8,7 +8,7 @@ AlignConsecutiveDeclarations: true AlignEscapedNewlinesLeft: true AlignOperands: true AlignTrailingComments: false -AllowAllParametersOfDeclarationOnNextLine: true +AllowAllParametersOfDeclarationOnNextLine: false AllowShortBlocksOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false AllowShortIfStatementsOnASingleLine: true @@ -52,7 +52,7 @@ MacroBlockBegin: '' MacroBlockEnd: '' MaxEmptyLinesToKeep: 1 NamespaceIndentation: Inner -PenaltyBreakAssignment: 200 +PenaltyBreakAssignment: 130 PenaltyBreakBeforeFirstCallParameter: 100000 PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 3747319363..d32abca2ef 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -1196,7 +1196,8 @@ void RiaApplication::applyPreferences() //-------------------------------------------------------------------------------------------------- QString RiaApplication::commandLineParameterHelp() { - QString helpText = QString( "\n%1 v. %2\n" ).arg( RI_APPLICATION_NAME ).arg( RiaApplication::getVersionStringApp( false ) ); + QString helpText = + QString( "\n%1 v. %2\n" ).arg( RI_APPLICATION_NAME ).arg( RiaApplication::getVersionStringApp( false ) ); helpText += "Copyright Equinor ASA, Ceetron Solution AS, Ceetron AS\n\n"; helpText += m_commandLineHelpText; diff --git a/ApplicationCode/Application/RiaGuiApplication.cpp b/ApplicationCode/Application/RiaGuiApplication.cpp index 9526f27432..b2c00d2f93 100644 --- a/ApplicationCode/Application/RiaGuiApplication.cpp +++ b/ApplicationCode/Application/RiaGuiApplication.cpp @@ -1592,8 +1592,8 @@ void RiaGuiApplication::applyGuiPreferences( const RiaPreferences* oldPreference if ( gridView && gridView->annotationCollection() ) { RiaFontCache::FontSize oldFontSize = oldPreferences->defaultAnnotationFontSize(); - existingObjectsWithCustomFonts = gridView->annotationCollection() - ->hasTextAnnotationsWithCustomFontSize( oldFontSize ); + existingObjectsWithCustomFonts = + gridView->annotationCollection()->hasTextAnnotationsWithCustomFontSize( oldFontSize ); } RimEclipseView* eclipseView = dynamic_cast( rim3dView ); if ( eclipseView ) diff --git a/ApplicationCode/Application/RiaMemoryCleanup.cpp b/ApplicationCode/Application/RiaMemoryCleanup.cpp index 99ebf081c2..fdf133c99f 100644 --- a/ApplicationCode/Application/RiaMemoryCleanup.cpp +++ b/ApplicationCode/Application/RiaMemoryCleanup.cpp @@ -280,7 +280,8 @@ QList RiaMemoryCleanup::calculateValueOptions( const caf const RigFemResultAddress& result = m_geomResultAddresses[i]; bool inUse = resultsInUse.count( result ); QString posText = caf::AppEnum::uiTextFromIndex( result.resultPosType ); - QString resultsText = QString( "%1, %2" ).arg( posText ).arg( QString::fromStdString( result.fieldName ) ); + QString resultsText = + QString( "%1, %2" ).arg( posText ).arg( QString::fromStdString( result.fieldName ) ); if ( !result.componentName.empty() ) { resultsText += QString( ", %1" ).arg( QString::fromStdString( result.componentName ) ); diff --git a/ApplicationCode/Application/Tools/RiaProjectFileVersionTools.cpp b/ApplicationCode/Application/Tools/RiaProjectFileVersionTools.cpp index bf8e6b0537..2e2286c156 100644 --- a/ApplicationCode/Application/Tools/RiaProjectFileVersionTools.cpp +++ b/ApplicationCode/Application/Tools/RiaProjectFileVersionTools.cpp @@ -61,8 +61,11 @@ bool RiaProjectFileVersionTools::isCandidateVersionNewerThanOther( const QString //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaProjectFileVersionTools::decodeVersionString( - const QString& projectFileVersion, int* majorVersion, int* minorVersion, int* patch, int* developmentId ) +void RiaProjectFileVersionTools::decodeVersionString( const QString& projectFileVersion, + int* majorVersion, + int* minorVersion, + int* patch, + int* developmentId ) { if ( projectFileVersion.isEmpty() ) return; diff --git a/ApplicationCode/Application/Tools/RiaProjectFileVersionTools.h b/ApplicationCode/Application/Tools/RiaProjectFileVersionTools.h index f3b2a37625..e766004cfc 100644 --- a/ApplicationCode/Application/Tools/RiaProjectFileVersionTools.h +++ b/ApplicationCode/Application/Tools/RiaProjectFileVersionTools.h @@ -30,8 +30,11 @@ public: const QString& otherProjectFileVersion ); // Public to be able to unit test function, not intended to be used - static void decodeVersionString( - const QString& projectFileVersion, int* majorVersion, int* minorVersion, int* patch, int* developmentId ); + static void decodeVersionString( const QString& projectFileVersion, + int* majorVersion, + int* minorVersion, + int* patch, + int* developmentId ); private: static bool isCandidateNewerThanOther( int candidateMajorVersion, diff --git a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp index 22813325ae..96f260a301 100644 --- a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp +++ b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp @@ -152,11 +152,8 @@ void RiaRegressionTestRunner::runRegressionTest() } } - QString htmlReportFileName = generateHtmlReport( folderList, - baseFolderName, - generatedFolderName, - diffFolderName, - testDir ); + QString htmlReportFileName = + generateHtmlReport( folderList, baseFolderName, generatedFolderName, diffFolderName, testDir ); if ( regressionTestConfig.openReportInBrowser() ) { diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp b/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp index 373cf1eafe..fe7d4bc981 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp @@ -28,8 +28,14 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaSCurveCalculator::RiaSCurveCalculator( - cvf::Vec3d p1, double azi1, double inc1, double rad1, cvf::Vec3d p2, double azi2, double inc2, double rad2 ) +RiaSCurveCalculator::RiaSCurveCalculator( cvf::Vec3d p1, + double azi1, + double inc1, + double rad1, + cvf::Vec3d p2, + double azi2, + double inc2, + double rad2 ) : m_isCalculationOK( false ) , m_p1( p1 ) , m_p2( p2 ) @@ -145,8 +151,14 @@ RiaSCurveCalculator::RiaSCurveCalculator( cvf::Vec3d p1, cvf::Vec3d q1, cvf::Vec //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaSCurveCalculator RiaSCurveCalculator::fromTangentsAndLength( - cvf::Vec3d p1, double azi1, double inc1, double lengthToQ1, cvf::Vec3d p2, double azi2, double inc2, double lengthToQ2 ) +RiaSCurveCalculator RiaSCurveCalculator::fromTangentsAndLength( cvf::Vec3d p1, + double azi1, + double inc1, + double lengthToQ1, + cvf::Vec3d p2, + double azi2, + double inc2, + double lengthToQ2 ) { cvf::Vec3d t1( RiaOffshoreSphericalCoords::unitVectorFromAziInc( azi1, inc1 ) ); cvf::Vec3d t2( RiaOffshoreSphericalCoords::unitVectorFromAziInc( azi2, inc2 ) ); @@ -209,8 +221,14 @@ bool isZeroCrossing( double newError, double oldError, double maxError ) /// R1(q1, q2), R2(q1, q2) /// //-------------------------------------------------------------------------------------------------- -void RiaSCurveCalculator::initializeByFinding_q1q2( - cvf::Vec3d p1, double azi1, double inc1, double r1, cvf::Vec3d p2, double azi2, double inc2, double r2 ) +void RiaSCurveCalculator::initializeByFinding_q1q2( cvf::Vec3d p1, + double azi1, + double inc1, + double r1, + cvf::Vec3d p2, + double azi2, + double inc2, + double r2 ) { // Algorithm options diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h b/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h index 4fb992bbf5..56bd2a7ff7 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h @@ -23,8 +23,7 @@ class RiaSCurveCalculator { public: - RiaSCurveCalculator( - cvf::Vec3d p1, double azi1, double inc1, double r1, cvf::Vec3d p2, double azi2, double inc2, double r2 ); + RiaSCurveCalculator( cvf::Vec3d p1, double azi1, double inc1, double r1, cvf::Vec3d p2, double azi2, double inc2, double r2 ); RiaSCurveCalculator( cvf::Vec3d p1, cvf::Vec3d q1, cvf::Vec3d p2, cvf::Vec3d q2 ); @@ -105,8 +104,14 @@ public: double lengthToQ2 ); private: - void initializeByFinding_q1q2( - cvf::Vec3d p1, double azi1, double inc1, double r1, cvf::Vec3d p2, double azi2, double inc2, double r2 ); + void initializeByFinding_q1q2( cvf::Vec3d p1, + double azi1, + double inc1, + double r1, + cvf::Vec3d p2, + double azi2, + double inc2, + double r2 ); bool m_isCalculationOK; diff --git a/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.cpp b/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.cpp index 8143cd5c05..edd1c6d311 100644 --- a/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.cpp +++ b/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.cpp @@ -145,8 +145,8 @@ void RicfFieldReader::readFieldData( bool& fieldValue, { QString formatString( "Boolean argument \"%1\" for the command \"%2\" does not evaluate to either true or false" ); - QString errorMessage = formatString.arg( errorMessageContainer->currentArgument ) - .arg( errorMessageContainer->currentCommand ); + QString errorMessage = + formatString.arg( errorMessageContainer->currentArgument ).arg( errorMessageContainer->currentCommand ); errorMessageContainer->addError( errorMessage ); } fieldValue = evaluatesToTrue; diff --git a/ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp b/ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp index 0cc252f4f9..9b4aab2908 100644 --- a/ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp +++ b/ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp @@ -95,8 +95,8 @@ RicfCommandResponse RicfComputeCaseGroupStatistics::execute() if ( !foundCase ) { - QString warning = QString( "computeCaseGroupStatistics: Could not find statistics case with ID %1." ) - .arg( caseId ); + QString warning = + QString( "computeCaseGroupStatistics: Could not find statistics case with ID %1." ).arg( caseId ); RiaLogging::warning( warning ); response.updateStatus( RicfCommandResponse::COMMAND_WARNING, warning ); diff --git a/ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp b/ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp index 4b23de3813..979cb89e34 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp @@ -86,7 +86,8 @@ RicfCommandResponse RicfExportFlowCharacteristics::execute() exportFileName = exportFolder + "/" + fi.fileName(); } - RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); + RimFlowPlotCollection* flowPlotColl = + RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); if ( flowPlotColl ) { RimFlowCharacteristicsPlot* plot = flowPlotColl->defaultFlowCharacteristicsPlot(); diff --git a/ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp b/ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp index 7ae22a0791..a1f41976f7 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp @@ -176,8 +176,8 @@ RicfCommandResponse RicfExportWellPathCompletions::execute() } else { - QString warning = QString( "exportWellPathCompletions: Could not find well path with name %1" ) - .arg( wellPathName ); + QString warning = + QString( "exportWellPathCompletions: Could not find well path with name %1" ).arg( wellPathName ); RiaLogging::warning( warning ); response.updateStatus( RicfCommandResponse::COMMAND_WARNING, warning ); } diff --git a/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp index fdcd52aaf7..4d42b39430 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicExportFishbonesLateralsFeature.cpp @@ -76,8 +76,8 @@ void RicExportFishbonesLateralsFeature::onActionTriggered( bool isChecked ) { for ( size_t lateralIndex : sub.lateralIndices ) { - std::vector> coordsAndMD = fishbone->coordsAndMDForLateral( sub.subIndex, - lateralIndex ); + std::vector> coordsAndMD = + fishbone->coordsAndMDForLateral( sub.subIndex, lateralIndex ); std::vector lateralCoords; std::vector lateralMDs; diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp index d097c6b385..5e716c949f 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsFeature.cpp @@ -115,8 +115,8 @@ RimFishbonesCollection* RicNewFishbonesSubsFeature::selectedFishbonesCollection( { return wellPaths[0]->fishbonesCollection(); } - RimWellPathCompletions* completions = caf::SelectionManager::instance() - ->selectedItemOfType(); + RimWellPathCompletions* completions = + caf::SelectionManager::instance()->selectedItemOfType(); if ( completions ) { return completions->fishbonesCollection(); diff --git a/ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalFeature.cpp index 8313aca6d7..0ee216a836 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalFeature.cpp @@ -99,8 +99,8 @@ RimPerforationCollection* RicNewPerforationIntervalFeature::selectedPerforationC RimWellPath* wellPath = dynamic_cast( objHandle ); if ( wellPath ) return wellPath->perforationIntervalCollection(); - RimWellPathCompletions* completions = caf::SelectionManager::instance() - ->selectedItemOfType(); + RimWellPathCompletions* completions = + caf::SelectionManager::instance()->selectedItemOfType(); if ( completions ) return completions->perforationCollection(); } return nullptr; diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp index 3f42290b2a..7ba914e958 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp @@ -257,7 +257,8 @@ QList wellList = candidateWellList; } - QString wellStringWithPressure = QString( "%1 (%2)" ).arg( it->second[w].first ).arg( it->second[w].second ); + QString wellStringWithPressure = + QString( "%1 (%2)" ).arg( it->second[w].first ).arg( it->second[w].second ); QStringList candidateWellPressureList = wellPressureList; candidateWellPressureList << wellStringWithPressure; if ( startStringFormat.arg( candidateWellPressureList.join( ", " ) ).length() < maxStringLength ) diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsWellSegmentsFeature.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsWellSegmentsFeature.cpp index 18f96b8f59..e319c0cec5 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsWellSegmentsFeature.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsWellSegmentsFeature.cpp @@ -63,12 +63,12 @@ void RicExportCompletionsWellSegmentsFeature::onActionTriggered( bool isChecked RimWellPath* wellPath = caf::SelectionManager::instance()->selectedItemAncestorOfType(); CVF_ASSERT( wellPath ); - RimFishbonesCollection* fishbonesCollection = caf::SelectionManager::instance() - ->selectedItemAncestorOfType(); - RimWellPathFractureCollection* fractureCollection = caf::SelectionManager::instance() - ->selectedItemAncestorOfType(); - RimPerforationCollection* perforationCollection = caf::SelectionManager::instance() - ->selectedItemAncestorOfType(); + RimFishbonesCollection* fishbonesCollection = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); + RimWellPathFractureCollection* fractureCollection = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); + RimPerforationCollection* perforationCollection = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); CVF_ASSERT( fishbonesCollection || fractureCollection || perforationCollection ); diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp index 1f184486ee..0113ffb71b 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp @@ -368,11 +368,8 @@ std::vector RicExportFractureCompletionsImpl::generateCompdat } } - std::vector allCompletionsForOneFracture = generateCompdatValuesForFracture( matrixToWellTrans, - wellNameForExport, - caseToApply, - fracture, - fracTemplate ); + std::vector allCompletionsForOneFracture = + generateCompdatValuesForFracture( matrixToWellTrans, wellNameForExport, caseToApply, fracture, fracTemplate ); if ( fractureDataReportItems ) { @@ -531,7 +528,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 +731,8 @@ std::vector RicExportFractureCompletionsImpl::generateCompdat /// //-------------------------------------------------------------------------------------------------- void RicExportFractureCompletionsImpl::computeNonDarcyFlowParameters( - const RimFracture* fracture, std::vector& allCompletionsForOneFracture ) + const RimFracture* fracture, + std::vector& allCompletionsForOneFracture ) { double dFactorForFracture = fracture->nonDarcyProperties().dFactor; double khForFracture = fracture->nonDarcyProperties().conductivity; diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp index a79fd61b8f..6194bfa901 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp @@ -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 RicFishbonesTransmissibilityCalculationFeatureImp::generateFishboneCompdatValuesUsingAdjustedCellVolume( - const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi& settings ) + const RimWellPath* wellPath, + const RicExportCompletionDataSettingsUi& settings ) { std::vector completionData; @@ -211,10 +215,10 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneLateralsWell { for ( std::shared_ptr intersection : segment->intersections() ) { - double diameter = location->holeDiameter(); - QString completionMetaData = ( location->label() + QString( ": Sub: %1 Lateral: %2" ) - .arg( location->subIndex() ) - .arg( completion->index() ) ); + double diameter = location->holeDiameter(); + QString completionMetaData = + ( location->label() + + QString( ": Sub: %1 Lateral: %2" ).arg( location->subIndex() ).arg( completion->index() ) ); WellBorePartForTransCalc wellBorePart = WellBorePartForTransCalc( intersection->lengthsInCell(), diameter / 2.0, diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp index 167c9c7a4e..6e2e319151 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp @@ -50,7 +50,9 @@ CAF_CMD_SOURCE_INIT( RicWellPathExportCompletionDataFeature, "RicWellPathExportC /// //-------------------------------------------------------------------------------------------------- void RicWellPathExportCompletionDataFeature::prepareExportSettingsAndExportCompletions( - const QString& dialogTitle, const std::vector& wellPaths, const std::vector& simWells ) + const QString& dialogTitle, + const std::vector& wellPaths, + const std::vector& simWells ) { RiaApplication* app = RiaApplication::instance(); RimProject* project = app->project(); @@ -210,8 +212,8 @@ std::vector RicWellPathExportCompletionDataFeature::selectedWellPa if ( wellPaths.empty() ) { - RimWellPathCompletions* completions = caf::SelectionManager::instance() - ->selectedItemAncestorOfType(); + RimWellPathCompletions* completions = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); if ( completions ) { RimWellPath* wellPath = nullptr; diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp index 6d3f5ba6f0..7ee44b1482 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp @@ -460,8 +460,10 @@ std::vector //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RicWellPathExportCompletionDataFeatureImpl::computeDynamicCompletionsForWellPath( - RimWellPath* wellPath, RimEclipseCase* eclipseCase, size_t timeStepIndex ) +std::vector + RicWellPathExportCompletionDataFeatureImpl::computeDynamicCompletionsForWellPath( RimWellPath* wellPath, + RimEclipseCase* eclipseCase, + size_t timeStepIndex ) { std::vector completionsPerEclipseCell; @@ -474,10 +476,10 @@ std::vector RicWellPathExportCompletionDataFeatureImpl::compu exportSettings.includePerforations = true; exportSettings.includeFractures = true; - completionsPerEclipseCell = generatePerforationsCompdatValues( wellPath, - wellPath->perforationIntervalCollection() - ->perforations(), - exportSettings ); + completionsPerEclipseCell = + generatePerforationsCompdatValues( wellPath, + wellPath->perforationIntervalCollection()->perforations(), + exportSettings ); } return completionsPerEclipseCell; @@ -487,7 +489,8 @@ std::vector RicWellPathExportCompletionDataFeatureImpl::compu /// //================================================================================================== RigCompletionData RicWellPathExportCompletionDataFeatureImpl::combineEclipseCellCompletions( - const std::vector& completions, const RicExportCompletionDataSettingsUi& settings ) + const std::vector& 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>& completions ) + RimEclipseCase* gridCase, + QFilePtr exportFile, + const std::map>& completions ) { QTextStream stream( exportFile.get() ); @@ -958,7 +963,9 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatAndWpimultTables( /// //-------------------------------------------------------------------------------------------------- void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatter( - RifTextDataTableFormatter& formatter, const QString& gridName, const std::vector& completionData ) + RifTextDataTableFormatter& formatter, + const QString& gridName, + const std::vector& completionData ) { std::vector header; @@ -1094,7 +1101,9 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte /// //-------------------------------------------------------------------------------------------------- void RicWellPathExportCompletionDataFeatureImpl::exportWpimultTableUsingFormatter( - RifTextDataTableFormatter& formatter, const QString& gridName, const std::vector& completionData ) + RifTextDataTableFormatter& formatter, + const QString& gridName, + const std::vector& completionData ) { std::vector header; @@ -1192,8 +1201,8 @@ std::vector RicWellPathExportCompletionDataFeatureImpl::gener cell.globCellIndex, cell.intersectionLengthsInCellCS ); - const RimNonDarcyPerforationParameters* nonDarcyParameters = wellPath->perforationIntervalCollection() - ->nonDarcyParameters(); + const RimNonDarcyPerforationParameters* nonDarcyParameters = + wellPath->perforationIntervalCollection()->nonDarcyParameters(); double transmissibility = 0.0; double kh = RigCompletionData::defaultValue(); @@ -1429,7 +1438,8 @@ TransmissibilityData const double totalKh = RigTransmissibilityEquations::totalKh( permx, permy, permz, internalCellLengths, latNtg, ntg ); - const double effectiveK = RigTransmissibilityEquations::effectiveK( permx, permy, permz, internalCellLengths, latNtg, ntg ); + const double effectiveK = + RigTransmissibilityEquations::effectiveK( permx, permy, permz, internalCellLengths, latNtg, ntg ); const double effectiveH = RigTransmissibilityEquations::effectiveH( internalCellLengths, latNtg, ntg ); double darcy = RiaEclipseUnitTools::darcysConstant( wellPath->unitSystem() ); @@ -1531,8 +1541,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 +1664,10 @@ double RicWellPathExportCompletionDataFeatureImpl::calculateTransmissibilityAsEc //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::pair RicWellPathExportCompletionDataFeatureImpl::wellPathUpperGridIntersectionIJ( - const RimEclipseCase* gridCase, const RimWellPath* wellPath, const QString& gridName ) +std::pair + RicWellPathExportCompletionDataFeatureImpl::wellPathUpperGridIntersectionIJ( const RimEclipseCase* gridCase, + const RimWellPath* wellPath, + const QString& gridName ) { const RigEclipseCaseData* caseData = gridCase->eclipseCaseData(); const RigMainGrid* mainGrid = caseData->mainGrid(); diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp index 6906f0b0bb..f34a6182ff 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp @@ -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 spiltIntersectionSegmentsToMaxLength( const RigWellPath* pathGeometry, const std::vector& intersections, @@ -79,13 +83,14 @@ public: /// //-------------------------------------------------------------------------------------------------- void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForAllCompletions( - const RicExportCompletionDataSettingsUi& exportSettings, const std::vector& wellPaths ) + const RicExportCompletionDataSettingsUi& exportSettings, + const std::vector& wellPaths ) { std::shared_ptr unifiedExportFile; if ( exportSettings.fileSplit() == RicExportCompletionDataSettingsUi::UNIFIED_FILE ) { - QString unifiedFileName = QString( "UnifiedCompletions_MSW_%1" ) - .arg( exportSettings.caseToApply->caseUserDescription() ); + QString unifiedFileName = + QString( "UnifiedCompletions_MSW_%1" ).arg( exportSettings.caseToApply->caseUserDescription() ); unifiedExportFile = RicWellPathExportCompletionsFileTools::openFileForExport( exportSettings.folder, unifiedFileName ); } @@ -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& fractures ) + RimEclipseCase* caseToApply, + const RimWellPath* wellPath, + const std::vector& 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 RicWellPathExportMswCompletionsImpl::generatePerforationIntersections( - const RimWellPath* wellPath, const RimPerforationInterval* perforationInterval, int timeStep, RimEclipseCase* eclipseCase ) + const RimWellPath* wellPath, + const RimPerforationInterval* perforationInterval, + int timeStep, + RimEclipseCase* eclipseCase ) { std::vector 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 ) diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp index f5de213d89..d43a101734 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp +++ b/ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp @@ -109,8 +109,8 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::setupActionLook( QAction* acti //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews( - RimCase& gridCase, std::vector intersections ) +void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews( RimCase& gridCase, + std::vector intersections ) { for ( RimIntersection* intersection : intersections ) { @@ -142,7 +142,8 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews( /// //-------------------------------------------------------------------------------------------------- void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionBoxesToOtherViews( - RimCase& gridCase, std::vector intersectionBoxes ) + RimCase& gridCase, + std::vector intersectionBoxes ) { for ( RimIntersectionBox* intersectionBox : intersectionBoxes ) { diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp index dbb6d2fd94..286e57dbdd 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp +++ b/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp @@ -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 ) diff --git a/ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp b/ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp index b0b836b778..85a89fbc23 100644 --- a/ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp +++ b/ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp @@ -88,9 +88,9 @@ void RicAdvancedSnapshotExportFeature::onActionTriggered( bool isChecked ) { QString fallbackFolderName = RiaApplication::instance()->createAbsolutePathFromProjectRelativePath( "snapshots" ); - QString folderName = RiaApplication::instance() - ->lastUsedDialogDirectoryWithFallback( "ADVANCED_SNAPSHOT_EXPORT", - fallbackFolderName ); + QString folderName = + RiaApplication::instance()->lastUsedDialogDirectoryWithFallback( "ADVANCED_SNAPSHOT_EXPORT", + fallbackFolderName ); dlg.setExportFolder( folderName ); } diff --git a/ApplicationCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp b/ApplicationCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp index ce3b5b8fda..5c281d40ae 100644 --- a/ApplicationCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp +++ b/ApplicationCode/Commands/ExportCommands/RicEclipseCellResultToFileImpl.cpp @@ -79,10 +79,8 @@ bool RicEclipseCellResultToFileImpl::writeBinaryResultToTextFile( const QString& { CVF_TIGHT_ASSERT( eclipseCase ); - cvf::ref resultAccessor = RigResultAccessorFactory::createFromResultDefinition( eclipseCase, - 0, - timeStep, - resultDefinition ); + cvf::ref resultAccessor = + RigResultAccessorFactory::createFromResultDefinition( eclipseCase, 0, timeStep, resultDefinition ); if ( resultAccessor.isNull() ) { return false; diff --git a/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp b/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp index acaba0f89f..0156bac1c3 100644 --- a/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp +++ b/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp @@ -70,7 +70,8 @@ void RicExportEclipseSectorModelFeature::openDialogAndExecuteCommand( RimEclipse cvf::Vec3i min, max; std::tie( min, max ) = getVisibleCellRange( view, cellVisibility ); - RicExportEclipseSectorModelUi* exportSettings = RiaApplication::instance()->project()->dialogData()->exportSectorModelUi(); + RicExportEclipseSectorModelUi* exportSettings = + RiaApplication::instance()->project()->dialogData()->exportSectorModelUi(); exportSettings->setCaseData( caseData, min, max ); exportSettings->applyBoundaryDefaults(); diff --git a/ApplicationCode/Commands/FlowCommands/RicAddStoredFlowCharacteristicsPlotFeature.cpp b/ApplicationCode/Commands/FlowCommands/RicAddStoredFlowCharacteristicsPlotFeature.cpp index 562002770d..7b237f96e1 100644 --- a/ApplicationCode/Commands/FlowCommands/RicAddStoredFlowCharacteristicsPlotFeature.cpp +++ b/ApplicationCode/Commands/FlowCommands/RicAddStoredFlowCharacteristicsPlotFeature.cpp @@ -42,7 +42,8 @@ bool RicAddStoredFlowCharacteristicsPlotFeature::isCommandEnabled() { if ( RiaApplication::instance()->project() ) { - RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); + RimFlowPlotCollection* flowPlotColl = + RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); if ( flowPlotColl ) { RimFlowCharacteristicsPlot* flowCharacteristicsPlot = dynamic_cast( @@ -65,7 +66,8 @@ void RicAddStoredFlowCharacteristicsPlotFeature::onActionTriggered( bool isCheck { if ( RiaApplication::instance()->project() ) { - RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); + RimFlowPlotCollection* flowPlotColl = + RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); if ( flowPlotColl ) { RimFlowCharacteristicsPlot* sourceObject = dynamic_cast( diff --git a/ApplicationCode/Commands/FlowCommands/RicAddStoredWellAllocationPlotFeature.cpp b/ApplicationCode/Commands/FlowCommands/RicAddStoredWellAllocationPlotFeature.cpp index 67597b7b7c..d8541ec8b1 100644 --- a/ApplicationCode/Commands/FlowCommands/RicAddStoredWellAllocationPlotFeature.cpp +++ b/ApplicationCode/Commands/FlowCommands/RicAddStoredWellAllocationPlotFeature.cpp @@ -42,7 +42,8 @@ bool RicAddStoredWellAllocationPlotFeature::isCommandEnabled() { if ( RiaApplication::instance()->project() ) { - RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); + RimFlowPlotCollection* flowPlotColl = + RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); if ( flowPlotColl ) { RimWellAllocationPlot* wellAllocationPlot = dynamic_cast( @@ -65,7 +66,8 @@ void RicAddStoredWellAllocationPlotFeature::onActionTriggered( bool isChecked ) { if ( RiaApplication::instance()->project() ) { - RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); + RimFlowPlotCollection* flowPlotColl = + RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); if ( flowPlotColl ) { RimWellAllocationPlot* sourceObject = dynamic_cast( diff --git a/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeature.cpp b/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeature.cpp index e7f63670fa..b23d63e031 100644 --- a/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeature.cpp +++ b/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeature.cpp @@ -89,10 +89,10 @@ void RicShowContributingWellsFeature::onActionTriggered( bool isChecked ) RimEclipseResultCase* eclipseResultCase = nullptr; well->firstAncestorOrThisOfTypeAsserted( eclipseResultCase ); - RimEclipseView* modifiedView = RicShowContributingWellsFeatureImpl::manipulateSelectedView( eclipseResultCase, - well->name(), - eclipseView - ->currentTimeStep() ); + RimEclipseView* modifiedView = + RicShowContributingWellsFeatureImpl::manipulateSelectedView( eclipseResultCase, + well->name(), + eclipseView->currentTimeStep() ); if ( modifiedView ) { modifiedView->createDisplayModelAndRedraw(); diff --git a/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp b/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp index a9880d2216..bda66a7580 100644 --- a/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp +++ b/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp @@ -178,8 +178,10 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells( Rim //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RicShowContributingWellsFeatureImpl::findContributingTracerNames( - const RimFlowDiagSolution* flowDiagSolution, const RigSimWellData* simWellData, int timeStep ) +std::vector + RicShowContributingWellsFeatureImpl::findContributingTracerNames( const RimFlowDiagSolution* flowDiagSolution, + const RigSimWellData* simWellData, + int timeStep ) { std::vector tracerCellFractionValues; diff --git a/ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp b/ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp index 60e3bbeb92..998b3ce42f 100644 --- a/ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp +++ b/ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp @@ -105,7 +105,8 @@ void RicShowWellAllocationPlotFeature::onActionTriggered( bool isChecked ) if ( RiaApplication::instance()->project() ) { - RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); + RimFlowPlotCollection* flowPlotColl = + RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); if ( flowPlotColl ) { flowPlotColl->defaultWellAllocPlot()->setFromSimulationWell( simWell ); diff --git a/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp b/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp index 9010db1ccb..bb45f28267 100644 --- a/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureFeature.cpp @@ -170,8 +170,8 @@ RimWellPathFractureCollection* RicNewWellPathFractureFeature::selectedWellPathFr { return wellPaths[0]->fractureCollection(); } - RimWellPathCompletions* completions = caf::SelectionManager::instance() - ->selectedItemOfType(); + RimWellPathCompletions* completions = + caf::SelectionManager::instance()->selectedItemOfType(); if ( completions ) { return completions->fractureCollection(); diff --git a/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp b/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp index 59773c21d4..954d8e666f 100644 --- a/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp +++ b/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp @@ -50,9 +50,9 @@ bool RicCreateGridCrossPlotFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- void RicCreateGridCrossPlotFeature::onActionTriggered( bool isChecked ) { - RimProject* project = RiaApplication::instance()->project(); - RimGridCrossPlotCollection* collection = caf::SelectionManager::instance() - ->selectedItemAncestorOfType(); + RimProject* project = RiaApplication::instance()->project(); + RimGridCrossPlotCollection* collection = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); if ( !collection ) { collection = project->mainPlotCollection()->gridCrossPlotCollection(); diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportToFolderFeature.cpp b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportToFolderFeature.cpp index 8aa22f99ea..cdc3368de5 100644 --- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportToFolderFeature.cpp +++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportToFolderFeature.cpp @@ -56,7 +56,8 @@ void RicHoloLensExportToFolderFeature::onActionTriggered( bool isChecked ) { RimGridView* activeView = RiaApplication::instance()->activeGridView(); - RicHoloLensExportToFolderUi* featureUi = RiaApplication::instance()->project()->dialogData()->holoLensExportToFolderData(); + RicHoloLensExportToFolderUi* featureUi = + RiaApplication::instance()->project()->dialogData()->holoLensExportToFolderData(); featureUi->setViewForExport( activeView ); caf::PdmUiPropertyViewDialog propertyDialog( nullptr, diff --git a/ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.cpp b/ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.cpp index 0d76955573..d71748eb2b 100644 --- a/ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.cpp +++ b/ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.cpp @@ -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; diff --git a/ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h b/ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h index a56a11ef11..6e489b4375 100644 --- a/ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h +++ b/ApplicationCode/Commands/HoloLensCommands/VdeCachingHashedIdFactory.h @@ -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 m_keyToIdMap; diff --git a/ApplicationCode/Commands/HoloLensCommands/VdeVizDataExtractor.cpp b/ApplicationCode/Commands/HoloLensCommands/VdeVizDataExtractor.cpp index 22939f44e2..a660058c9c 100644 --- a/ApplicationCode/Commands/HoloLensCommands/VdeVizDataExtractor.cpp +++ b/ApplicationCode/Commands/HoloLensCommands/VdeVizDataExtractor.cpp @@ -116,9 +116,8 @@ void VdeVizDataExtractor::extractViewContents( QString* modelMetaJson if ( !packetDirectory->lookupPacket( arrayIdsThisMesh.connArrId ) ) { cvf::Trace::show( " generating connectivities, arrayId=%d", arrayIdsThisMesh.connArrId ); - std::unique_ptr dataPacket = VdeArrayDataPacket::fromUint32Arr( arrayIdsThisMesh.connArrId, - uintArr, - arrElementCount ); + std::unique_ptr dataPacket = + VdeArrayDataPacket::fromUint32Arr( arrayIdsThisMesh.connArrId, uintArr, arrElementCount ); // Debug testing of decoding // debugComparePackets(*dataPacket, VdeArrayDataPacket::fromRawPacketBuffer(dataPacket->fullPacketRawPtr(), @@ -131,12 +130,12 @@ void VdeVizDataExtractor::extractViewContents( QString* modelMetaJson if ( mesh->texCoordArr.notNull() && mesh->texImage.notNull() ) { { - const float* floatArr = reinterpret_cast( mesh->texCoordArr->ptr() ); - const size_t arrElementCount = 2 * mesh->texCoordArr->size(); - arrayIdsThisMesh.texCoordsArrId = m_cachingIdFactory - ->getOrCreateIdForFloatArr( VdeCachingHashedIdFactory::TexCoordsArr, - floatArr, - arrElementCount ); + const float* floatArr = reinterpret_cast( mesh->texCoordArr->ptr() ); + const size_t arrElementCount = 2 * mesh->texCoordArr->size(); + arrayIdsThisMesh.texCoordsArrId = + m_cachingIdFactory->getOrCreateIdForFloatArr( VdeCachingHashedIdFactory::TexCoordsArr, + floatArr, + arrElementCount ); if ( !packetDirectory->lookupPacket( arrayIdsThisMesh.texCoordsArrId ) ) { @@ -153,10 +152,10 @@ void VdeVizDataExtractor::extractViewContents( QString* modelMetaJson } { cvf::ref byteArr = mesh->texImage->toRgb(); - arrayIdsThisMesh.texImageArrId = m_cachingIdFactory - ->getOrCreateIdForUint8Arr( VdeCachingHashedIdFactory::TexImage, - byteArr->ptr(), - byteArr->size() ); + arrayIdsThisMesh.texImageArrId = + m_cachingIdFactory->getOrCreateIdForUint8Arr( VdeCachingHashedIdFactory::TexImage, + byteArr->ptr(), + byteArr->size() ); if ( !packetDirectory->lookupPacket( arrayIdsThisMesh.texImageArrId ) ) { diff --git a/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp b/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp index e03bb009f3..815d7f2f80 100644 --- a/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp +++ b/ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp @@ -72,9 +72,9 @@ void RicCopyReferencesToClipboardFeature::onActionTriggered( bool isChecked ) { if ( RicCopyReferencesToClipboardFeature::isCopyOfObjectSupported( pdmObject ) ) { - QString itemRef = caf::PdmReferenceHelper::referenceFromRootToObject( caf::SelectionManager::instance() - ->pdmRootObject(), - pdmObject ); + QString itemRef = + caf::PdmReferenceHelper::referenceFromRootToObject( caf::SelectionManager::instance()->pdmRootObject(), + pdmObject ); referenceList.push_back( itemRef ); } diff --git a/ApplicationCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp b/ApplicationCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp index ad2de2bec9..57b4e729fb 100644 --- a/ApplicationCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp +++ b/ApplicationCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp @@ -59,9 +59,9 @@ void RicCutReferencesToClipboardFeature::onActionTriggered( bool isChecked ) { if ( RicCutReferencesToClipboardFeature::isCuttingOfObjectSupported( pdmObject ) ) { - QString itemRef = caf::PdmReferenceHelper::referenceFromRootToObject( caf::SelectionManager::instance() - ->pdmRootObject(), - pdmObject ); + QString itemRef = + caf::PdmReferenceHelper::referenceFromRootToObject( caf::SelectionManager::instance()->pdmRootObject(), + pdmObject ); referenceList.push_back( itemRef ); } diff --git a/ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp b/ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp index 814e3b1a09..f277767026 100644 --- a/ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp +++ b/ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp @@ -89,7 +89,8 @@ void RicSummaryPlotTemplateTools::appendSummaryPlotToPlotCollection( if ( selectedSummaryCases.empty() && selectedEnsembles.empty() ) return; - RimSummaryPlotCollection* plotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection(); + RimSummaryPlotCollection* plotColl = + RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection(); plotColl->summaryPlots.push_back( summaryPlot ); summaryPlot->resolveReferencesRecursively(); diff --git a/ApplicationCode/Commands/RicNewContourMapViewFeature.cpp b/ApplicationCode/Commands/RicNewContourMapViewFeature.cpp index 0c77fcb69e..4f30541d93 100644 --- a/ApplicationCode/Commands/RicNewContourMapViewFeature.cpp +++ b/ApplicationCode/Commands/RicNewContourMapViewFeature.cpp @@ -54,10 +54,10 @@ bool RicNewContourMapViewFeature::isCommandEnabled() { bool selectedView = caf::SelectionManager::instance()->selectedItemOfType() != nullptr; bool selectedCase = caf::SelectionManager::instance()->selectedItemOfType() != nullptr; - bool selectedEclipseContourMapCollection = caf::SelectionManager::instance() - ->selectedItemOfType(); - bool selectedGeoMechContourMapCollection = caf::SelectionManager::instance() - ->selectedItemOfType(); + bool selectedEclipseContourMapCollection = + caf::SelectionManager::instance()->selectedItemOfType(); + bool selectedGeoMechContourMapCollection = + caf::SelectionManager::instance()->selectedItemOfType(); return selectedView || selectedCase || selectedEclipseContourMapCollection || selectedGeoMechContourMapCollection; } @@ -67,14 +67,14 @@ bool RicNewContourMapViewFeature::isCommandEnabled() void RicNewContourMapViewFeature::onActionTriggered( bool isChecked ) { RimEclipseView* reservoirView = caf::SelectionManager::instance()->selectedItemOfType(); - RimEclipseContourMapView* existingEclipseContourMap = caf::SelectionManager::instance() - ->selectedItemOfType(); + RimEclipseContourMapView* existingEclipseContourMap = + caf::SelectionManager::instance()->selectedItemOfType(); RimEclipseCase* eclipseCase = caf::SelectionManager::instance()->selectedItemAncestorOfType(); RimEclipseContourMapView* eclipseContourMap = nullptr; RimGeoMechView* geoMechView = caf::SelectionManager::instance()->selectedItemOfType(); - RimGeoMechContourMapView* existingGeoMechContourMap = caf::SelectionManager::instance() - ->selectedItemOfType(); + RimGeoMechContourMapView* existingGeoMechContourMap = + caf::SelectionManager::instance()->selectedItemOfType(); RimGeoMechCase* geoMechCase = caf::SelectionManager::instance()->selectedItemAncestorOfType(); RimGeoMechContourMapView* geoMechContourMap = nullptr; @@ -166,7 +166,8 @@ void RicNewContourMapViewFeature::setupActionLook( QAction* actionToSetup ) /// //-------------------------------------------------------------------------------------------------- RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMapFromExistingContourMap( - RimEclipseCase* eclipseCase, RimEclipseContourMapView* existingContourMap ) + RimEclipseCase* eclipseCase, + RimEclipseContourMapView* existingContourMap ) { RimEclipseContourMapView* contourMap = dynamic_cast( 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( existingContourMap->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) ); diff --git a/ApplicationCode/Commands/RicNewGridPlotWindowFeature.cpp b/ApplicationCode/Commands/RicNewGridPlotWindowFeature.cpp index 00e5a844c2..a77089e3be 100644 --- a/ApplicationCode/Commands/RicNewGridPlotWindowFeature.cpp +++ b/ApplicationCode/Commands/RicNewGridPlotWindowFeature.cpp @@ -82,8 +82,8 @@ RicfCommandResponse RicNewGridPlotWindowFeature::execute() //-------------------------------------------------------------------------------------------------- bool RicNewGridPlotWindowFeature::isCommandEnabled() { - RimGridPlotWindowCollection* gridPlotCollection = caf::SelectionManager::instance() - ->selectedItemOfType(); + RimGridPlotWindowCollection* gridPlotCollection = + caf::SelectionManager::instance()->selectedItemOfType(); if ( gridPlotCollection ) { return true; diff --git a/ApplicationCode/Commands/RicSelectOrCreateViewFeatureImpl.cpp b/ApplicationCode/Commands/RicSelectOrCreateViewFeatureImpl.cpp index 199efbc56d..69449daad5 100644 --- a/ApplicationCode/Commands/RicSelectOrCreateViewFeatureImpl.cpp +++ b/ApplicationCode/Commands/RicSelectOrCreateViewFeatureImpl.cpp @@ -73,8 +73,8 @@ RimEclipseView* RicSelectOrCreateViewFeatureImpl::showViewSelection( RimEclipseR viewToManipulate = featureUi.selectedView(); } - QString refFromProjectToView = caf::PdmReferenceHelper::referenceFromRootToObject( RiaApplication::instance()->project(), - viewToManipulate ); + QString refFromProjectToView = + caf::PdmReferenceHelper::referenceFromRootToObject( RiaApplication::instance()->project(), viewToManipulate ); RiaApplication::instance()->setCacheDataObject( lastUsedViewKey, refFromProjectToView ); return viewToManipulate; diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteTimeHistoryCurveFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteTimeHistoryCurveFeature.cpp index ed496c63f0..d1614c236c 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteTimeHistoryCurveFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteTimeHistoryCurveFeature.cpp @@ -72,7 +72,8 @@ void RicPasteTimeHistoryCurveFeature::onActionTriggered( bool isChecked ) return; } - std::vector> sourceObjects = RicPasteTimeHistoryCurveFeature::timeHistoryCurves(); + std::vector> sourceObjects = + RicPasteTimeHistoryCurveFeature::timeHistoryCurves(); for ( size_t i = 0; i < sourceObjects.size(); i++ ) { diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp index 36e4f9bc3b..c17062a0eb 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp @@ -155,9 +155,9 @@ void RicSummaryCurveCalculator::defineUiOrdering( QString uiConfigName, caf::Pdm } { - caf::PdmUiGroup* group = uiOrdering - .addNewGroupWithKeyword( "Calculated Summaries", - RicSummaryCurveCalculator::calculatedSummariesGroupName() ); + caf::PdmUiGroup* group = + uiOrdering.addNewGroupWithKeyword( "Calculated Summaries", + RicSummaryCurveCalculator::calculatedSummariesGroupName() ); group->add( &m_currentCalculation ); group->add( &m_newCalculation ); group->add( &m_deleteCalculation ); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp index ce051bf92d..86550193b4 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp @@ -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; diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp index dcfcf799cb..7913b6bfab 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp @@ -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& topLevelUiItems = topLevelUiOrdering.uiItems(); if ( m_summaryCurveCreator->isCloseButtonPressed() ) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp index a9f1c2bf78..925094e582 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp @@ -500,8 +500,8 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin { for ( RimSummaryCase* sumCase : summaryCasesToUse ) { - const std::set& allAddrsInCase = sumCase->summaryReader() - ->allResultAddresses(); + const std::set& allAddrsInCase = + sumCase->summaryReader()->allResultAddresses(); if ( allAddrsInCase.count( addr ) ) { RimSummaryCurve* newCurve = new RimSummaryCurve(); @@ -755,8 +755,10 @@ std::set //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RicSummaryPlotFeatureImpl::addCurvesFromAddressFiltersToPlot( - const QStringList& curveFilters, RimSummaryPlot* plot, RimSummaryCase* summaryCase, bool addHistoryCurves ) +std::vector RicSummaryPlotFeatureImpl::addCurvesFromAddressFiltersToPlot( const QStringList& curveFilters, + RimSummaryPlot* plot, + RimSummaryCase* summaryCase, + bool addHistoryCurves ) { std::vector createdCurves; diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.h index a2e740fad5..7a489dce04 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.h @@ -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 ) diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp index b5bb1df23c..7b53c3ce89 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellBoreStabilityPlotFeature.cpp @@ -132,8 +132,8 @@ bool RicNewWellBoreStabilityPlotFeature::isCommandEnabled() void RicNewWellBoreStabilityPlotFeature::onActionTriggered( bool isChecked ) { RimWellPath* wellPath = caf::SelectionManager::instance()->selectedItemAncestorOfType(); - RimWellLogPlotCollection* plotCollection = caf::SelectionManager::instance() - ->selectedItemOfType(); + RimWellLogPlotCollection* plotCollection = + caf::SelectionManager::instance()->selectedItemOfType(); if ( !wellPath ) { if ( plotCollection ) @@ -293,13 +293,8 @@ void RicNewWellBoreStabilityPlotFeature::createStabilityCurvesTrack( RimWellBore { const QString& resultName = resultNames[i]; RigFemResultAddress resAddr( RIG_WELLPATH_DERIVED, resultName.toStdString(), "" ); - RimWellLogWbsCurve* curve = RicWellLogTools::addWellLogWbsCurve( stabilityCurvesTrack, - geoMechCase, - nullptr, - wellPath, - -1, - false, - false ); + RimWellLogWbsCurve* curve = + RicWellLogTools::addWellLogWbsCurve( stabilityCurvesTrack, geoMechCase, nullptr, wellPath, -1, false, false ); curve->setGeoMechResultAddress( resAddr ); curve->setCurrentTimeStep( timeStep ); curve->setAutoNameComponents( false, true, false, false, false ); diff --git a/ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp b/ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp index e3ff3de4e1..d4743c3ac8 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp @@ -108,11 +108,11 @@ bool RicCreateWellTargetsPickEventHandler::handle3dPickEvent( const Ric3dPickEve intersectionPointInDomain ); double md = wellPathSourceInfo->measuredDepth( firstPickItem.faceIdx(), intersectionPointInDomain ); - doSetAzimuthAndInclination = calculateAzimuthAndInclinationAtMd( md, - wellPathSourceInfo->wellPath() - ->wellPathGeometry(), - &azimuth, - &inclination ); + doSetAzimuthAndInclination = + calculateAzimuthAndInclinationAtMd( md, + wellPathSourceInfo->wellPath()->wellPathGeometry(), + &azimuth, + &inclination ); } else if ( isGridSourceObject( firstPickItem.sourceInfo() ) ) { diff --git a/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp index 78da8ce76e..ad3e9f1f0d 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp @@ -71,8 +71,8 @@ void RicDeleteWellPathAttributeFeature::onActionTriggered( bool isChecked ) } else { - wellPathAttributeCollection = caf::SelectionManager::instance() - ->selectedItemOfType(); + wellPathAttributeCollection = + caf::SelectionManager::instance()->selectedItemOfType(); if ( wellPathAttributeCollection ) { wellPathAttributeCollection->deleteAllAttributes(); diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp index 11a518dc7f..a26d1722f2 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp @@ -789,14 +789,12 @@ std::map RifEclipseInputFileTools::readProperties( const QStri fseek( gridFilePointer, fileKeywords[i].filePos, SEEK_SET ); - ecl_kw_type* eclipseKeywordData = ecl_kw_fscanf_alloc_current_grdecl__( gridFilePointer, - false, - ecl_type_create_from_type( - ECL_FLOAT_TYPE ) ); + ecl_kw_type* eclipseKeywordData = + ecl_kw_fscanf_alloc_current_grdecl__( gridFilePointer, false, ecl_type_create_from_type( ECL_FLOAT_TYPE ) ); if ( eclipseKeywordData ) { - QString newResultName = caseData->results( RiaDefines::MATRIX_MODEL ) - ->makeResultNameUnique( fileKeywords[i].keyword ); + QString newResultName = + caseData->results( RiaDefines::MATRIX_MODEL )->makeResultNameUnique( fileKeywords[i].keyword ); QString errMsg; if ( readDataFromKeyword( eclipseKeywordData, caseData, newResultName, &errMsg ) ) { diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp index 96a4f1e9c0..c40c014d7d 100644 --- a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp @@ -410,9 +410,10 @@ void RifEclipseOutputFileTools::readGridDimensions( const QString& // printf("grid:%s has %d a total of %d lgr's \n", grid_filename , stringlist_get_size( lgr_names )); for ( int lgr_nr = 0; lgr_nr < stringlist_get_size( lgr_names ); lgr_nr++ ) { - ecl_grid_type* lgr_grid = ecl_grid_get_lgr( grid, - stringlist_iget( lgr_names, - lgr_nr ) ); // get the ecl_grid instance of the lgr - by name. + ecl_grid_type* lgr_grid = + ecl_grid_get_lgr( grid, + stringlist_iget( lgr_names, + lgr_nr ) ); // get the ecl_grid instance of the lgr - by name. int nx, ny, nz, active_size; ecl_grid_get_dims( lgr_grid, &nx, &ny, &nz, &active_size ); // get some size info from this lgr. diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp b/ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp index 37b38edac5..7db8a19a51 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp +++ b/ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp @@ -400,8 +400,11 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::wellAddress( const std::strin //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionAddress( - const std::string& quantityName, const std::string& wellName, int i, int j, int k ) +RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionAddress( const std::string& quantityName, + const std::string& wellName, + int i, + int j, + int k ) { RifEclipseSummaryAddress addr; addr.m_variableCategory = SUMMARY_WELL_COMPLETION; @@ -431,8 +434,12 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::wellLgrAddress( const std::st //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionLgrAddress( - const std::string& quantityName, const std::string& lgrName, const std::string& wellName, int i, int j, int k ) +RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionLgrAddress( const std::string& quantityName, + const std::string& lgrName, + const std::string& wellName, + int i, + int j, + int k ) { RifEclipseSummaryAddress addr; addr.m_variableCategory = SUMMARY_WELL_COMPLETION_LGR; @@ -477,8 +484,11 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::blockAddress( const std::stri //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RifEclipseSummaryAddress RifEclipseSummaryAddress::blockLgrAddress( - const std::string& quantityName, const std::string& lgrName, int i, int j, int k ) +RifEclipseSummaryAddress RifEclipseSummaryAddress::blockLgrAddress( const std::string& quantityName, + const std::string& lgrName, + int i, + int j, + int k ) { RifEclipseSummaryAddress addr; addr.m_variableCategory = SUMMARY_BLOCK_LGR; diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryAddress.h b/ApplicationCode/FileInterface/RifEclipseSummaryAddress.h index d84e1f438e..cd40fbc4f5 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryAddress.h +++ b/ApplicationCode/FileInterface/RifEclipseSummaryAddress.h @@ -136,8 +136,12 @@ public: wellCompletionAddress( const std::string& quantityName, const std::string& wellName, int i, int j, int k ); static RifEclipseSummaryAddress wellLgrAddress( const std::string& quantityName, const std::string& lgrName, const std::string& wellName ); - static RifEclipseSummaryAddress wellCompletionLgrAddress( - const std::string& quantityName, const std::string& lgrName, const std::string& wellName, int i, int j, int k ); + static RifEclipseSummaryAddress wellCompletionLgrAddress( const std::string& quantityName, + const std::string& lgrName, + const std::string& wellName, + int i, + int j, + int k ); static RifEclipseSummaryAddress wellSegmentAddress( const std::string& quantityName, const std::string& wellName, int segmentNumber ); static RifEclipseSummaryAddress blockAddress( const std::string& quantityName, int i, int j, int k ); diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp b/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp index 2ad94403b6..db10835285 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp @@ -159,8 +159,11 @@ void RifEclipseSummaryTools::dumpMetaData( RifSummaryReaderInterface* readerEcli //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RifEclipseSummaryTools::findSummaryHeaderFileInfo( - const QString& inputFile, QString* headerFile, QString* path, QString* base, bool* isFormatted ) +void RifEclipseSummaryTools::findSummaryHeaderFileInfo( const QString& inputFile, + QString* headerFile, + QString* path, + QString* base, + bool* isFormatted ) { char* myPath = nullptr; char* myBase = nullptr; diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryTools.h b/ApplicationCode/FileInterface/RifEclipseSummaryTools.h index fad87b0771..263cc8a4b1 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryTools.h +++ b/ApplicationCode/FileInterface/RifEclipseSummaryTools.h @@ -42,6 +42,9 @@ public: static void dumpMetaData( RifSummaryReaderInterface* readerEclipseSummary ); private: - static void findSummaryHeaderFileInfo( - const QString& inputFile, QString* headerFile, QString* path, QString* base, bool* isFormatted ); + static void findSummaryHeaderFileInfo( const QString& inputFile, + QString* headerFile, + QString* path, + QString* base, + bool* isFormatted ); }; diff --git a/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp b/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp index 80fddd393e..6dd88f473c 100644 --- a/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp +++ b/ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp @@ -116,9 +116,9 @@ bool RifEclipseUnifiedRestartFileAccess::openFile() QString resultPath = fi.absolutePath(); if ( caf::Utils::isFolderWritable( resultPath ) ) { - bool success = ecl_file_write_index( m_ecl_file, - RiaStringEncodingTools::toNativeEncoded( indexFileName ) - .data() ); + bool success = + ecl_file_write_index( m_ecl_file, + RiaStringEncodingTools::toNativeEncoded( indexFileName ).data() ); if ( success ) { diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index 957ba46dbe..7e696deace 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -954,14 +954,13 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid ) m_dynamicResultsAccess->resultNames( &resultNames, &resultNamesDataItemCounts ); { - QStringList matrixResultNames = validKeywordsForPorosityModel( resultNames, - resultNamesDataItemCounts, - m_eclipseCase->activeCellInfo( - RiaDefines::MATRIX_MODEL ), - m_eclipseCase->activeCellInfo( - RiaDefines::FRACTURE_MODEL ), - RiaDefines::MATRIX_MODEL, - m_dynamicResultsAccess->timeStepCount() ); + QStringList matrixResultNames = + validKeywordsForPorosityModel( resultNames, + resultNamesDataItemCounts, + m_eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL ), + m_eclipseCase->activeCellInfo( RiaDefines::FRACTURE_MODEL ), + RiaDefines::MATRIX_MODEL, + m_dynamicResultsAccess->timeStepCount() ); for ( int i = 0; i < matrixResultNames.size(); ++i ) { @@ -972,14 +971,13 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid ) } { - QStringList fractureResultNames = validKeywordsForPorosityModel( resultNames, - resultNamesDataItemCounts, - m_eclipseCase->activeCellInfo( - RiaDefines::MATRIX_MODEL ), - m_eclipseCase->activeCellInfo( - RiaDefines::FRACTURE_MODEL ), - RiaDefines::FRACTURE_MODEL, - m_dynamicResultsAccess->timeStepCount() ); + QStringList fractureResultNames = + validKeywordsForPorosityModel( resultNames, + resultNamesDataItemCounts, + m_eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL ), + m_eclipseCase->activeCellInfo( RiaDefines::FRACTURE_MODEL ), + RiaDefines::FRACTURE_MODEL, + m_dynamicResultsAccess->timeStepCount() ); for ( int i = 0; i < fractureResultNames.size(); ++i ) { @@ -1047,14 +1045,13 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid ) } { - QStringList matrixResultNames = validKeywordsForPorosityModel( resultNames, - resultNamesDataItemCounts, - m_eclipseCase->activeCellInfo( - RiaDefines::MATRIX_MODEL ), - m_eclipseCase->activeCellInfo( - RiaDefines::FRACTURE_MODEL ), - RiaDefines::MATRIX_MODEL, - 1 ); + QStringList matrixResultNames = + validKeywordsForPorosityModel( resultNames, + resultNamesDataItemCounts, + m_eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL ), + m_eclipseCase->activeCellInfo( RiaDefines::FRACTURE_MODEL ), + RiaDefines::MATRIX_MODEL, + 1 ); // Add ACTNUM matrixResultNames += "ACTNUM"; @@ -1068,14 +1065,13 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid ) } { - QStringList fractureResultNames = validKeywordsForPorosityModel( resultNames, - resultNamesDataItemCounts, - m_eclipseCase->activeCellInfo( - RiaDefines::MATRIX_MODEL ), - m_eclipseCase->activeCellInfo( - RiaDefines::FRACTURE_MODEL ), - RiaDefines::FRACTURE_MODEL, - 1 ); + QStringList fractureResultNames = + validKeywordsForPorosityModel( resultNames, + resultNamesDataItemCounts, + m_eclipseCase->activeCellInfo( RiaDefines::MATRIX_MODEL ), + m_eclipseCase->activeCellInfo( RiaDefines::FRACTURE_MODEL ), + RiaDefines::FRACTURE_MODEL, + 1 ); // Add ACTNUM fractureResultNames += "ACTNUM"; @@ -2051,8 +2047,8 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo // Calculate the bottom position of all the unpositioned segments // Then do the calculation based on the refined contributions - std::map>::iterator posContribIt = segmentIdToPositionContrib - .begin(); + std::map>::iterator posContribIt = + segmentIdToPositionContrib.begin(); std::map bottomPositions; while ( posContribIt != segmentIdToPositionContrib.end() ) { @@ -2088,7 +2084,8 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo static_cast( gridNr ) ); if ( ert_wellhead ) { - RigWellResultPoint wellHeadRp = createWellResultPoint( grids[gridNr], ert_wellhead, -1, -1, wellName ); + RigWellResultPoint wellHeadRp = + createWellResultPoint( grids[gridNr], ert_wellhead, -1, -1, wellName ); // HACK: Ert returns open as "this is equally wrong as closed for well heads". // Well heads are not open jfr mail communication with HHGS and JH Statoil 07.01.2016 wellHeadRp.m_isOpen = false; @@ -2116,11 +2113,8 @@ void RifReaderEclipseOutput::readWellCells( const ecl_grid_type* mainEclGrid, bo for ( int connIdx = 0; connIdx < connectionCount; connIdx++ ) { well_conn_type* ert_connection = well_conn_collection_iget( connections, connIdx ); - RigWellResultPoint wellRp = createWellResultPoint( grids[gridNr], - ert_connection, - -1, - -1, - wellName ); + RigWellResultPoint wellRp = + createWellResultPoint( grids[gridNr], ert_connection, -1, -1, wellName ); if ( !subCellConnCalc.hasSubCellConnection( wellRp ) ) { diff --git a/ApplicationCode/FileInterface/RifReaderEclipseRft.cpp b/ApplicationCode/FileInterface/RifReaderEclipseRft.cpp index f238835959..02e1629f59 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseRft.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseRft.cpp @@ -285,8 +285,9 @@ std::set //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::set RifReaderEclipseRft::availableTimeSteps( - const QString& wellName, const std::set& relevantChannels ) +std::set + RifReaderEclipseRft::availableTimeSteps( const QString& wellName, + const std::set& relevantChannels ) { if ( !m_ecl_rft_file ) { diff --git a/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp b/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp index 7556a66d5a..9969f6991f 100644 --- a/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp +++ b/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp @@ -114,7 +114,8 @@ std::set RifReaderEnsembleStatisticsRft::availableTimeSteps( const QS /// //-------------------------------------------------------------------------------------------------- std::set RifReaderEnsembleStatisticsRft::availableTimeSteps( - const QString& wellName, const RifEclipseRftAddress::RftWellLogChannelType& wellLogChannelName ) + const QString& wellName, + const RifEclipseRftAddress::RftWellLogChannelType& wellLogChannelName ) { std::set allTimeSteps; for ( auto summaryCase : m_summaryCaseCollection->allSummaryCases() ) @@ -132,7 +133,8 @@ std::set RifReaderEnsembleStatisticsRft::availableTimeSteps( /// //-------------------------------------------------------------------------------------------------- std::set RifReaderEnsembleStatisticsRft::availableTimeSteps( - const QString& wellName, const std::set& relevantChannels ) + const QString& wellName, + const std::set& relevantChannels ) { std::set allTimeSteps; for ( auto summaryCase : m_summaryCaseCollection->allSummaryCases() ) diff --git a/ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp b/ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp index 19c04eb5ae..4542a4ddfa 100644 --- a/ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp +++ b/ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp @@ -162,7 +162,8 @@ void RifSummaryCaseRestartSelector::determineFilesToImport( const std::vector& initialFiles, bool enableApplyToAllField ) + const std::vector& initialFiles, + bool enableApplyToAllField ) { RicSummaryCaseRestartDialogResult lastResult; diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp index 30d8169b6f..294c45b8e7 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp @@ -519,8 +519,10 @@ std::map> //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigFemScalarResultFrames* RigFemPartResultsCollection::calculateBarConvertedResult( - int partIndex, const RigFemResultAddress& convertedResultAddr, const std::string& fieldNameToConvert ) +RigFemScalarResultFrames* + RigFemPartResultsCollection::calculateBarConvertedResult( int partIndex, + const RigFemResultAddress& convertedResultAddr, + const std::string& fieldNameToConvert ) { caf::ProgressInfo frameCountProgress( this->frameCount() * 2, "" ); frameCountProgress.setProgressDescription( @@ -722,22 +724,16 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateMeanStressSEM( i "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) ); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* sa11 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "SE", - "S11" ) ); + RigFemScalarResultFrames* sa11 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S11" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* sa22 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "SE", - "S22" ) ); + RigFemScalarResultFrames* sa22 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S22" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* sa33 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "SE", - "S33" ) ); + RigFemScalarResultFrames* sa33 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S33" ) ); RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); @@ -777,16 +773,12 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateSFI( int partInd "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) ); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* se1Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "SE", - "S1" ) ); + RigFemScalarResultFrames* se1Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S1" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* se3Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "SE", - "S3" ) ); + RigFemScalarResultFrames* se3Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S3" ) ); RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); @@ -841,16 +833,12 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDSM( int partInd "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) ); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* se1Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "SE", - "S1" ) ); + RigFemScalarResultFrames* se1Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S1" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* se3Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "SE", - "S3" ) ); + RigFemScalarResultFrames* se3Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "S3" ) ); RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); @@ -892,10 +880,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateFOS( int partInd "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) ); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* dsmFrames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "SE", - "DSM" ) ); + RigFemScalarResultFrames* dsmFrames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "SE", "DSM" ) ); RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); @@ -936,22 +922,16 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateMeanStressSTM( i "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) ); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* st11 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "ST", - "S11" ) ); + RigFemScalarResultFrames* st11 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S11" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* st22 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "ST", - "S22" ) ); + RigFemScalarResultFrames* st22 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S22" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* st33 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "ST", - "S33" ) ); + RigFemScalarResultFrames* st33 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S33" ) ); RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); @@ -993,29 +973,21 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDeviatoricStress "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) ); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* st11 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "ST", - "S1" ) ); + RigFemScalarResultFrames* st11 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S1" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* st22 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "ST", - "S2" ) ); + RigFemScalarResultFrames* st22 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S2" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* st33 = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "ST", - "S3" ) ); + RigFemScalarResultFrames* st33 = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "S3" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* stm = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "ST", - "STM" ) ); + RigFemScalarResultFrames* stm = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "ST", "STM" ) ); RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); @@ -1170,40 +1142,28 @@ RigFemScalarResultFrames* "Calculating " + QString::fromStdString( resVarAddr.fieldName + ": " + resVarAddr.componentName ) ); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* s11Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_ELEMENT_NODAL, - resVarAddr.fieldName, - "S11" ) ); + RigFemScalarResultFrames* s11Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S11" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* s22Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_ELEMENT_NODAL, - resVarAddr.fieldName, - "S22" ) ); + RigFemScalarResultFrames* s22Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S22" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* s33Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_ELEMENT_NODAL, - resVarAddr.fieldName, - "S33" ) ); + RigFemScalarResultFrames* s33Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S33" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* s12Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_ELEMENT_NODAL, - resVarAddr.fieldName, - "S12" ) ); + RigFemScalarResultFrames* s12Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S12" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* s23Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_ELEMENT_NODAL, - resVarAddr.fieldName, - "S23" ) ); + RigFemScalarResultFrames* s23Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S23" ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* s13Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_ELEMENT_NODAL, - resVarAddr.fieldName, - "S13" ) ); + RigFemScalarResultFrames* s13Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_ELEMENT_NODAL, resVarAddr.fieldName, "S13" ) ); RigFemScalarResultFrames* SNFrames = m_femPartResults[partIndex]->createScalarResult( RigFemResultAddress( resVarAddr.resultPosType, resVarAddr.fieldName, "SN" ) ); @@ -1707,10 +1667,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateCompactionValues caf::ProgressInfo frameCountProgress( this->frameCount() + 1, "" ); frameCountProgress.setProgressDescription( "Calculating " + QString::fromStdString( resVarAddr.fieldName ) ); - RigFemScalarResultFrames* u3Frames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( resVarAddr.resultPosType, - "U", - "U3" ) ); + RigFemScalarResultFrames* u3Frames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( resVarAddr.resultPosType, "U", "U3" ) ); frameCountProgress.incrementProgress(); RigFemScalarResultFrames* compactionFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); @@ -1828,11 +1786,9 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateSE( int partInde RigFemResultAddress( resVarAddr.resultPosType, "S-Bar", resVarAddr.componentName ) ); frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* srcPORDataFrames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_NODAL, - "POR-Bar", - "" ) ); - RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); + RigFemScalarResultFrames* srcPORDataFrames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_NODAL, "POR-Bar", "" ) ); + RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); frameCountProgress.incrementProgress(); @@ -1905,10 +1861,8 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateST_11_22_33( int frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* srcPORDataFrames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_NODAL, - "POR-Bar", - "" ) ); + RigFemScalarResultFrames* srcPORDataFrames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_NODAL, "POR-Bar", "" ) ); RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); const RigFemPart* femPart = m_femParts->part( partIndex ); @@ -2046,11 +2000,9 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateGamma( int frameCountProgress.incrementProgress(); frameCountProgress.setNextProgressIncrement( this->frameCount() ); - RigFemScalarResultFrames* srcPORDataFrames = this->findOrLoadScalarResult( partIndex, - RigFemResultAddress( RIG_NODAL, - "POR-Bar", - "" ) ); - RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); + RigFemScalarResultFrames* srcPORDataFrames = + this->findOrLoadScalarResult( partIndex, RigFemResultAddress( RIG_NODAL, "POR-Bar", "" ) ); + RigFemScalarResultFrames* dstDataFrames = m_femPartResults[partIndex]->createScalarResult( resVarAddr ); frameCountProgress.incrementProgress(); diff --git a/ApplicationCode/GrpcInterface/RiaGrpcCommandService.cpp b/ApplicationCode/GrpcInterface/RiaGrpcCommandService.cpp index 83b68a8fe6..c234040aaa 100644 --- a/ApplicationCode/GrpcInterface/RiaGrpcCommandService.cpp +++ b/ApplicationCode/GrpcInterface/RiaGrpcCommandService.cpp @@ -193,9 +193,9 @@ void RiaGrpcCommandService::assignPdmFieldValue( caf::PdmValueField* pdmValue { if ( paramDescriptor->is_repeated() ) { - RepeatedFieldRef repeatedField = reflection->GetRepeatedFieldRef( params, - paramDescriptor ); - std::vector stringVector; + RepeatedFieldRef repeatedField = + reflection->GetRepeatedFieldRef( params, paramDescriptor ); + std::vector stringVector; for ( const std::string& string : repeatedField ) { stringVector.push_back( QString::fromStdString( string ) ); diff --git a/ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp index 448385288b..29a8e4d907 100644 --- a/ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp +++ b/ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.cpp @@ -357,8 +357,8 @@ void Riv3dWellLogCurveGeometryGenerator::createNewVerticesAlongSegment( const cv { caf::Line triangleEdge1 = caf::Line( drawSurfaceVertices[j], drawSurfaceVertices[j + 1] ); caf::Line triangleEdge2 = caf::Line( drawSurfaceVertices[j + 2], drawSurfaceVertices[j + 1] ); - cvf::Vec3d triangleNormal = ( triangleEdge1.vector().getNormalized() ^ triangleEdge2.vector().getNormalized() ) - .getNormalized(); + cvf::Vec3d triangleNormal = + ( triangleEdge1.vector().getNormalized() ^ triangleEdge2.vector().getNormalized() ).getNormalized(); cvf::Vec3d currentSubSegment = ptEnd - extraVertices->back(); cvf::Vec3d projectedSegmentVector = currentSubSegment - ( currentSubSegment * triangleNormal ) * triangleNormal; @@ -382,8 +382,9 @@ void Riv3dWellLogCurveGeometryGenerator::createNewVerticesAlongSegment( const cv //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector Riv3dWellLogCurveGeometryGenerator::projectVerticesOntoTriangles( - const std::vector& originalVertices, const std::vector& drawSurfaceVertices ) +std::vector + Riv3dWellLogCurveGeometryGenerator::projectVerticesOntoTriangles( const std::vector& originalVertices, + const std::vector& drawSurfaceVertices ) { std::vector projectedVertices; projectedVertices.reserve( originalVertices.size() ); diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp index c9bd7d7799..25712952e7 100644 --- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp +++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp @@ -57,12 +57,9 @@ void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo( size_t // Create result access objects - cvf::ref cellCenterDataAccessObject = createCellCenterResultAccessor( cellResultColors, - timeStepIndex, - eclipseCase, - eclipseCase->grid( - gridIndex ) ); - cvf::ref cellEdgeResultAccessor = createCellEdgeResultAccessor( cellResultColors, + cvf::ref cellCenterDataAccessObject = + createCellCenterResultAccessor( cellResultColors, timeStepIndex, eclipseCase, eclipseCase->grid( gridIndex ) ); + cvf::ref cellEdgeResultAccessor = createCellEdgeResultAccessor( cellResultColors, cellEdgeResultColors, timeStepIndex, eclipseCase, @@ -371,8 +368,10 @@ cvf::ref //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivCellEdgeGeometryUtils::createCellCenterResultAccessor( - RimEclipseCellColors* cellResultColors, size_t timeStepIndex, RigEclipseCaseData* eclipseCase, const RigGridBase* grid ) +cvf::ref RivCellEdgeGeometryUtils::createCellCenterResultAccessor( RimEclipseCellColors* cellResultColors, + size_t timeStepIndex, + RigEclipseCaseData* eclipseCase, + const RigGridBase* grid ) { cvf::ref resultAccessor = nullptr; diff --git a/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp b/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp index ca4d0d5ff0..cae4ced900 100644 --- a/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp @@ -543,7 +543,8 @@ cvf::ref RivContourMapProjectionPartMgr::createPickPointVisDra /// //-------------------------------------------------------------------------------------------------- bool RivContourMapProjectionPartMgr::lineOverlapsWithPreviousContourLevel( - const cvf::Vec3d& lineCenter, const RimContourMapProjection::ContourPolygons* previousLevel ) const + const cvf::Vec3d& lineCenter, + const RimContourMapProjection::ContourPolygons* previousLevel ) const { const int64_t jump = 50; CVF_ASSERT( previousLevel ); diff --git a/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp index d892505233..8adf72f012 100644 --- a/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp +++ b/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.cpp @@ -242,8 +242,9 @@ cvf::ref RivPipeGeometryGenerator::generateLine( const cvf::Ve //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivPipeGeometryGenerator::generateExtrudedCylinder( - double radius, size_t crossSectionNodeCount, const cvf::Vec3dArray* cylinderCenterCoords ) +cvf::ref RivPipeGeometryGenerator::generateExtrudedCylinder( double radius, + size_t crossSectionNodeCount, + const cvf::Vec3dArray* cylinderCenterCoords ) { CVF_ASSERT( cylinderCenterCoords != nullptr ); @@ -396,8 +397,9 @@ cvf::ref RivPipeGeometryGenerator::generateExtrudedCylinder( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -cvf::ref RivPipeGeometryGenerator::generateVariableRadiusTube( - size_t crossSectionNodeCount, const cvf::Vec3dArray* cylinderCenterCoords, const std::vector& radii ) +cvf::ref RivPipeGeometryGenerator::generateVariableRadiusTube( size_t crossSectionNodeCount, + const cvf::Vec3dArray* cylinderCenterCoords, + const std::vector& radii ) { CVF_ASSERT( cylinderCenterCoords != nullptr ); diff --git a/ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.cpp b/ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.cpp index a1fae65102..aba0e7fafd 100644 --- a/ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.cpp @@ -202,8 +202,9 @@ std::vector> //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector> RivPolylineAnnotationPartMgr::transformPolylinesPointsToDisplay( - const std::vector>& pointsInDomain, const caf::DisplayCoordTransform* displayXf ) +std::vector> + RivPolylineAnnotationPartMgr::transformPolylinesPointsToDisplay( const std::vector>& pointsInDomain, + const caf::DisplayCoordTransform* displayXf ) { std::vector> pointsInDisplay; for ( const auto& pts : pointsInDomain ) diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index cac204fdcd..8f0062244a 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -715,8 +715,8 @@ void RivReservoirViewPartMgr::computeOverriddenCellVisibility( cvf::UByteArray* int cellSetCount = gridsWithCellSetVisibility[masterCaseCells.gridIndex[mcIdx]].size(); for ( int csIdx = 0; csIdx < cellSetCount; ++csIdx ) { - ( *cellVisibility )[lcIdx] |= gridsWithCellSetVisibility[masterCaseCells.gridIndex[mcIdx]] - [masterCaseCells.cellIndex[mcIdx]]; + ( *cellVisibility )[lcIdx] |= + gridsWithCellSetVisibility[masterCaseCells.gridIndex[mcIdx]][masterCaseCells.cellIndex[mcIdx]]; } } #endif @@ -781,7 +781,8 @@ void RivReservoirViewPartMgr::computeRangeVisibility( RivCellSetEnum if ( geometryType == RANGE_FILTERED_WELL_CELLS ) { - geometryType = RANGE_FILTERED; // Use the range filtering in the parent grid, not the well cells in the parent grid + geometryType = + RANGE_FILTERED; // Use the range filtering in the parent grid, not the well cells in the parent grid } RivReservoirPartMgr* reservoirGridPartMgr = &m_geometries[geometryType]; @@ -998,8 +999,8 @@ const cvf::UByteArray* ensureDynamicGeometryPartsCreated( geometryType, timeStepIndex ); ensureStaticGeometryPartsCreated( geometryType ); - RivReservoirPartMgr* pmgr = ( const_cast( this ) ) - ->reservoirPartManager( geometryType, timeStepIndex ); + RivReservoirPartMgr* pmgr = + ( const_cast( this ) )->reservoirPartManager( geometryType, timeStepIndex ); return pmgr->cellVisibility( gridIndex ).p(); } diff --git a/ApplicationCode/ModelVisualization/RivScalarMapperUtils.cpp b/ApplicationCode/ModelVisualization/RivScalarMapperUtils.cpp index eb79f0bad5..f432889e4b 100644 --- a/ApplicationCode/ModelVisualization/RivScalarMapperUtils.cpp +++ b/ApplicationCode/ModelVisualization/RivScalarMapperUtils.cpp @@ -51,11 +51,8 @@ void RivScalarMapperUtils::applyTextureResultsToPart( cvf::Part* p cvf::DrawableGeo* dg = dynamic_cast( part->drawable() ); if ( dg ) dg->setTextureCoordArray( textureCoords ); - cvf::ref scalarEffect = RivScalarMapperUtils::createScalarMapperEffect( mapper, - opacityLevel, - faceCulling, - disableLighting, - undefColor ); + cvf::ref scalarEffect = + RivScalarMapperUtils::createScalarMapperEffect( mapper, opacityLevel, faceCulling, disableLighting, undefColor ); part->setEffect( scalarEffect.p() ); } diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp index 997e0e5784..dfd9058331 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp @@ -277,8 +277,8 @@ void RivSimWellPipesPartMgr::buildWellPipeParts( const caf::DisplayCoordTransfor const RigWellPath* wellPath = wellPaths[brIdx]; - RigEclipseWellLogExtractor* extractor = RiaExtractionTools::findOrCreateSimWellExtractor( m_simWellInView, - wellPath ); + RigEclipseWellLogExtractor* extractor = + RiaExtractionTools::findOrCreateSimWellExtractor( m_simWellInView, wellPath ); if ( extractor ) { std::vector wellPathCellIntersections = @@ -287,8 +287,8 @@ void RivSimWellPipesPartMgr::buildWellPipeParts( const caf::DisplayCoordTransfor for ( const auto& intersectionInfo : wellPathCellIntersections ) { size_t globalCellIndex = intersectionInfo.globCellIndex; - const RigWellResultPoint* wResCell = wResFrame.findResultCellWellHeadIncluded( 0, - globalCellIndex ); + const RigWellResultPoint* wResCell = + wResFrame.findResultCellWellHeadIncluded( 0, globalCellIndex ); if ( !wResCell || !wResCell->isValid() ) { diff --git a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp index 9735f2fbfc..e758927cd3 100644 --- a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp +++ b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp @@ -176,8 +176,11 @@ void RivTernarySaturationOverlayItem::renderGeneric( cvf::OpenGLContext* oglCont //-------------------------------------------------------------------------------------------------- /// Draw the axis using immediate mode OpenGL //-------------------------------------------------------------------------------------------------- -void RivTernarySaturationOverlayItem::renderAxisImmediateMode( - float upperBoundY, float lowerBoundY, float border, unsigned int totalWidth, cvf::OpenGLContext* oglContext ) +void RivTernarySaturationOverlayItem::renderAxisImmediateMode( float upperBoundY, + float lowerBoundY, + float border, + unsigned int totalWidth, + cvf::OpenGLContext* oglContext ) { #ifdef CVF_OPENGL_ES CVF_UNUSED( layout ); diff --git a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h index 24c7b37ef9..9c0f233767 100644 --- a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h +++ b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.h @@ -51,8 +51,11 @@ private: void renderSoftware( cvf::OpenGLContext* oglContext, const cvf::Vec2i& position, const cvf::Vec2ui& size ) override; void renderGeneric( cvf::OpenGLContext* oglContext, const cvf::Vec2i& position, const cvf::Vec2ui& size, bool software ); - void renderAxisImmediateMode( - float upperY, float lowerBoundY, float border, unsigned int totalWidth, cvf::OpenGLContext* oglContext ); + void renderAxisImmediateMode( float upperY, + float lowerBoundY, + float border, + unsigned int totalWidth, + cvf::OpenGLContext* oglContext ); private: cvf::String m_soilRange; diff --git a/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.cpp index 3f6430b89e..bd3857dc3b 100644 --- a/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.cpp +++ b/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.cpp @@ -31,7 +31,8 @@ /// //-------------------------------------------------------------------------------------------------- RivWellConnectionFactorGeometryGenerator::RivWellConnectionFactorGeometryGenerator( - std::vector& completionVizData, float radius ) + std::vector& completionVizData, + float radius ) : m_completionVizData( completionVizData ) , m_radius( radius ) , m_trianglesPerConnection( 0 ) diff --git a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp index 696720222e..78b6008a1e 100644 --- a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp @@ -169,10 +169,8 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel( cvf::ModelBas } } - std::pair injProdFluxPair = flowResults->injectorProducerPairFluxes( injectorName, - producerName, - static_cast( - frameIndex ) ); + std::pair injProdFluxPair = + flowResults->injectorProducerPairFluxes( injectorName, producerName, static_cast( frameIndex ) ); std::pair injProdFluxPairXF = flowResults->injectorProducerPairFluxes( crossFlowInjectorName, crossFlowProducerName, static_cast( @@ -210,12 +208,8 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel( cvf::ModelBas startPoint.z() -= 0.5 * characteristicCellSize; endPoint.z() -= 0.5 * characteristicCellSize; } - cvf::ref arrowPart = createArrowPart( startPoint, - endPoint, - width, - isProducer, - arrowColor, - enableLighting ); + cvf::ref arrowPart = + createArrowPart( startPoint, endPoint, width, isProducer, arrowColor, enableLighting ); model->addPart( arrowPart.p() ); } @@ -223,12 +217,8 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel( cvf::ModelBas { startPoint.z() -= 0.5 * characteristicCellSize; endPoint.z() -= 0.5 * characteristicCellSize; - cvf::ref arrowPart = createArrowPart( startPoint, - endPoint, - widthXf, - !isProducer, - arrowColor, - enableLighting ); + cvf::ref arrowPart = + createArrowPart( startPoint, endPoint, widthXf, !isProducer, arrowColor, enableLighting ); model->addPart( arrowPart.p() ); } } diff --git a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp index a299c8966f..607e558c99 100644 --- a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp @@ -566,10 +566,10 @@ cvf::ref RivWellFracturePartMgr::createStimPlanElementColorSurfacePar QString resultNameFromColors = activeView.fractureColors()->uiResultName(); QString resultUnitFromColors = activeView.fractureColors()->unit(); - std::vector prCellResults = stimPlanFracTemplate - ->fractureGridResults( resultNameFromColors, - resultUnitFromColors, - stimPlanFracTemplate->activeTimeStepIndex() ); + std::vector prCellResults = + stimPlanFracTemplate->fractureGridResults( resultNameFromColors, + resultUnitFromColors, + stimPlanFracTemplate->activeTimeStepIndex() ); textureCoords->reserve( prCellResults.size() * 4 ); @@ -1046,10 +1046,10 @@ cvf::ref QString resultNameFromColors = activeView.fractureColors()->uiResultName(); QString resultUnitFromColors = activeView.fractureColors()->unit(); - std::vector prCellResults = stimPlanFracTemplate - ->fractureGridResults( resultNameFromColors, - resultUnitFromColors, - stimPlanFracTemplate->activeTimeStepIndex() ); + std::vector prCellResults = + stimPlanFracTemplate->fractureGridResults( resultNameFromColors, + resultUnitFromColors, + stimPlanFracTemplate->activeTimeStepIndex() ); m_visibleFracturePolygons.clear(); for ( size_t cIdx = 0; cIdx < stimPlanCells.size(); ++cIdx ) diff --git a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h index 1c61bd1ada..410368c945 100644 --- a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h @@ -89,8 +89,10 @@ private: RimFracture* fracture, bool disableLighting ); - static std::vector transformToFractureDisplayCoords( - const std::vector& polygon, cvf::Mat4d m, const caf::DisplayCoordTransform& displayCoordTransform ); + static std::vector + transformToFractureDisplayCoords( const std::vector& polygon, + cvf::Mat4d m, + const caf::DisplayCoordTransform& displayCoordTransform ); static cvf::ref buildDrawableGeoFromTriangles( const std::vector& triangleIndices, const std::vector& nodeCoords ); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp index 9b457de67e..8ff591e4a9 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp @@ -490,11 +490,11 @@ WellFractureIntersectionData std::vector 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 widthCalc; @@ -596,11 +596,11 @@ WellFractureIntersectionData } { - auto nameUnit = betaFactorParameterNameAndUnit(); - std::vector betaFactorResultValues = m_stimPlanFractureDefinitionData - ->fractureGridResults( nameUnit.first, - nameUnit.second, - m_activeTimeStepIndex ); + auto nameUnit = betaFactorParameterNameAndUnit(); + std::vector betaFactorResultValues = + m_stimPlanFractureDefinitionData->fractureGridResults( nameUnit.first, + nameUnit.second, + m_activeTimeStepIndex ); if ( wellCellIndex < betaFactorResultValues.size() ) { @@ -625,8 +625,8 @@ std::pair RimStimPlanFractureTemplate::widthParameterNameAndUn { if ( m_stimPlanFractureDefinitionData.notNull() ) { - std::vector> propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData - ->getStimPlanPropertyNamesUnits(); + std::vector> propertyNamesUnitsOnFile = + m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits(); for ( const auto& nameUnit : propertyNamesUnitsOnFile ) { @@ -652,8 +652,8 @@ std::pair RimStimPlanFractureTemplate::conductivityParameterNa { if ( m_stimPlanFractureDefinitionData.notNull() ) { - std::vector> propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData - ->getStimPlanPropertyNamesUnits(); + std::vector> propertyNamesUnitsOnFile = + m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits(); for ( const auto& nameUnit : propertyNamesUnitsOnFile ) { @@ -674,8 +674,8 @@ std::pair RimStimPlanFractureTemplate::betaFactorParameterName { if ( m_stimPlanFractureDefinitionData.notNull() ) { - std::vector> propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData - ->getStimPlanPropertyNamesUnits(); + std::vector> propertyNamesUnitsOnFile = + m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits(); for ( const auto& nameUnit : propertyNamesUnitsOnFile ) { @@ -848,8 +848,8 @@ std::vector> RimStimPlanFractureTemplate::uiResultNa std::vector> tmp; - std::vector> propertyNamesUnitsOnFile = m_stimPlanFractureDefinitionData - ->getStimPlanPropertyNamesUnits(); + std::vector> propertyNamesUnitsOnFile = + m_stimPlanFractureDefinitionData->getStimPlanPropertyNamesUnits(); for ( const auto& nameUnitPair : propertyNamesUnitsOnFile ) { if ( nameUnitPair.first.contains( RiaDefines::conductivityResultName(), Qt::CaseInsensitive ) ) @@ -924,8 +924,11 @@ bool RimStimPlanFractureTemplate::hasConductivity() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RimStimPlanFractureTemplate::resultValueAtIJ( - const QString& uiResultName, const QString& unitName, size_t timeStepIndex, size_t i, size_t j ) +double RimStimPlanFractureTemplate::resultValueAtIJ( const QString& uiResultName, + const QString& unitName, + size_t timeStepIndex, + size_t i, + size_t j ) { auto values = resultValues( uiResultName, unitName, timeStepIndex ); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp index 35930765c8..4b95a0ae84 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp @@ -385,8 +385,8 @@ std::map*> RigFlowDiagResultAddress resAddr( RIG_FLD_CELL_FRACTION_RESNAME, RigFlowDiagResultAddress::PHASE_ALL, tracerName.toStdString() ); - const std::vector* tracerCellFractions = m_flowDiagSolution->flowDiagResults() - ->resultValues( resAddr, m_timeStep ); + const std::vector* tracerCellFractions = + m_flowDiagSolution->flowDiagResults()->resultValues( resAddr, m_timeStep ); if ( tracerCellFractions ) tracerCellFractionValues[tracerName] = tracerCellFractions; } } diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 7292e9d770..68db97c685 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -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 accFlow = wfTotalAccumulator - .accumulatedTracerFlowPrPseudoLength( RIG_FLOW_TOTAL_NAME, 0 ); + const std::vector 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& accFlow = wfPhaseAccumulator - .accumulatedTracerFlowPrPseudoLength( tracerName, 0 ); + const std::vector& accFlow = + wfPhaseAccumulator.accumulatedTracerFlowPrPseudoLength( tracerName, 0 ); addStackedCurve( curveName + ", " + tracerName + " " + curveUnitText, depthValues, accFlow, @@ -860,7 +860,8 @@ QList RimWellPltPlot::calculateValueOptions( const caf:: } else if ( fieldNeedingOptions == &m_selectedTimeSteps ) { - std::set channelTypesToUse = RifEclipseRftAddress::pltPlotChannelTypes(); + std::set channelTypesToUse = + RifEclipseRftAddress::pltPlotChannelTypes(); RimWellPlotTools::calculateValueOptionsForTimeSteps( RimWellPlotTools::simWellName( m_wellPathName ), selectedSourcesExpanded(), diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 7680197016..9f1abbf590 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -271,7 +271,8 @@ void RimWellRftPlot::applyInitialSelections() m_selectedSources = sourcesToSelect; { - std::set channelTypesToUse = RifEclipseRftAddress::rftPlotChannelTypes(); + std::set channelTypesToUse = + RifEclipseRftAddress::rftPlotChannelTypes(); auto relevantTimeSteps = RimWellPlotTools::calculateRelevantTimeStepsFromCases( m_wellPathNameOrSimWellName, m_selectedSources, @@ -508,10 +509,10 @@ void RimWellRftPlot::updateCurvesInPlot( const std::set rftAddresses = ensemble->rftStatisticsReader() - ->eclipseRftAddresses( m_wellPathNameOrSimWellName, - curveDefToAdd.timeStep() ); + RimSummaryCaseCollection* ensemble = curveDefToAdd.address().ensemble(); + std::set rftAddresses = + ensemble->rftStatisticsReader()->eclipseRftAddresses( m_wellPathNameOrSimWellName, + curveDefToAdd.timeStep() ); for ( auto rftAddress : rftAddresses ) { if ( rftAddress.wellLogChannel() != RifEclipseRftAddress::TVD ) @@ -799,7 +800,8 @@ QList RimWellRftPlot::calculateValueOptions( const caf:: } else if ( fieldNeedingOptions == &m_selectedTimeSteps ) { - std::set channelTypesToUse = RifEclipseRftAddress::rftPlotChannelTypes(); + std::set channelTypesToUse = + RifEclipseRftAddress::rftPlotChannelTypes(); RimWellPlotTools::calculateValueOptionsForTimeSteps( m_wellPathNameOrSimWellName, selectedSourcesExpanded(), diff --git a/ApplicationCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp b/ApplicationCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp index 862a48e9fc..619c2fec4b 100644 --- a/ApplicationCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp +++ b/ApplicationCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp @@ -191,8 +191,9 @@ void RimPlotTemplateFolderItem::defineEditorAttribute( const caf::PdmFieldHandle //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimPlotTemplateFolderItem::appendOptionItemsForPlotTemplatesRecursively( - QList& options, RimPlotTemplateFolderItem* templateFolderItem, int menuLevel ) +void RimPlotTemplateFolderItem::appendOptionItemsForPlotTemplatesRecursively( QList& options, + RimPlotTemplateFolderItem* templateFolderItem, + int menuLevel ) { { auto subFolders = templateFolderItem->subFolders(); diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index ddeb79b559..686b09d32f 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -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( "

-- Contour Map: %1 --

" diff --git a/ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp b/ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp index 686a945db0..787aac1273 100644 --- a/ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp +++ b/ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp @@ -1160,7 +1160,8 @@ void RimContourMapProjection::generateContourPolygons() /// //-------------------------------------------------------------------------------------------------- RimContourMapProjection::ContourPolygons RimContourMapProjection::createContourPolygonsFromLineSegments( - caf::ContourLines::ListOfLineSegments& unorderedLineSegments, double contourValue ) + caf::ContourLines::ListOfLineSegments& unorderedLineSegments, + double contourValue ) { const double areaThreshold = 1.5 * ( m_sampleSpacing * m_sampleSpacing ) / ( sampleSpacingFactor() * sampleSpacingFactor() ); @@ -1448,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 v; v[0] = cellContainingPoint; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp index 1aae648557..4ed507fd7e 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp @@ -269,9 +269,8 @@ std::vector RimEclipseContourMapProjection::calculateColumnResult( Resul resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "PORO" ), 0 ); const std::vector& ntgResults = resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, "NTG" ), 0 ); - const std::vector& dzResults = resultData->cellScalarResults( RigEclipseResultAddress( RiaDefines::STATIC_NATIVE, - "DZ" ), - 0 ); + const std::vector& 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; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp b/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp index 8e48eb7ca6..09875c17bc 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp @@ -67,8 +67,11 @@ void RimEclipseGeometrySelectionItem::setFromSelectionItem( const RiuEclipseSele //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimEclipseGeometrySelectionItem::setFromCaseGridAndIJK( - RimEclipseCase* eclipseCase, size_t gridIndex, size_t i, size_t j, size_t k ) +void RimEclipseGeometrySelectionItem::setFromCaseGridAndIJK( RimEclipseCase* eclipseCase, + size_t gridIndex, + size_t i, + size_t j, + size_t k ) { m_eclipseCase = eclipseCase; m_gridIndex = gridIndex; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp index 28772625a0..13ab16800b 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -485,11 +485,8 @@ void RimEclipseResultCase::updateFilePathsFromProjectPath( const QString& newPro const std::vector& 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 ); } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 805fad5d5d..5a523f6817 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -1967,10 +1967,10 @@ void RimEclipseResultDefinition::syncInjectorToProducerSelection() { for ( const QString& producer : producers ) { - std::pair commFluxes = flowSol->flowDiagResults() - ->injectorProducerPairFluxes( selectedInjector.toStdString(), - producer.toStdString(), - timeStep ); + std::pair 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 commFluxes = flowSol->flowDiagResults() - ->injectorProducerPairFluxes( injector.toStdString(), - selectedProducer.toStdString(), - timeStep ); + std::pair commFluxes = + flowSol->flowDiagResults()->injectorProducerPairFluxes( injector.toStdString(), + selectedProducer.toStdString(), + timeStep ); if ( std::abs( commFluxes.first ) > epsilon || std::abs( commFluxes.second ) > epsilon ) { newInjectorSelection.insert( injector ); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index 421205af2d..954c1d4ec4 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -547,8 +547,8 @@ void RimEclipseStatisticsCase::fieldChangedByUi( const caf::PdmFieldHandle* chan // Propagate well info to statistics case if ( sourceResultCase->eclipseCaseData() ) { - const cvf::Collection& sourceCaseSimWellData = sourceResultCase->eclipseCaseData() - ->wellResults(); + const cvf::Collection& sourceCaseSimWellData = + sourceResultCase->eclipseCaseData()->wellResults(); setWellResultsAndUpdateViews( sourceCaseSimWellData ); } } diff --git a/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp index b70c89dc91..329ba88936 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp @@ -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 ) ) diff --git a/ApplicationCode/ProjectDataModel/RimFormationNames.cpp b/ApplicationCode/ProjectDataModel/RimFormationNames.cpp index 5b2889005a..de47e9b603 100644 --- a/ApplicationCode/ProjectDataModel/RimFormationNames.cpp +++ b/ApplicationCode/ProjectDataModel/RimFormationNames.cpp @@ -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 ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechContourMapProjection.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechContourMapProjection.cpp index c74fddf133..e020e9ce92 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechContourMapProjection.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechContourMapProjection.cpp @@ -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; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp index d3a2cc04b1..419676f151 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp @@ -235,8 +235,8 @@ QList { 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 ) ); @@ -405,7 +405,9 @@ std::map> RimGeoMechResultDefinition::getR /// //-------------------------------------------------------------------------------------------------- void RimGeoMechResultDefinition::getUiAndResultVariableStringList( - QStringList* uiNames, QStringList* variableNames, const std::map>& fieldCompNames ) + QStringList* uiNames, + QStringList* variableNames, + const std::map>& fieldCompNames ) { CVF_ASSERT( uiNames && variableNames ); diff --git a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp index 475562a973..63ee4067c4 100644 --- a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp @@ -154,8 +154,12 @@ void RimGridTimeHistoryCurve::setFromSelectionItem( const RiuSelectionItem* sele //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimGridTimeHistoryCurve::setFromEclipseCellAndResult( - RimEclipseCase* eclCase, size_t gridIdx, size_t i, size_t j, size_t k, const RigEclipseResultAddress& resAddr ) +void RimGridTimeHistoryCurve::setFromEclipseCellAndResult( RimEclipseCase* eclCase, + size_t gridIdx, + size_t i, + size_t j, + size_t k, + const RigEclipseResultAddress& resAddr ) { delete m_geometrySelectionItem(); delete m_eclipseResultDefinition(); diff --git a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.h b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.h index 258b7497f4..4e37472973 100644 --- a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.h +++ b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.h @@ -53,9 +53,13 @@ public: RimGridTimeHistoryCurve(); ~RimGridTimeHistoryCurve() override; - void setFromSelectionItem( const RiuSelectionItem* selectionItem ); - void setFromEclipseCellAndResult( - RimEclipseCase* eclCase, size_t gridIdx, size_t i, size_t j, size_t k, const RigEclipseResultAddress& resAddr ); + void setFromSelectionItem( const RiuSelectionItem* selectionItem ); + void setFromEclipseCellAndResult( RimEclipseCase* eclCase, + size_t gridIdx, + size_t i, + size_t j, + size_t k, + const RigEclipseResultAddress& resAddr ); RiaDefines::PlotAxis yAxis() const; void setYAxis( RiaDefines::PlotAxis plotAxis ); diff --git a/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp b/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp index 149053c1ff..e001ad5f0d 100644 --- a/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp @@ -165,8 +165,10 @@ RimObservedSummaryData* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimObservedSummaryData* RimObservedDataCollection::createAndAddCvsObservedSummaryDataFromFile( - const QString& fileName, bool useSavedFieldsValuesInDialog, QString* errorText /*= nullptr*/ ) +RimObservedSummaryData* + RimObservedDataCollection::createAndAddCvsObservedSummaryDataFromFile( const QString& fileName, + bool useSavedFieldsValuesInDialog, + QString* errorText /*= nullptr*/ ) { if ( !fileExists( fileName, errorText ) ) return nullptr; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 685c2a7379..237e62077f 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -413,11 +413,8 @@ void RimProject::setProjectFileNameAndUpdateDependencies( const QString& project bool foundFile = false; std::vector searchedPaths; - QString newFilePath = RimTools::relocateFile( filePath->path(), - newProjectPath, - oldProjectPath, - &foundFile, - &searchedPaths ); + QString newFilePath = + RimTools::relocateFile( filePath->path(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths ); filePath->setPath( newFilePath ); } diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp index 546a0dd93f..95cb5c3a5a 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp @@ -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( caf::PdmReferenceHelper::objectFromReference( RiaApplication::instance()->project(), diff --git a/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp index 3b8cb70438..4a174bbcea 100644 --- a/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp @@ -214,8 +214,11 @@ void RimTernaryLegendConfig::updateLegend() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimTernaryLegendConfig::setAutomaticRanges( - TernaryArrayIndex ternaryIndex, double globalMin, double globalMax, double localMin, double localMax ) +void RimTernaryLegendConfig::setAutomaticRanges( TernaryArrayIndex ternaryIndex, + double globalMin, + double globalMax, + double localMin, + double localMax ) { double candidateGlobalAutoMin = roundToNumSignificantDigits( globalMin, precision ); double candidateGlobalAutoMax = roundToNumSignificantDigits( globalMax, precision ); @@ -379,8 +382,12 @@ void RimTernaryLegendConfig::defineEditorAttribute( const caf::PdmFieldHandle* f //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimTernaryLegendConfig::ternaryRanges( - double& soilLower, double& soilUpper, double& sgasLower, double& sgasUpper, double& swatLower, double& swatUpper ) const +void RimTernaryLegendConfig::ternaryRanges( double& soilLower, + double& soilUpper, + double& sgasLower, + double& sgasUpper, + double& swatLower, + double& swatUpper ) const { if ( rangeMode() == AUTOMATIC_CURRENT_TIMESTEP ) { diff --git a/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h b/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h index 09e7ceb039..79addf7128 100644 --- a/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h +++ b/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h @@ -55,8 +55,11 @@ public: ~RimTernaryLegendConfig() override; void setUiValuesFromLegendConfig( const RimTernaryLegendConfig* otherLegendConfig ); - void setAutomaticRanges( - TernaryArrayIndex ternaryIndex, double globalMin, double globalMax, double localMin, double localMax ); + void setAutomaticRanges( TernaryArrayIndex ternaryIndex, + double globalMin, + double globalMax, + double localMin, + double localMax ); void recreateLegend(); bool showLegend() const; diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index 8d5d1fa286..830d4596f9 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -576,8 +576,11 @@ void RimWellLogExtractionCurve::findAndLoadWbsParametersFromLasFiles( const RimW //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellLogExtractionCurve::setAutoNameComponents( - bool addCaseName, bool addProperty, bool addWellname, bool addTimeStep, bool addDate ) +void RimWellLogExtractionCurve::setAutoNameComponents( bool addCaseName, + bool addProperty, + bool addWellname, + bool addTimeStep, + bool addDate ) { m_addCaseNameToCurveName = addCaseName; m_addPropertyToCurveName = addProperty; diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFile.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFile.cpp index 4cc059e5db..c6258567d8 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFile.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFile.cpp @@ -245,11 +245,8 @@ void RimWellLogFile::updateFilePathsFromProjectPath( const QString& newProjectPa bool foundFile = false; std::vector 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; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp index 4a37b38333..67671726bf 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp @@ -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 ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp b/ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp index edd4b8b7ae..eddfad1697 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp @@ -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 ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp index bce453d0cb..c3cb040068 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp @@ -376,7 +376,8 @@ RimSummaryCaseCollection* RimSummaryCaseMainCollection::defaultAllocator() /// //-------------------------------------------------------------------------------------------------- std::vector RimSummaryCaseMainCollection::createSummaryCasesFromFileInfos( - const std::vector& summaryHeaderFileInfos, bool showProgress ) + const std::vector& summaryHeaderFileInfos, + bool showProgress ) { RimProject* project = RiaApplication::instance()->project(); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 1a3e18dfc1..84fa1f6727 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -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() ) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp index 859173ab9f..e7eaaf4d1b 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp @@ -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() ) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index 24a9e48a7f..c9638c859b 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -692,8 +692,8 @@ void RimSummaryTimeAxisProperties::defineEditorAttribute( const caf::PdmFieldHan auto timeAttrib = dynamic_cast( 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 ); } } } diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.cpp index 1762aeec50..2a4d0380bd 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.cpp @@ -166,8 +166,11 @@ void RigCompletionData::setTransmissibility( double transmissibility ) //================================================================================================== /// //================================================================================================== -void RigCompletionData::setTransAndWPImultBackgroundDataFromFishbone( - double transmissibility, double skinFactor, double diameter, CellDirection direction, bool isMainBore ) +void RigCompletionData::setTransAndWPImultBackgroundDataFromFishbone( double transmissibility, + double skinFactor, + double diameter, + CellDirection direction, + bool isMainBore ) { m_completionType = FISHBONES; m_transmissibility = transmissibility; @@ -180,8 +183,12 @@ void RigCompletionData::setTransAndWPImultBackgroundDataFromFishbone( //================================================================================================== /// //================================================================================================== -void RigCompletionData::setTransAndWPImultBackgroundDataFromPerforation( - double transmissibility, double skinFactor, double diameter, double dFactor, double kh, CellDirection direction ) +void RigCompletionData::setTransAndWPImultBackgroundDataFromPerforation( double transmissibility, + double skinFactor, + double diameter, + double dFactor, + double kh, + CellDirection direction ) { m_completionType = PERFORATION; m_transmissibility = transmissibility; @@ -212,8 +219,11 @@ void RigCompletionData::setCombinedValuesExplicitTrans( double transmiss //================================================================================================== /// //================================================================================================== -void RigCompletionData::setCombinedValuesImplicitTransWPImult( - double wpimult, double skinFactor, double diameter, CellDirection celldirection, CompletionType completionType ) +void RigCompletionData::setCombinedValuesImplicitTransWPImult( double wpimult, + double skinFactor, + double diameter, + CellDirection celldirection, + CompletionType completionType ) { m_wpimult = wpimult; m_direction = celldirection; diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.h b/ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.h index bbd7f381ed..5cce5963f9 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.h +++ b/ApplicationCode/ReservoirDataModel/Completions/RigCompletionData.h @@ -98,11 +98,18 @@ public: void setDiameter( double diameter ); void setTransmissibility( double transmissibility ); - void setTransAndWPImultBackgroundDataFromFishbone( - double transmissibility, double skinFactor, double diameter, CellDirection direction, bool isMainBore ); + void setTransAndWPImultBackgroundDataFromFishbone( double transmissibility, + double skinFactor, + double diameter, + CellDirection direction, + bool isMainBore ); - void setTransAndWPImultBackgroundDataFromPerforation( - double transmissibility, double skinFactor, double diameter, double dFactor, double kh, CellDirection direction ); + void setTransAndWPImultBackgroundDataFromPerforation( double transmissibility, + double skinFactor, + double diameter, + double dFactor, + double kh, + CellDirection direction ); void setCombinedValuesExplicitTrans( double transmissibility, double skinFactor, @@ -110,8 +117,11 @@ public: CellDirection celldirection, CompletionType completionType ); - void setCombinedValuesImplicitTransWPImult( - double wpimult, double skinFactor, double diameter, CellDirection celldirection, CompletionType completionType ); + void setCombinedValuesImplicitTransWPImult( double wpimult, + double skinFactor, + double diameter, + CellDirection celldirection, + CompletionType completionType ); bool isNonDarcyFlow() const; void setDFactor( double dFactor ); diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp index 03e9ff10a8..f3f47ba8b5 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.cpp @@ -79,8 +79,8 @@ void RigEclipseToStimPlanCalculator::computeValues() reservoirCellIndicesOpenForFlow, m_fracture ); - const std::vector& fractureCellContributingEclipseCells = eclToFractureTransCalc - .globalIndiciesToContributingEclipseCells(); + const std::vector& fractureCellContributingEclipseCells = + eclToFractureTransCalc.globalIndiciesToContributingEclipseCells(); if ( !fractureCellContributingEclipseCells.empty() ) { @@ -99,8 +99,8 @@ void RigEclipseToStimPlanCalculator::appendDataToTransmissibilityCondenser( bool { for ( const auto& eclToFractureTransCalc : m_singleFractureCellCalculators ) { - const std::vector& fractureCellContributingEclipseCells = eclToFractureTransCalc.second - .globalIndiciesToContributingEclipseCells(); + const std::vector& fractureCellContributingEclipseCells = + eclToFractureTransCalc.second.globalIndiciesToContributingEclipseCells(); const std::vector& fractureCellContributingEclipseCellTransmissibilities = eclToFractureTransCalc.second.contributingEclipseCellTransmissibilities(); diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp index ae3aa2ee79..75b3ce9b05 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp @@ -304,27 +304,30 @@ void RigEclipseToStimPlanCellTransmissibilityCalculator::calculateStimPlanCellsM NTG = dataAccessObjectNTG->cellScalarGlobIdx( reservoirCellIndex ); } - double transmissibility_X = RigFractureTransmissibilityEquations::matrixToFractureTrans( permY, - NTG, - Ay, - dx, - m_fractureSkinFactor, - fractureAreaWeightedlength, - m_cDarcy ); - double transmissibility_Y = RigFractureTransmissibilityEquations::matrixToFractureTrans( permX, - NTG, - Ax, - dy, - m_fractureSkinFactor, - fractureAreaWeightedlength, - m_cDarcy ); - double transmissibility_Z = RigFractureTransmissibilityEquations::matrixToFractureTrans( permZ, - 1.0, - Az, - dz, - m_fractureSkinFactor, - fractureAreaWeightedlength, - m_cDarcy ); + double transmissibility_X = + RigFractureTransmissibilityEquations::matrixToFractureTrans( permY, + NTG, + Ay, + dx, + m_fractureSkinFactor, + fractureAreaWeightedlength, + m_cDarcy ); + double transmissibility_Y = + RigFractureTransmissibilityEquations::matrixToFractureTrans( permX, + NTG, + Ax, + dy, + m_fractureSkinFactor, + fractureAreaWeightedlength, + m_cDarcy ); + double transmissibility_Z = + RigFractureTransmissibilityEquations::matrixToFractureTrans( permZ, + 1.0, + Az, + dz, + m_fractureSkinFactor, + fractureAreaWeightedlength, + m_cDarcy ); transmissibility = sqrt( transmissibility_X * transmissibility_X + transmissibility_Y * transmissibility_Y + transmissibility_Z * transmissibility_Z ); diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp index 3c8c5656e8..0b3246cc99 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp @@ -154,8 +154,8 @@ double RigFractureTransmissibilityEquations::matrixToFractureTrans( double perm, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -double RigFractureTransmissibilityEquations::effectiveInternalFractureToWellTransPDDHC( - double sumScaledMatrixToFractureTrans, double scaledMatrixToWellTrans ) +double RigFractureTransmissibilityEquations::effectiveInternalFractureToWellTransPDDHC( double sumScaledMatrixToFractureTrans, + double scaledMatrixToWellTrans ) { double divisor = sumScaledMatrixToFractureTrans - scaledMatrixToWellTrans; if ( cvf::Math::abs( divisor ) > EPSILON ) diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp index 87ed3d5624..3cb1b93459 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp @@ -226,10 +226,8 @@ std::map RigTransmissibilityCondenser::calculateFicticiousFractu // Sum(T'_mf) double scaledMatrixToFractureTrans = matrixToAllFracturesTrans[globalMatrixCellIdx]; // T'mw - double scaledMatrixToWellTrans = condensedTransmissibility( externalCell, - {true, - RigTransmissibilityCondenser::CellAddress::WELL, - 1} ); + double scaledMatrixToWellTrans = + condensedTransmissibility( externalCell, {true, RigTransmissibilityCondenser::CellAddress::WELL, 1} ); // T'_fjw fictitiousFractureToWellTrans[globalMatrixCellIdx] = RigFractureTransmissibilityEquations::effectiveInternalFractureToWellTransPDDHC( scaledMatrixToFractureTrans, diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp index 37ee31a46b..70ece91b8e 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.cpp @@ -68,7 +68,8 @@ RigVirtualPerforationTransmissibilities::~RigVirtualPerforationTransmissibilitie /// //-------------------------------------------------------------------------------------------------- void RigVirtualPerforationTransmissibilities::setCompletionDataForWellPath( - const RimWellPath* wellPath, const std::vector>& completionsPerTimeStep ) + const RimWellPath* wellPath, + const std::vector>& completionsPerTimeStep ) { auto item = m_mapFromWellToCompletionData.find( wellPath ); @@ -118,7 +119,8 @@ const std::map>& /// //-------------------------------------------------------------------------------------------------- void RigVirtualPerforationTransmissibilities::setCompletionDataForSimWell( - const RigSimWellData* simWellData, const std::vector>& completionsPerTimeStep ) + const RigSimWellData* simWellData, + const std::vector>& completionsPerTimeStep ) { m_mapFromSimWellToCompletionData[simWellData] = completionsPerTimeStep; } diff --git a/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp index 16d8d7a7aa..8af73ec4af 100644 --- a/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.cpp @@ -676,8 +676,9 @@ std::vector RigAccWellFlowCalculator::accumulatedDsBranchFlowPrTracer( c //-------------------------------------------------------------------------------------------------- /// Calculate the flow pr tracer. If inconsistent flow, keep the existing fractions constant //-------------------------------------------------------------------------------------------------- -std::vector RigAccWellFlowCalculator::calculateWellCellFlowPrTracer( - const RigWellResultPoint& wellCell, const std::vector& currentAccumulatedFlowPrTracer ) const +std::vector + RigAccWellFlowCalculator::calculateWellCellFlowPrTracer( const RigWellResultPoint& wellCell, + const std::vector& currentAccumulatedFlowPrTracer ) const { std::vector flowPrTracer( m_tracerNames.size(), 0.0 ); diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigCaseCellResultCalculator.cpp index 77aa766fb8..60407da62f 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultCalculator.cpp @@ -139,11 +139,8 @@ bool RigCaseCellResultCalculator::computeDifference( RigEclipseCaseData* cvf::ref sourceResultAccessor = RigResultAccessorFactory::createFromResultAddress( sourceCase, gridIdx, porosityModel, fIdx, nativeAddress ); - cvf::ref resultModifier = RigResultModifierFactory::createResultModifier( sourceCase, - gridIdx, - porosityModel, - fIdx, - address ); + cvf::ref resultModifier = + RigResultModifierFactory::createResultModifier( sourceCase, gridIdx, porosityModel, fIdx, address ); size_t baseFrameIdx = fIdx; if ( address.isTimeLapse() ) diff --git a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp index d76ee405d0..9f72fb8651 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp @@ -1067,8 +1067,8 @@ bool RigCaseCellResultsData::ensureKnownResultLoaded( const RigEclipseResultAddr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigCaseCellResultsData::findAndLoadResultByName( - const QString& resultName, const std::vector& resultCategorySearchOrder ) +bool RigCaseCellResultsData::findAndLoadResultByName( const QString& resultName, + const std::vector& resultCategorySearchOrder ) { RigEclipseResultAddress adr( resultName ); @@ -1368,7 +1368,8 @@ size_t RigCaseCellResultsData::findOrLoadKnownScalarResult( const RigEclipseResu /// //-------------------------------------------------------------------------------------------------- size_t RigCaseCellResultsData::findOrLoadKnownScalarResultByResultTypeOrder( - const RigEclipseResultAddress& resVarAddr, const std::vector& resultCategorySearchOrder ) + const RigEclipseResultAddress& resVarAddr, + const std::vector& resultCategorySearchOrder ) { std::set otherResultTypesToSearch = {RiaDefines::STATIC_NATIVE, RiaDefines::DYNAMIC_NATIVE, @@ -3028,11 +3029,12 @@ void RigCaseCellResultsData::copyResultsMetaDataFromMainCase( RigEclipseCaseData RiaDefines::PorosityModelType poroModel, std::vector destinationCases ) { - std::vector resAddresses = mainCaseResultsData->results( poroModel )->existingResults(); - std::vector timeStepInfos = mainCaseResultsData->results( poroModel ) - ->timeStepInfos( resAddresses[0] ); + std::vector resAddresses = mainCaseResultsData->results( poroModel )->existingResults(); + std::vector timeStepInfos = + mainCaseResultsData->results( poroModel )->timeStepInfos( resAddresses[0] ); - const std::vector resultInfos = mainCaseResultsData->results( poroModel )->infoForEachResultIndex(); + const std::vector resultInfos = + mainCaseResultsData->results( poroModel )->infoForEachResultIndex(); for ( size_t i = 0; i < destinationCases.size(); i++ ) { diff --git a/ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.cpp b/ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.cpp index 5f28634d5a..ab7ac0cb8e 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseToCaseRangeFilterMapper.cpp @@ -217,47 +217,47 @@ void RigCaseToCaseRangeFilterMapper::convertRangeFilterEndPoints( const RigRange if ( femIsDestination ) { - rangeFilterMatches[cornerIdx] - .cellMatchType = findBestFemCellFromEclCell( eclGrid, - srcRangeCube[cornerIdx][0], - srcRangeCube[cornerIdx][1], - srcRangeCube[cornerIdx][2], - femPart, - &( rangeFilterMatches[cornerIdx].ijk[0] ), - &( rangeFilterMatches[cornerIdx].ijk[1] ), - &( rangeFilterMatches[cornerIdx].ijk[2] ) ); + rangeFilterMatches[cornerIdx].cellMatchType = + findBestFemCellFromEclCell( eclGrid, + srcRangeCube[cornerIdx][0], + srcRangeCube[cornerIdx][1], + srcRangeCube[cornerIdx][2], + femPart, + &( rangeFilterMatches[cornerIdx].ijk[0] ), + &( rangeFilterMatches[cornerIdx].ijk[1] ), + &( rangeFilterMatches[cornerIdx].ijk[2] ) ); - rangeFilterMatches[diagIdx] - .cellMatchType = findBestFemCellFromEclCell( eclGrid, - srcRangeCube[diagIdx][0], - srcRangeCube[diagIdx][1], - srcRangeCube[diagIdx][2], - femPart, - &( rangeFilterMatches[diagIdx].ijk[0] ), - &( rangeFilterMatches[diagIdx].ijk[1] ), - &( rangeFilterMatches[diagIdx].ijk[2] ) ); + rangeFilterMatches[diagIdx].cellMatchType = + findBestFemCellFromEclCell( eclGrid, + srcRangeCube[diagIdx][0], + srcRangeCube[diagIdx][1], + srcRangeCube[diagIdx][2], + femPart, + &( rangeFilterMatches[diagIdx].ijk[0] ), + &( rangeFilterMatches[diagIdx].ijk[1] ), + &( rangeFilterMatches[diagIdx].ijk[2] ) ); } else { - rangeFilterMatches[cornerIdx] - .cellMatchType = findBestEclCellFromFemCell( femPart, - srcRangeCube[cornerIdx][0], - srcRangeCube[cornerIdx][1], - srcRangeCube[cornerIdx][2], - eclGrid, - &( rangeFilterMatches[cornerIdx].ijk[0] ), - &( rangeFilterMatches[cornerIdx].ijk[1] ), - &( rangeFilterMatches[cornerIdx].ijk[2] ) ); + rangeFilterMatches[cornerIdx].cellMatchType = + findBestEclCellFromFemCell( femPart, + srcRangeCube[cornerIdx][0], + srcRangeCube[cornerIdx][1], + srcRangeCube[cornerIdx][2], + eclGrid, + &( rangeFilterMatches[cornerIdx].ijk[0] ), + &( rangeFilterMatches[cornerIdx].ijk[1] ), + &( rangeFilterMatches[cornerIdx].ijk[2] ) ); - rangeFilterMatches[diagIdx] - .cellMatchType = findBestEclCellFromFemCell( femPart, - srcRangeCube[diagIdx][0], - srcRangeCube[diagIdx][1], - srcRangeCube[diagIdx][2], - eclGrid, - &( rangeFilterMatches[diagIdx].ijk[0] ), - &( rangeFilterMatches[diagIdx].ijk[1] ), - &( rangeFilterMatches[diagIdx].ijk[2] ) ); + rangeFilterMatches[diagIdx].cellMatchType = + findBestEclCellFromFemCell( femPart, + srcRangeCube[diagIdx][0], + srcRangeCube[diagIdx][1], + srcRangeCube[diagIdx][2], + eclGrid, + &( rangeFilterMatches[diagIdx].ijk[0] ), + &( rangeFilterMatches[diagIdx].ijk[1] ), + &( rangeFilterMatches[diagIdx].ijk[2] ) ); } if ( rangeFilterMatches[cornerIdx].cellMatchType == EXACT && diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseResultInfo.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseResultInfo.cpp index 5173ab1bfc..695d878cfc 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseResultInfo.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseResultInfo.cpp @@ -33,8 +33,10 @@ RigEclipseTimeStepInfo::RigEclipseTimeStepInfo( const QDateTime& date, int repor //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RigEclipseTimeStepInfo::createTimeStepInfos( - std::vector dates, std::vector reportNumbers, std::vector daysSinceSimulationStarts ) +std::vector + RigEclipseTimeStepInfo::createTimeStepInfos( std::vector dates, + std::vector reportNumbers, + std::vector daysSinceSimulationStarts ) { CVF_ASSERT( dates.size() == reportNumbers.size() ); CVF_ASSERT( dates.size() == daysSinceSimulationStarts.size() ); diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagInterfaceTools.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagInterfaceTools.h index 62f0bede9d..4ec869c9bf 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagInterfaceTools.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagInterfaceTools.h @@ -88,8 +88,10 @@ inline Opm::FlowDiagnostics::ConnectionValues return flux; } -inline Opm::FlowDiagnostics::ConnectionValues extractFluxFieldFromRestartFile( - const Opm::ECLGraph& G, const Opm::ECLRestartData& rstrt, RigFlowDiagResultAddress::PhaseSelection phaseSelection ) +inline Opm::FlowDiagnostics::ConnectionValues + extractFluxFieldFromRestartFile( const Opm::ECLGraph& G, + const Opm::ECLRestartData& rstrt, + RigFlowDiagResultAddress::PhaseSelection phaseSelection ) { auto getFlux = [&G, &rstrt]( const Opm::ECLPhaseIndex p ) { return G.flux( rstrt, p ); }; diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp index ba4b5f0994..4068a3be15 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp @@ -112,7 +112,8 @@ const std::vector* RigFlowDiagResults::findOrCalculateResult( const RigF /// //-------------------------------------------------------------------------------------------------- void RigFlowDiagResults::calculateNativeResultsIfNotPreviouslyAttempted( - size_t timeStepIndex, RigFlowDiagResultAddress::PhaseSelection phaseSelection ) + size_t timeStepIndex, + RigFlowDiagResultAddress::PhaseSelection phaseSelection ) { if ( timeStepIndex >= m_hasAtemptedNativeResults.size() ) return; @@ -231,20 +232,16 @@ std::vector* RigFlowDiagResults::calculateDerivedResult( const RigFlowDi std::vector* RigFlowDiagResults::calculateAverageTOFResult( const RigFlowDiagResultAddress& resVarAddr, size_t timeStepIndex ) { - std::vector*> injectorTOFs = findResultsForSelectedTracers( resVarAddr, - timeStepIndex, - RIG_FLD_TOF_RESNAME, - RimFlowDiagSolution::INJECTOR ); + std::vector*> injectorTOFs = + findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::INJECTOR ); std::vector*> injectorFractions = findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_CELL_FRACTION_RESNAME, RimFlowDiagSolution::INJECTOR ); - std::vector*> producerTOFs = findResultsForSelectedTracers( resVarAddr, - timeStepIndex, - RIG_FLD_TOF_RESNAME, - RimFlowDiagSolution::PRODUCER ); + std::vector*> producerTOFs = + findResultsForSelectedTracers( resVarAddr, timeStepIndex, RIG_FLD_TOF_RESNAME, RimFlowDiagSolution::PRODUCER ); std::vector*> producerFractions = findResultsForSelectedTracers( resVarAddr, timeStepIndex, @@ -899,8 +896,10 @@ RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame RigFlowDiagResults::flowCharacteristicsResults( - int timeStepIndex, const std::vector& visibleActiveCells, double max_pv_fraction ) +RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame + RigFlowDiagResults::flowCharacteristicsResults( int timeStepIndex, + const std::vector& visibleActiveCells, + double max_pv_fraction ) { std::vector tracerNames = m_flowDiagSolution->tracerNames(); diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h index bdf1428fd1..1541cf9ea5 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h @@ -101,8 +101,10 @@ public: double minCommunication, int maxTof ); - RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame flowCharacteristicsResults( - int timeStepIndex, const std::vector& visibleActiveCells, double max_pv_fraction ); + RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame + flowCharacteristicsResults( int timeStepIndex, + const std::vector& visibleActiveCells, + double max_pv_fraction ); RimFlowDiagSolution* flowDiagSolution(); diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp index eb8be44b49..1f69181e34 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp @@ -733,10 +733,10 @@ std::vector { scaling.enable = static_cast( 0 ); } - std::vector graphArr = m_opmFlowDiagStaticData->m_eclSaturationFunc - ->getSatFuncCurve( satFuncRequests, - static_cast( activeCellIndex ), - scaling ); + std::vector graphArr = + m_opmFlowDiagStaticData->m_eclSaturationFunc->getSatFuncCurve( satFuncRequests, + static_cast( activeCellIndex ), + scaling ); for ( size_t i = 0; i < graphArr.size(); i++ ) { const RelPermCurve::Ident curveIdent = curveIdentNameArr[i].first; @@ -786,10 +786,10 @@ std::vector { // Bo { - std::vector graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection - ->getPvtCurve( Opm::ECLPVT::RawCurve::FVF, - Opm::ECLPhaseIndex::Liquid, - static_cast( activeCellIndex ) ); + std::vector graphArr = + m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::FVF, + Opm::ECLPhaseIndex::Liquid, + static_cast( activeCellIndex ) ); for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr ) { if ( srcGraph.press.size() > 0 ) @@ -802,10 +802,10 @@ std::vector // Bg { - std::vector graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection - ->getPvtCurve( Opm::ECLPVT::RawCurve::FVF, - Opm::ECLPhaseIndex::Vapour, - static_cast( activeCellIndex ) ); + std::vector graphArr = + m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::FVF, + Opm::ECLPhaseIndex::Vapour, + static_cast( activeCellIndex ) ); for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr ) { if ( srcGraph.press.size() > 0 ) @@ -821,10 +821,10 @@ std::vector { // Visc_o / mu_o { - std::vector graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection - ->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity, - Opm::ECLPhaseIndex::Liquid, - static_cast( activeCellIndex ) ); + std::vector graphArr = + m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity, + Opm::ECLPhaseIndex::Liquid, + static_cast( activeCellIndex ) ); for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr ) { if ( srcGraph.press.size() > 0 ) @@ -837,10 +837,10 @@ std::vector // Visc_g / mu_g { - std::vector graphArr = m_opmFlowDiagStaticData->m_eclPvtCurveCollection - ->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity, - Opm::ECLPhaseIndex::Vapour, - static_cast( activeCellIndex ) ); + std::vector graphArr = + m_opmFlowDiagStaticData->m_eclPvtCurveCollection->getPvtCurve( Opm::ECLPVT::RawCurve::Viscosity, + Opm::ECLPhaseIndex::Vapour, + static_cast( activeCellIndex ) ); for ( Opm::ECLPVT::PVTGraph srcGraph : graphArr ) { if ( srcGraph.press.size() > 0 ) @@ -864,8 +864,12 @@ std::vector //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesFvf( - size_t activeCellIndex, double pressure, double rs, double rv, double* bo, double* bg ) +bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesFvf( size_t activeCellIndex, + double pressure, + double rs, + double rv, + double* bo, + double* bg ) { if ( bo ) *bo = HUGE_VAL; if ( bg ) *bg = HUGE_VAL; @@ -927,8 +931,12 @@ bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesFvf( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesViscosity( - size_t activeCellIndex, double pressure, double rs, double rv, double* mu_o, double* mu_g ) +bool RigFlowDiagSolverInterface::calculatePvtDynamicPropertiesViscosity( size_t activeCellIndex, + double pressure, + double rs, + double rv, + double* mu_o, + double* mu_g ) { if ( mu_o ) *mu_o = HUGE_VAL; if ( mu_g ) *mu_g = HUGE_VAL; diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h index 7df20264f7..6accbd2431 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h @@ -151,10 +151,18 @@ public: std::vector calculateRelPermCurves( size_t activeCellIndex ); std::vector calculatePvtCurves( PvtCurveType pvtCurveType, size_t activeCellIndex ); - bool calculatePvtDynamicPropertiesFvf( - size_t activeCellIndex, double pressure, double rs, double rv, double* bo, double* bg ); - bool calculatePvtDynamicPropertiesViscosity( - size_t activeCellIndex, double pressure, double rs, double rv, double* mu_o, double* mu_g ); + bool calculatePvtDynamicPropertiesFvf( size_t activeCellIndex, + double pressure, + double rs, + double rv, + double* bo, + double* bg ); + bool calculatePvtDynamicPropertiesViscosity( size_t activeCellIndex, + double pressure, + double rs, + double rv, + double* mu_o, + double* mu_g ); private: std::wstring getInitFileName() const; diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp index 7910f33442..bb3d7ab9ba 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp @@ -404,8 +404,13 @@ size_t RigGridBase::addCoarseningBox( size_t i1, size_t i2, size_t j1, size_t j2 //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RigGridBase::coarseningBox( - size_t coarseningBoxIndex, size_t* i1, size_t* i2, size_t* j1, size_t* j2, size_t* k1, size_t* k2 ) const +void RigGridBase::coarseningBox( size_t coarseningBoxIndex, + size_t* i1, + size_t* i2, + size_t* j1, + size_t* j2, + size_t* k1, + size_t* k2 ) const { CVF_ASSERT( coarseningBoxIndex < m_coarseningBoxInfo.size() ); @@ -446,8 +451,11 @@ cvf::BoundingBox RigGridBase::boundingBox() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RigGridCellFaceVisibilityFilter::isFaceVisible( - size_t i, size_t j, size_t k, cvf::StructGridInterface::FaceType face, const cvf::UByteArray* cellVisibility ) const +bool RigGridCellFaceVisibilityFilter::isFaceVisible( size_t i, + size_t j, + size_t k, + cvf::StructGridInterface::FaceType face, + const cvf::UByteArray* cellVisibility ) const { CVF_TIGHT_ASSERT( m_grid ); diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.h b/ApplicationCode/ReservoirDataModel/RigGridBase.h index dedf0cc4ca..aa9de331e2 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.h +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.h @@ -98,8 +98,8 @@ public: } size_t addCoarseningBox( size_t i1, size_t i2, size_t j1, size_t j2, size_t k1, size_t k2 ); - void coarseningBox( - size_t coarseningBoxIndex, size_t* i1, size_t* i2, size_t* j1, size_t* j2, size_t* k1, size_t* k2 ) const; + void coarseningBox( size_t coarseningBoxIndex, size_t* i1, size_t* i2, size_t* j1, size_t* j2, size_t* k1, size_t* k2 ) + const; cvf::BoundingBox boundingBox(); diff --git a/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp b/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp index 43d79c64a0..a64efa8f52 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp @@ -162,8 +162,8 @@ cvf::ref return NULL; } - std::vector>& scalarSetResults = eclipseCase->results( porosityModel ) - ->cellScalarResults( scalarSetIndex ); + std::vector>& scalarSetResults = + eclipseCase->results( porosityModel )->cellScalarResults( scalarSetIndex ); // A generated result with a generated results for a subset of time steps, will end up with a result container with // less entries than time steps See RiaSetGridProperty command in RiaPropertyDataCommands diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp index 6f452dcfed..c8f792aaff 100644 --- a/ApplicationCode/ReservoirDataModel/RigNNCData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigNNCData.cpp @@ -159,13 +159,14 @@ cvf::StructGridInterface::FaceType RigNNCData::calculateCellFaceOverlap( const R c1.faceIndices( ( cvf::StructGridInterface::FaceType )( fIdx ), &face1 ); c2.faceIndices( cvf::StructGridInterface::oppositeFace( ( cvf::StructGridInterface::FaceType )( fIdx ) ), &face2 ); - bool foundOverlap = cvf::GeometryTools::calculateOverlapPolygonOfTwoQuads( &polygon, - &intersections, - (cvf::EdgeIntersectStorage*)nullptr, - cvf::wrapArrayConst( &mainGrid.nodes() ), - face1.data(), - face2.data(), - 1e-6 ); + bool foundOverlap = + cvf::GeometryTools::calculateOverlapPolygonOfTwoQuads( &polygon, + &intersections, + (cvf::EdgeIntersectStorage*)nullptr, + cvf::wrapArrayConst( &mainGrid.nodes() ), + face1.data(), + face2.data(), + 1e-6 ); if ( foundOverlap ) { diff --git a/ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp index dccf41bcd3..25e9b75cce 100644 --- a/ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp @@ -141,8 +141,8 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator flowrateKatAllTimeSteps.push_back( flowrateK ); size_t nativeTimeStepIndex = caseToApply->uiToNativeTimeStepIndex( timeStep ); - const std::vector* connectionFlowrate = nncData->dynamicConnectionScalarResultByName( nncConnectionProperty, - nativeTimeStepIndex ); + const std::vector* connectionFlowrate = + nncData->dynamicConnectionScalarResultByName( nncConnectionProperty, nativeTimeStepIndex ); flowrateNNCatAllTimeSteps.push_back( connectionFlowrate ); // sum all tracers at current timestep diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp index 93eaac42ab..7e9fbd6bbb 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp @@ -101,11 +101,8 @@ cvf::ref RigResultAccessorFactory::createFromResultAddress( c adjustedTimeStepIndex = 0; } - cvf::ref derivedCandidate = createCombinedResultAccessor( eclipseCase, - gridIndex, - porosityModel, - adjustedTimeStepIndex, - resVarAddr ); + cvf::ref derivedCandidate = + createCombinedResultAccessor( eclipseCase, gridIndex, porosityModel, adjustedTimeStepIndex, resVarAddr ); if ( derivedCandidate.notNull() ) return derivedCandidate; @@ -136,23 +133,26 @@ cvf::ref cvf::ref cellFaceAccessObject = new RigCombTransResultAccessor( grid ); nativeAddr.m_resultName = "TRANX"; - cvf::ref xTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, - gridIndex, - porosityModel, - timeStepIndex, - nativeAddr ); - nativeAddr.m_resultName = "TRANY"; - cvf::ref yTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, - gridIndex, - porosityModel, - timeStepIndex, - nativeAddr ); - nativeAddr.m_resultName = "TRANZ"; - cvf::ref zTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, - gridIndex, - porosityModel, - timeStepIndex, - nativeAddr ); + cvf::ref xTransAccessor = + RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, + gridIndex, + porosityModel, + timeStepIndex, + nativeAddr ); + nativeAddr.m_resultName = "TRANY"; + cvf::ref yTransAccessor = + RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, + gridIndex, + porosityModel, + timeStepIndex, + nativeAddr ); + nativeAddr.m_resultName = "TRANZ"; + cvf::ref zTransAccessor = + RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, + gridIndex, + porosityModel, + timeStepIndex, + nativeAddr ); cellFaceAccessObject->setTransResultAccessors( xTransAccessor.p(), yTransAccessor.p(), zTransAccessor.p() ); @@ -216,24 +216,27 @@ cvf::ref cvf::ref cellFaceAccessObject = new RigCombTransResultAccessor( grid ); - nativeAddr.m_resultName = RiaDefines::riTranXResultName(); - cvf::ref xTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, - gridIndex, - porosityModel, - timeStepIndex, - nativeAddr ); - nativeAddr.m_resultName = RiaDefines::riTranYResultName(); - cvf::ref yTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, - gridIndex, - porosityModel, - timeStepIndex, - nativeAddr ); - nativeAddr.m_resultName = RiaDefines::riTranZResultName(); - cvf::ref zTransAccessor = RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, - gridIndex, - porosityModel, - timeStepIndex, - nativeAddr ); + nativeAddr.m_resultName = RiaDefines::riTranXResultName(); + cvf::ref xTransAccessor = + RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, + gridIndex, + porosityModel, + timeStepIndex, + nativeAddr ); + nativeAddr.m_resultName = RiaDefines::riTranYResultName(); + cvf::ref yTransAccessor = + RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, + gridIndex, + porosityModel, + timeStepIndex, + nativeAddr ); + nativeAddr.m_resultName = RiaDefines::riTranZResultName(); + cvf::ref zTransAccessor = + RigResultAccessorFactory::createNativeFromResultAddress( eclipseCase, + gridIndex, + porosityModel, + timeStepIndex, + nativeAddr ); cellFaceAccessObject->setTransResultAccessors( xTransAccessor.p(), yTransAccessor.p(), zTransAccessor.p() ); @@ -463,8 +466,8 @@ cvf::ref return nullptr; } - const std::vector>& scalarSetResults = eclipseCase->results( porosityModel ) - ->cellScalarResults( resultAddress ); + const std::vector>& scalarSetResults = + eclipseCase->results( porosityModel )->cellScalarResults( resultAddress ); if ( timeStepIndex >= scalarSetResults.size() ) { @@ -485,10 +488,8 @@ cvf::ref bool useGlobalActiveIndex = eclipseCase->results( porosityModel )->isUsingGlobalActiveIndex( resultAddress ); if ( useGlobalActiveIndex ) { - cvf::ref object = new RigActiveCellsResultAccessor( grid, - resultValues, - eclipseCase->activeCellInfo( - porosityModel ) ); + cvf::ref object = + new RigActiveCellsResultAccessor( grid, resultValues, eclipseCase->activeCellInfo( porosityModel ) ); return object; } else diff --git a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp index f7c66f5eb6..cf63145cba 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp @@ -68,9 +68,8 @@ cvf::ref RigResultModifierFactory::createResultModifier( RigE bool useGlobalActiveIndex = eclipseCase->results( porosityModel )->isUsingGlobalActiveIndex( resVarAddr ); if ( useGlobalActiveIndex ) { - cvf::ref object = new RigActiveCellsResultModifier( grid, - eclipseCase->activeCellInfo( porosityModel ), - resultValues ); + cvf::ref object = + new RigActiveCellsResultModifier( grid, eclipseCase->activeCellInfo( porosityModel ), resultValues ); return object; } else diff --git a/ApplicationCode/ReservoirDataModel/RigSimWellData.cpp b/ApplicationCode/ReservoirDataModel/RigSimWellData.cpp index 8b09243a8d..2e795001ea 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimWellData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigSimWellData.cpp @@ -158,7 +158,8 @@ void RigSimWellData::computeStaticWellCellPath() const for ( size_t bIdx = 0; bIdx < m_wellCellsTimeSteps[0].m_wellResultBranches.size(); ++bIdx ) { int branchErtId = m_wellCellsTimeSteps[0].m_wellResultBranches[bIdx].m_ertBranchId; - const std::vector& frameCells = m_wellCellsTimeSteps[0].m_wellResultBranches[bIdx].m_branchResultPoints; + const std::vector& frameCells = + m_wellCellsTimeSteps[0].m_wellResultBranches[bIdx].m_branchResultPoints; std::list& branch = staticWellBranches[branchErtId]; diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp index 195b1ef19f..26249621b1 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp +++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp @@ -685,8 +685,8 @@ private: std::deque wellCellIndices = branchLineIt->second; if ( !startAtFront ) std::reverse( wellCellIndices.begin(), wellCellIndices.end() ); - const std::vector& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0] - .m_branchResultPoints; + const std::vector& orgWellResultPoints = + m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints; #if 1 if ( wellCellIndices.size() ) @@ -739,8 +739,8 @@ private: //-------------------------------------------------------------------------------------------------- void buildCellSearchTree() { - const std::vector& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0] - .m_branchResultPoints; + const std::vector& orgWellResultPoints = + m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints; size_t cellCount = orgWellResultPoints.size(); m_cellBoundingBoxes.resize( cellCount ); @@ -775,8 +775,8 @@ private: //-------------------------------------------------------------------------------------------------- void buildCellsToNeighborsMap() { - const std::vector& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0] - .m_branchResultPoints; + const std::vector& orgWellResultPoints = + m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints; size_t cellCount = orgWellResultPoints.size(); const std::vector& nodes = m_eclipseCaseData->mainGrid()->nodes(); double cellSizeI, cellSizeJ, cellSizeK; @@ -837,8 +837,8 @@ private: //-------------------------------------------------------------------------------------------------- void buildUnusedCellsSet() { - const std::vector& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0] - .m_branchResultPoints; + const std::vector& orgWellResultPoints = + m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints; size_t cellCount = orgWellResultPoints.size(); for ( size_t i = 0; i < cellCount; ++i ) @@ -911,10 +911,10 @@ private: //-------------------------------------------------------------------------------------------------- size_t findBestNeighbor( size_t cell, std::set neighbors ) { - size_t posKNeighbor = cvf::UNDEFINED_SIZE_T; - size_t firstUnused = cvf::UNDEFINED_SIZE_T; - const std::vector& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0] - .m_branchResultPoints; + size_t posKNeighbor = cvf::UNDEFINED_SIZE_T; + size_t firstUnused = cvf::UNDEFINED_SIZE_T; + const std::vector& orgWellResultPoints = + m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints; for ( size_t neighbor : neighbors ) { @@ -1073,8 +1073,8 @@ private: //-------------------------------------------------------------------------------------------------- double calculateWellCellToPointDistance( size_t wellCellIdx, const cvf::Vec3d& point ) { - const std::vector& orgWellResultPoints = m_orgWellResultFrame.m_wellResultBranches[0] - .m_branchResultPoints; + const std::vector& orgWellResultPoints = + m_orgWellResultFrame.m_wellResultBranches[0].m_branchResultPoints; const RigCell& c = m_eclipseCaseData->cellFromWellResultCell( orgWellResultPoints[wellCellIdx] ); diff --git a/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp b/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp index 3a95083304..daedc7fab0 100644 --- a/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp +++ b/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp @@ -279,8 +279,10 @@ std::vector> RigStimPlanFractureDefinition::getStimP //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector> RigStimPlanFractureDefinition::conductivityValuesAtTimeStep( - const QString& resultName, int activeTimeStepIndex, RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const +std::vector> + RigStimPlanFractureDefinition::conductivityValuesAtTimeStep( const QString& resultName, + int activeTimeStepIndex, + RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const { std::vector> conductivityValues; diff --git a/ApplicationCode/ReservoirDataModel/RigWellPath.h b/ApplicationCode/ReservoirDataModel/RigWellPath.h index b798260408..0b79a4e19b 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPath.h +++ b/ApplicationCode/ReservoirDataModel/RigWellPath.h @@ -56,8 +56,10 @@ public: double wellPathAzimuthAngle( const cvf::Vec3d& position ) const; void twoClosestPoints( const cvf::Vec3d& position, cvf::Vec3d* p1, cvf::Vec3d* p2 ) const; - std::pair, std::vector> clippedPointSubset( - double startMD, double endMD, double* horizontalLengthAlongWellToStartClipPoint = nullptr ) const; + std::pair, std::vector> + clippedPointSubset( double startMD, + double endMD, + double* horizontalLengthAlongWellToStartClipPoint = nullptr ) const; std::vector wellPathPointsIncludingInterpolatedIntersectionPoint( double intersectionMeasuredDepth ) const; diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.cpp b/ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.cpp index f757e4ae99..1e2924d92f 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.cpp @@ -57,8 +57,8 @@ std::vector RigWellPathGeometryTools::calculateLineSegmentNormals( c cvf::Vec3d normal( 0, 0, 0 ); if ( cvf::Math::abs( tangent * projectionPlaneNormal ) < 0.7071 ) { - cvf::Vec3d projectedTangent = ( tangent - ( tangent * projectionPlaneNormal ) * projectionPlaneNormal ) - .getNormalized(); + cvf::Vec3d projectedTangent = + ( tangent - ( tangent * projectionPlaneNormal ) * projectionPlaneNormal ).getNormalized(); normal = ( projectedTangent ^ projectionPlaneNormal ).getNormalized(); normal = normal.getTransformedVector( cvf::Mat3d::fromRotation( tangent, planeAngle ) ); } @@ -217,8 +217,8 @@ std::vector RigWellPathGeometryTools::interpolateUndefinedNormals( c if ( lastNormalNonInterpolated.length() > 0.0 && nextNormal.length() > 0.0 ) { // Both last and next are acceptable, interpolate! - currentNormal = ( distanceToNext * lastNormalNonInterpolated + distanceFromLast * nextNormal ) - .getNormalized(); + currentNormal = + ( distanceToNext * lastNormalNonInterpolated + distanceFromLast * nextNormal ).getNormalized(); } else if ( lastNormalNonInterpolated.length() > 0.0 ) { diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp index 110fc813aa..32d4fcb979 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp @@ -33,8 +33,10 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RigWellPathIntersectionTools::findCellIntersectionInfosAlongPath( - const RigEclipseCaseData* caseData, const std::vector& pathCoords, const std::vector& pathMds ) +std::vector + RigWellPathIntersectionTools::findCellIntersectionInfosAlongPath( const RigEclipseCaseData* caseData, + const std::vector& pathCoords, + const std::vector& pathMds ) { std::vector intersectionInfos; diff --git a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.cpp b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.cpp index fbb02cf296..1f7bfa5175 100644 --- a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.cpp +++ b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.cpp @@ -636,8 +636,11 @@ inline double triArea3D( const cvf::Vec3d& v0, const cvf::Vec3d& v1, const cvf:: /// a_i = Area(v_(i-1), v_i, v_(i+1))*Area(p, v_(i-2), v_(i-1))*Area(p, v_(i+1), v_(i+2)) //-------------------------------------------------------------------------------------------------- -cvf::Vec4d GeometryTools::barycentricCoords( - const cvf::Vec3d& v0, const cvf::Vec3d& v1, const cvf::Vec3d& v2, const cvf::Vec3d& v3, const cvf::Vec3d& p ) +cvf::Vec4d GeometryTools::barycentricCoords( const cvf::Vec3d& v0, + const cvf::Vec3d& v1, + const cvf::Vec3d& v2, + const cvf::Vec3d& v3, + const cvf::Vec3d& p ) { cvf::Vec4d w; cvf::Vec4d a; diff --git a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h index e32be20fc5..2405689f3b 100644 --- a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h +++ b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h @@ -53,8 +53,11 @@ public: bool* isLineDirDotNormalNegative ); static cvf::Vec3d barycentricCoords( const cvf::Vec3d& t0, const cvf::Vec3d& t1, const cvf::Vec3d& t2, const cvf::Vec3d& p ); - static cvf::Vec4d barycentricCoords( - const cvf::Vec3d& v0, const cvf::Vec3d& v1, const cvf::Vec3d& v2, const cvf::Vec3d& v3, const cvf::Vec3d& p ); + static cvf::Vec4d barycentricCoords( const cvf::Vec3d& v0, + const cvf::Vec3d& v1, + const cvf::Vec3d& v2, + const cvf::Vec3d& v3, + const cvf::Vec3d& p ); template static DataType interpolateQuad( const cvf::Vec3d& v1, DataType s1, @@ -163,8 +166,13 @@ private: double fractionAlongEdge2; }; - void canonizeAddress( - IndexType& e1P1, IndexType& e1P2, IndexType& e2P1, IndexType& e2P2, bool& flipE1, bool& flipE2, bool& flipE1E2 ); + void canonizeAddress( IndexType& e1P1, + IndexType& e1P2, + IndexType& e2P1, + IndexType& e2P2, + bool& flipE1, + bool& flipE2, + bool& flipE1E2 ); // A map containing the intersection data. The addressing is : // ( when leastVxIdxEdge1 < leastVxIdxEdge2 ) diff --git a/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.cpp b/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.cpp index 5fad0c7e64..e768a7ba6e 100644 --- a/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.cpp +++ b/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.cpp @@ -28,8 +28,13 @@ /// A function to do basic statistical calculations //-------------------------------------------------------------------------------------------------- -void RigStatisticsMath::calculateBasicStatistics( - const std::vector& values, double* min, double* max, double* sum, double* range, double* mean, double* dev ) +void RigStatisticsMath::calculateBasicStatistics( const std::vector& values, + double* min, + double* max, + double* sum, + double* range, + double* mean, + double* dev ) { double m_min( HUGE_VAL ); double m_max( -HUGE_VAL ); @@ -82,8 +87,11 @@ void RigStatisticsMath::calculateBasicStatistics( /// Algorithm: /// https://en.wikipedia.org/wiki/Percentile#Third_variant,_'%22%60UNIQ--postMath-00000052-QINU%60%22' //-------------------------------------------------------------------------------------------------- -void RigStatisticsMath::calculateStatisticsCurves( - const std::vector& values, double* p10, double* p50, double* p90, double* mean ) +void RigStatisticsMath::calculateStatisticsCurves( const std::vector& values, + double* p10, + double* p50, + double* p90, + double* mean ) { CVF_ASSERT( p10 && p50 && p90 && mean ); diff --git a/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.h b/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.h index e1d6b31f08..8d4992b0c6 100644 --- a/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.h +++ b/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.h @@ -34,8 +34,8 @@ public: double* range, double* mean, double* dev ); - static void calculateStatisticsCurves( - const std::vector& values, double* p10, double* p50, double* p90, double* mean ); + static void + calculateStatisticsCurves( const std::vector& values, double* p10, double* p50, double* p90, double* mean ); static std::vector calculateNearestRankPercentiles( const std::vector& inputValues, const std::vector& pValPositions ); diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp index 98b4944faf..b7c804cf3b 100644 --- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp @@ -661,8 +661,8 @@ public: if ( activeCellInfo->isActive( gcIdx ) ) { m_scalarResultsToAdd->at( - m_requestedTimesteps[m_currentTimeStepNumberToRead] )[activeCellInfo->cellResultIndex( - gcIdx )] = readBuffer[acIdx]; + m_requestedTimesteps[m_currentTimeStepNumberToRead] )[activeCellInfo->cellResultIndex( gcIdx )] = + readBuffer[acIdx]; ++acIdx; } } @@ -865,8 +865,8 @@ public: } m_currentResultAddress = resAddr; - scalarResultFrames = rimCase->results( m_porosityModelEnum ) - ->modifiableCellScalarResultTimesteps( m_currentResultAddress ); + scalarResultFrames = + rimCase->results( m_porosityModelEnum )->modifiableCellScalarResultTimesteps( m_currentResultAddress ); size_t timeStepCount = rimCase->results( m_porosityModelEnum )->maxTimeStepCount(); scalarResultFrames->resize( timeStepCount ); @@ -1418,6 +1418,6 @@ public: } }; -static bool RiaGetGridPropertyForSelectedCells_init = RiaSocketCommandFactory::instance() - ->registerCreator( - RiaGetGridPropertyForSelectedCells::commandName() ); +static bool RiaGetGridPropertyForSelectedCells_init = + RiaSocketCommandFactory::instance()->registerCreator( + RiaGetGridPropertyForSelectedCells::commandName() ); diff --git a/ApplicationCode/SocketInterface/RiaSocketTools.cpp b/ApplicationCode/SocketInterface/RiaSocketTools.cpp index 70b2ad8f70..d56290be88 100644 --- a/ApplicationCode/SocketInterface/RiaSocketTools.cpp +++ b/ApplicationCode/SocketInterface/RiaSocketTools.cpp @@ -70,8 +70,11 @@ RimEclipseCase* RiaSocketTools::findCaseFromArgs( RiaSocketServer* server, const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaSocketTools::getCaseInfoFromCase( - RimCase* rimCase, qint64& caseId, QString& caseName, QString& caseType, qint64& caseGroupId ) +void RiaSocketTools::getCaseInfoFromCase( RimCase* rimCase, + qint64& caseId, + QString& caseName, + QString& caseType, + qint64& caseGroupId ) { CVF_ASSERT( rimCase ); diff --git a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp index e32c5cb895..43f312f132 100644 --- a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp +++ b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp @@ -298,8 +298,8 @@ public: for ( size_t bIdx = 0; bIdx < wellResFrame.m_wellResultBranches.size(); ++bIdx ) { - const std::vector& branchResPoints = wellResFrame.m_wellResultBranches[bIdx] - .m_branchResultPoints; + const std::vector& branchResPoints = + wellResFrame.m_wellResultBranches[bIdx].m_branchResultPoints; for ( size_t rpIdx = 0; rpIdx < branchResPoints.size(); ++rpIdx ) { const RigWellResultPoint& resPoint = branchResPoints[rpIdx]; diff --git a/ApplicationCode/UnitTests/ObservedDataParser-Test.cpp b/ApplicationCode/UnitTests/ObservedDataParser-Test.cpp index cbf380e268..ac693d07b0 100644 --- a/ApplicationCode/UnitTests/ObservedDataParser-Test.cpp +++ b/ApplicationCode/UnitTests/ObservedDataParser-Test.cpp @@ -994,72 +994,72 @@ TEST( RifColumnBasedRsmspecParserTest, TestParsingOfDateString ) { { QString txt = "22.12.1900"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_DOT_SEPARATED, df ); } { QString txt = "22-12-1900"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_DASH_SEPARATED, df ); } { QString txt = "22/12/1900"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_SLASH_SEPARATED, df ); } { QString txt = "1900.12.24"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_DOT_SEPARATED, df ); } { QString txt = "1900-12-24"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_DASH_SEPARATED, df ); } { QString txt = "1900/12/24"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_YYYYMMDD_SLASH_SEPARATED, df ); } { QString txt = "12/22/1900"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_MMDDYYYY_SLASH_SEPARATED, df ); } { QString txt = "22/12/1900"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_DDMMYYYY_SLASH_SEPARATED, df ); } { QString txt = "12/22/30"; - RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( - txt ); + RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat df = + RicPasteAsciiDataToSummaryPlotFeatureUi::dateFormatFromString( txt ); EXPECT_EQ( RicPasteAsciiDataToSummaryPlotFeatureUi::DateFormat::DATE_MMDDYY_SLASH_SEPARATED, df ); } diff --git a/ApplicationCode/UnitTests/RiaCellDividingTools-Test.cpp b/ApplicationCode/UnitTests/RiaCellDividingTools-Test.cpp index 6a7b8e2fd9..5449566bc9 100644 --- a/ApplicationCode/UnitTests/RiaCellDividingTools-Test.cpp +++ b/ApplicationCode/UnitTests/RiaCellDividingTools-Test.cpp @@ -49,15 +49,12 @@ TEST( RiaCellDividingTools, flowDistanceCubicMainCell_AreaPointInCenter ) double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point ); - double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() + - ( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() + - ( cvf::Vec3d( 12.5, 17.5, 12.5 ) - point ).length() + - ( cvf::Vec3d( 17.5, 17.5, 12.5 ) - point ).length() + - ( cvf::Vec3d( 12.5, 12.5, 17.5 ) - point ).length() + - ( cvf::Vec3d( 17.5, 12.5, 17.5 ) - point ).length() + - ( cvf::Vec3d( 12.5, 17.5, 17.5 ) - point ).length() + - ( cvf::Vec3d( 17.5, 17.5, 17.5 ) - point ).length() ) / - 8; + double expectedDist = + ( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() + + ( cvf::Vec3d( 12.5, 17.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 12.5 ) - point ).length() + + ( cvf::Vec3d( 12.5, 12.5, 17.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 17.5 ) - point ).length() + + ( cvf::Vec3d( 12.5, 17.5, 17.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 17.5 ) - point ).length() ) / + 8; EXPECT_NEAR( expectedDist, dist, 1e-6 ); } @@ -72,15 +69,12 @@ TEST( RiaCellDividingTools, flowDistanceCubicMainCell_AreaPointNearCorner ) double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point ); - double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() + - ( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() + - ( cvf::Vec3d( 12.5, 17.5, 12.5 ) - point ).length() + - ( cvf::Vec3d( 17.5, 17.5, 12.5 ) - point ).length() + - ( cvf::Vec3d( 12.5, 12.5, 17.5 ) - point ).length() + - ( cvf::Vec3d( 17.5, 12.5, 17.5 ) - point ).length() + - ( cvf::Vec3d( 12.5, 17.5, 17.5 ) - point ).length() + - ( cvf::Vec3d( 17.5, 17.5, 17.5 ) - point ).length() ) / - 8; + double expectedDist = + ( ( cvf::Vec3d( 12.5, 12.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 12.5 ) - point ).length() + + ( cvf::Vec3d( 12.5, 17.5, 12.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 12.5 ) - point ).length() + + ( cvf::Vec3d( 12.5, 12.5, 17.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 17.5 ) - point ).length() + + ( cvf::Vec3d( 12.5, 17.5, 17.5 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 17.5 ) - point ).length() ) / + 8; EXPECT_NEAR( expectedDist, dist, 1e-6 ); } @@ -95,15 +89,12 @@ TEST( RiaCellDividingTools, flowDistanceHighMainCell_AreaPointNearLowerCorner ) double dist = RiaCellDividingTools::computeFlowDistance( mainCellCorners, point ); - double expectedDist = ( ( cvf::Vec3d( 12.5, 12.5, 35 ) - point ).length() + - ( cvf::Vec3d( 17.5, 12.5, 35 ) - point ).length() + - ( cvf::Vec3d( 12.5, 17.5, 35 ) - point ).length() + - ( cvf::Vec3d( 17.5, 17.5, 35 ) - point ).length() + - ( cvf::Vec3d( 12.5, 12.5, 85 ) - point ).length() + - ( cvf::Vec3d( 17.5, 12.5, 85 ) - point ).length() + - ( cvf::Vec3d( 12.5, 17.5, 85 ) - point ).length() + - ( cvf::Vec3d( 17.5, 17.5, 85 ) - point ).length() ) / - 8; + double expectedDist = + ( ( cvf::Vec3d( 12.5, 12.5, 35 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 35 ) - point ).length() + + ( cvf::Vec3d( 12.5, 17.5, 35 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 35 ) - point ).length() + + ( cvf::Vec3d( 12.5, 12.5, 85 ) - point ).length() + ( cvf::Vec3d( 17.5, 12.5, 85 ) - point ).length() + + ( cvf::Vec3d( 12.5, 17.5, 85 ) - point ).length() + ( cvf::Vec3d( 17.5, 17.5, 85 ) - point ).length() ) / + 8; EXPECT_NEAR( expectedDist, dist, 1e-6 ); } diff --git a/ApplicationCode/UnitTests/RiaSummaryCurveAnalyzer-Test.cpp b/ApplicationCode/UnitTests/RiaSummaryCurveAnalyzer-Test.cpp index e57861f356..647cc40809 100644 --- a/ApplicationCode/UnitTests/RiaSummaryCurveAnalyzer-Test.cpp +++ b/ApplicationCode/UnitTests/RiaSummaryCurveAnalyzer-Test.cpp @@ -35,11 +35,8 @@ TEST( RiaSummaryCurveAnalyzer, WellCompletions ) addresses.push_back( adr ); } { - RifEclipseSummaryAddress adr = RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", - wellNameB, - 5, - 4, - 30 ); + RifEclipseSummaryAddress adr = + RifEclipseSummaryAddress::wellCompletionAddress( "quantity_name", wellNameB, 5, 4, 30 ); addresses.push_back( adr ); } diff --git a/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp b/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp index 4228d6be40..4ff4efdaca 100644 --- a/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp +++ b/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp @@ -93,9 +93,8 @@ void RiuCvfOverlayItemWidget::updateFromOverlayItem( caf::TitledOverlayFrame* it cvf::ref rboColor = new cvf::RenderbufferObject( cvf::RenderbufferObject::RGBA, width, height ); - cvf::ref rboDepth = new cvf::RenderbufferObject( cvf::RenderbufferObject::DEPTH_COMPONENT24, - width, - height ); + cvf::ref rboDepth = + new cvf::RenderbufferObject( cvf::RenderbufferObject::DEPTH_COMPONENT24, width, height ); fbo->attachDepthRenderbuffer( rboDepth.p() ); fbo->attachColorRenderbuffer( 0, rboColor.p() ); diff --git a/ApplicationCode/UserInterface/RiuDragDrop.cpp b/ApplicationCode/UserInterface/RiuDragDrop.cpp index faa45f7211..5949aac491 100644 --- a/ApplicationCode/UserInterface/RiuDragDrop.cpp +++ b/ApplicationCode/UserInterface/RiuDragDrop.cpp @@ -404,8 +404,8 @@ bool RiuDragDrop::handleWellLogPlotTrackDrop( Qt::DropAction action, RimWellLogTrack* trackTarget, int insertAtPosition ) { - std::vector wellLogFileChannels = RiuTypedPdmObjects::typedObjectsFromGroup( - draggedObjects ); + std::vector wellLogFileChannels = + RiuTypedPdmObjects::typedObjectsFromGroup( draggedObjects ); if ( wellLogFileChannels.size() > 0 ) { if ( action == Qt::CopyAction ) diff --git a/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.cpp b/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.cpp index 2a9fa1dc1a..e7603985e1 100644 --- a/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.cpp +++ b/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.cpp @@ -164,10 +164,10 @@ void RiuFemTimeHistoryResultAccessor::computeTimeHistoryData() for ( int frameIdx = 0; frameIdx < femPartResultsColl->frameCount(); frameIdx++ ) { - const std::vector& scalarResults = m_geoMechCaseData->femPartResults() - ->resultValues( *m_femResultAddress, - static_cast( m_gridIndex ), - frameIdx ); + const std::vector& scalarResults = + m_geoMechCaseData->femPartResults()->resultValues( *m_femResultAddress, + static_cast( m_gridIndex ), + frameIdx ); if ( scalarResults.size() ) { float scalarValue = scalarResults[scalarResultIndex]; diff --git a/ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp b/ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp index 0ae3944e71..5effd40dfc 100644 --- a/ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp +++ b/ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp @@ -187,8 +187,11 @@ void RiuFlowCharacteristicsPlot::setLorenzCurve( const QStringList& d //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuFlowCharacteristicsPlot::addCurveWithLargeSymbol( - QwtPlot* plot, const QString& curveName, const QColor& color, const QDateTime& dateTime, double timeHistoryValue ) +void RiuFlowCharacteristicsPlot::addCurveWithLargeSymbol( QwtPlot* plot, + const QString& curveName, + const QColor& color, + const QDateTime& dateTime, + double timeHistoryValue ) { auto curve = createEmptyCurve( plot, curveName, color ); diff --git a/ApplicationCode/UserInterface/RiuQwtPlotCurve.cpp b/ApplicationCode/UserInterface/RiuQwtPlotCurve.cpp index 59ab2e8c36..b53ca9d2db 100644 --- a/ApplicationCode/UserInterface/RiuQwtPlotCurve.cpp +++ b/ApplicationCode/UserInterface/RiuQwtPlotCurve.cpp @@ -196,8 +196,13 @@ void RiuQwtPlotCurve::setSamplesFromTimeTAndYValues( const std::vector& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuQwtPlotCurve::drawCurve( - QPainter* p, int style, const QwtScaleMap& xMap, const QwtScaleMap& yMap, const QRectF& canvasRect, int from, int to ) const +void RiuQwtPlotCurve::drawCurve( QPainter* p, + int style, + const QwtScaleMap& xMap, + const QwtScaleMap& yMap, + const QRectF& canvasRect, + int from, + int to ) const { size_t intervalCount = m_polyLineStartStopIndices.size(); if ( intervalCount > 0 ) diff --git a/ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp b/ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp index 50d00ffbdc..734e0df1d0 100644 --- a/ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp +++ b/ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp @@ -125,8 +125,11 @@ int RiuQwtPlotWidget::axisValueFontSize( QwtPlot::Axis axis ) const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuQwtPlotWidget::setAxisFontsAndAlignment( - QwtPlot::Axis axis, int titleFontSize, int valueFontSize, bool titleBold, Qt::AlignmentFlag alignment ) +void RiuQwtPlotWidget::setAxisFontsAndAlignment( QwtPlot::Axis axis, + int titleFontSize, + int valueFontSize, + bool titleBold, + Qt::AlignmentFlag alignment ) { // Axis number font QFont axisFont = this->axisFont( axis ); @@ -279,8 +282,11 @@ void RiuQwtPlotWidget::enableGridLines( QwtPlot::Axis axis, bool majorGridLines, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuQwtPlotWidget::setMajorAndMinorTickIntervals( - QwtPlot::Axis axis, double majorTickInterval, double minorTickInterval, double minValue, double maxValue ) +void RiuQwtPlotWidget::setMajorAndMinorTickIntervals( QwtPlot::Axis axis, + double majorTickInterval, + double minorTickInterval, + double minValue, + double maxValue ) { RiuQwtLinearScaleEngine* scaleEngine = dynamic_cast( this->axisScaleEngine( axis ) ); if ( scaleEngine ) diff --git a/ApplicationCode/UserInterface/RiuQwtPlotWidget.h b/ApplicationCode/UserInterface/RiuQwtPlotWidget.h index 5c9b9286fc..47ea3d259b 100644 --- a/ApplicationCode/UserInterface/RiuQwtPlotWidget.h +++ b/ApplicationCode/UserInterface/RiuQwtPlotWidget.h @@ -83,8 +83,11 @@ public: void enableGridLines( QwtPlot::Axis axis, bool majorGridLines, bool minorGridLines ); - void setMajorAndMinorTickIntervals( - QwtPlot::Axis axis, double majorTickInterval, double minorTickInterval, double minValue, double maxValue ); + void setMajorAndMinorTickIntervals( QwtPlot::Axis axis, + double majorTickInterval, + double minorTickInterval, + double minValue, + double maxValue ); void setAutoTickIntervalCounts( QwtPlot::Axis axis, int maxMajorTickIntervalCount, int maxMinorTickIntervalCount ); double majorTickInterval( QwtPlot::Axis axis ) const; double minorTickInterval( QwtPlot::Axis axis ) const; diff --git a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp index 0d420fafb8..3dc400c75e 100644 --- a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp +++ b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp @@ -576,8 +576,11 @@ QString RiuRelativePermeabilityPlotPanel::determineXAxisTitleFromCurveCollection //-------------------------------------------------------------------------------------------------- /// Add a vertical labeled marker line at the specified saturation value //-------------------------------------------------------------------------------------------------- -void RiuRelativePermeabilityPlotPanel::addVerticalSaturationMarkerLine( - double saturationValue, QString label, QColor color, QwtPlot* plot, std::vector* myPlotMarkers ) +void RiuRelativePermeabilityPlotPanel::addVerticalSaturationMarkerLine( double saturationValue, + QString label, + QColor color, + QwtPlot* plot, + std::vector* myPlotMarkers ) { QwtPlotMarker* lineMarker = new QwtPlotMarker; lineMarker->setXValue( saturationValue ); diff --git a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.h b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.h index b4a91408c7..9463deb0bd 100644 --- a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.h +++ b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.h @@ -92,8 +92,11 @@ private: static QString determineXAxisTitleFromCurveCollection( const std::vector& curveArr ); - static void addVerticalSaturationMarkerLine( - double saturationValue, QString label, QColor color, QwtPlot* plot, std::vector* myPlotMarkers ); + static void addVerticalSaturationMarkerLine( double saturationValue, + QString label, + QColor color, + QwtPlot* plot, + std::vector* myPlotMarkers ); static void addCurveConstSaturationIntersectionMarker( const RigFlowDiagSolverInterface::RelPermCurve& curve, double saturationValue, diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp index b7ae055819..4ab6eb99ab 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.cpp @@ -438,8 +438,8 @@ QString RiuResultTextBuilder::nncResultText() if ( m_reservoirView->currentFaultResultColors() ) { - RigEclipseResultAddress eclipseResultAddress = m_reservoirView->currentFaultResultColors() - ->eclipseResultAddress(); + RigEclipseResultAddress eclipseResultAddress = + m_reservoirView->currentFaultResultColors()->eclipseResultAddress(); RiaDefines::ResultCatType resultType = m_reservoirView->currentFaultResultColors()->resultType(); const std::vector* nncValues = nullptr; if ( resultType == RiaDefines::STATIC_NATIVE ) @@ -547,12 +547,13 @@ void RiuResultTextBuilder::appendTextFromResultColors( RigEclipseCaseData* ecl if ( resultColors->resultVariable().compare( RiaDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive ) == 0 ) { - cvf::ref transResultAccessor = RigResultAccessorFactory:: - createFromResultAddress( eclipseCase, - gridIndex, - porosityModel, - 0, - RigEclipseResultAddress( RiaDefines::combinedTransmissibilityResultName() ) ); + cvf::ref transResultAccessor = + RigResultAccessorFactory::createFromResultAddress( eclipseCase, + gridIndex, + porosityModel, + 0, + RigEclipseResultAddress( + RiaDefines::combinedTransmissibilityResultName() ) ); { double scalarValue = transResultAccessor->cellFaceScalar( cellIndex, cvf::StructGridInterface::POS_I ); resultInfoText->append( QString( "Tran X : %1\n" ).arg( scalarValue ) ); diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp index f571a8ac05..f0eb157e34 100644 --- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp @@ -809,8 +809,8 @@ void RiuSummaryCurveDefSelection::defineUiOrdering( QString uiConfigName, caf::P RiuSummaryCurveDefinitionKeywords::sources() ); sourcesGroup->add( &m_selectedSources ); - caf::PdmUiGroup* itemTypesGroup = uiOrdering.addNewGroupWithKeyword( "Summary Types", - RiuSummaryCurveDefinitionKeywords::summaryTypes() ); + caf::PdmUiGroup* itemTypesGroup = + uiOrdering.addNewGroupWithKeyword( "Summary Types", RiuSummaryCurveDefinitionKeywords::summaryTypes() ); itemTypesGroup->add( &m_selectedSummaryCategories ); caf::PdmField>* summaryiesField = nullptr; @@ -1003,8 +1003,9 @@ std::set RiuSummaryCurveDefSelection::findPossibleSumm //-------------------------------------------------------------------------------------------------- /// Returns the summary addresses that match the selected item type and input selections made in GUI //-------------------------------------------------------------------------------------------------- -std::set RiuSummaryCurveDefSelection::findPossibleSummaryAddresses( - const std::vector& selectedSources, const SummaryIdentifierAndField* identifierAndField ) const +std::set + RiuSummaryCurveDefSelection::findPossibleSummaryAddresses( const std::vector& selectedSources, + const SummaryIdentifierAndField* identifierAndField ) const { std::set addrUnion; @@ -1126,7 +1127,8 @@ SummaryIdentifierAndField* /// //-------------------------------------------------------------------------------------------------- bool RiuSummaryCurveDefSelection::isAddressCompatibleWithControllingFieldSelection( - const RifEclipseSummaryAddress& address, const std::vector& identifierAndFieldList ) const + const RifEclipseSummaryAddress& address, + const std::vector& identifierAndFieldList ) const { for ( const auto& identifierAndField : identifierAndFieldList ) { @@ -1404,7 +1406,8 @@ void RiuSummaryCurveDefSelection::appendOptionItemsForCategories( QList& options, SummaryIdentifierAndField* identifierAndField ) const + QList& options, + SummaryIdentifierAndField* identifierAndField ) const { if ( identifierAndField == nullptr ) return; @@ -1507,8 +1510,8 @@ void RiuSummaryCurveDefSelection::appendOptionItemsForSubCategoriesAndVectors( if ( isVectorField ) { - std::string longVectorName = RiuSummaryQuantityNameInfoProvider::instance() - ->longNameFromQuantityName( itemName, true ); + std::string longVectorName = + RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( itemName, true ); displayName = QString::fromStdString( longVectorName ); displayName += QString( " (%1)" ).arg( QString::fromStdString( itemName ) ); } diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp index 068d5f4fb1..730851cf71 100644 --- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp @@ -60,7 +60,8 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionEditor::summaryAddressSe /// //-------------------------------------------------------------------------------------------------- void RiuSummaryCurveDefSelectionEditor::recursivelyConfigureAndUpdateTopLevelUiOrdering( - const caf::PdmUiOrdering& topLevelUiOrdering, const QString& uiConfigName ) + const caf::PdmUiOrdering& topLevelUiOrdering, + const QString& uiConfigName ) { if ( !m_firstRowLeftLayout || !m_firstRowRightLayout ) return; diff --git a/ApplicationCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp b/ApplicationCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp index e8efe6d66e..8d73f9558d 100644 --- a/ApplicationCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp +++ b/ApplicationCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp @@ -43,8 +43,8 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuTofAccumulatedPhaseFractionsPlot::RiuTofAccumulatedPhaseFractionsPlot( - RimTofAccumulatedPhaseFractionsPlot* plotDefinition, QWidget* parent ) +RiuTofAccumulatedPhaseFractionsPlot::RiuTofAccumulatedPhaseFractionsPlot( RimTofAccumulatedPhaseFractionsPlot* plotDefinition, + QWidget* parent ) : QwtPlot( parent ) , m_watCurve( nullptr ) , m_oilCurve( nullptr ) diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 3bfc85846f..c0e310f444 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -1271,8 +1271,12 @@ void RiuViewerCommands::findFirstItems( Rim3dView* main //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuViewerCommands::ijkFromCellIndex( - Rim3dView* mainOrComparisonView, size_t gridIdx, size_t cellIndex, size_t* i, size_t* j, size_t* k ) +void RiuViewerCommands::ijkFromCellIndex( Rim3dView* mainOrComparisonView, + size_t gridIdx, + size_t cellIndex, + size_t* i, + size_t* j, + size_t* k ) { RimEclipseView* eclipseView = dynamic_cast( mainOrComparisonView ); RimGeoMechView* geomView = dynamic_cast( mainOrComparisonView ); @@ -1311,8 +1315,8 @@ bool RiuViewerCommands::handleOverlayItemPicking( int winPosX, int winPosY ) std::vector legendConfigs = m_reservoirView->legendConfigs(); if ( m_reservoirView->activeComparisonView() ) { - std::vector compViewLegendConfigs = m_reservoirView->activeComparisonView() - ->legendConfigs(); + std::vector compViewLegendConfigs = + m_reservoirView->activeComparisonView()->legendConfigs(); legendConfigs.insert( legendConfigs.end(), compViewLegendConfigs.begin(), compViewLegendConfigs.end() ); } diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.h b/ApplicationCode/UserInterface/RiuViewerCommands.h index f7fda0722f..ac250fa4aa 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.h +++ b/ApplicationCode/UserInterface/RiuViewerCommands.h @@ -80,8 +80,12 @@ private: cvf::uint firstPartTriangleIndex, size_t* cellIndex, size_t* gridIndex ); - void ijkFromCellIndex( - Rim3dView* mainOrComparisonView, size_t gridIdx, size_t cellIndex, size_t* i, size_t* j, size_t* k ); + void ijkFromCellIndex( Rim3dView* mainOrComparisonView, + size_t gridIdx, + size_t cellIndex, + size_t* i, + size_t* j, + size_t* k ); void findFirstItems( Rim3dView* mainOrComparisonView, const std::vector& pickItemInfos, diff --git a/ApplicationCode/UserInterface/RiuWellPathComponentPlotItem.cpp b/ApplicationCode/UserInterface/RiuWellPathComponentPlotItem.cpp index 7eb5bc8c2f..e475306f09 100644 --- a/ApplicationCode/UserInterface/RiuWellPathComponentPlotItem.cpp +++ b/ApplicationCode/UserInterface/RiuWellPathComponentPlotItem.cpp @@ -216,17 +216,11 @@ void RiuWellPathComponentPlotItem::onLoadDataAndUpdate( bool updateParentPlot ) } addMarker( casingTrackEnd, midDepth, 10, RiuQwtSymbol::SYMBOL_RIGHT_ALIGNED_TRIANGLE, componentColor( 0.0 ), label() ); - QwtPlotItem* legendItem1 = createMarker( 16.0, - 0.0, - 6, - RiuQwtSymbol::SYMBOL_RIGHT_ALIGNED_TRIANGLE, - componentColor() ); + QwtPlotItem* legendItem1 = + createMarker( 16.0, 0.0, 6, RiuQwtSymbol::SYMBOL_RIGHT_ALIGNED_TRIANGLE, componentColor() ); legendItem1->setLegendIconSize( QSize( 4, 8 ) ); - QwtPlotItem* legendItem2 = createMarker( 16.0, - 8.0, - 6, - RiuQwtSymbol::SYMBOL_RIGHT_ALIGNED_TRIANGLE, - componentColor() ); + QwtPlotItem* legendItem2 = + createMarker( 16.0, 8.0, 6, RiuQwtSymbol::SYMBOL_RIGHT_ALIGNED_TRIANGLE, componentColor() ); legendItem2->setLegendIconSize( QSize( 4, 8 ) ); m_combinedComponentGroup.addLegendItem( legendItem1 ); m_combinedComponentGroup.addLegendItem( legendItem2 ); @@ -439,12 +433,8 @@ void RiuWellPathComponentPlotItem::addColumnFeature( double startX, { // If we're doing a special pattern, draw the background in white first over the existing pattern cvf::Color4f semiTransparentWhite( cvf::Color3f( cvf::Color3::WHITE ), 0.9f ); - QwtPlotItem* backgroundShape = createColumnShape( startX, - endX, - startDepth, - endDepth, - semiTransparentWhite, - Qt::SolidPattern ); + QwtPlotItem* backgroundShape = + createColumnShape( startX, endX, startDepth, endDepth, semiTransparentWhite, Qt::SolidPattern ); m_combinedComponentGroup.addPlotItem( backgroundShape ); QwtPlotItem* patternShape = createColumnShape( startX, endX, startDepth, endDepth, baseColor, brushStyle ); @@ -474,8 +464,12 @@ void RiuWellPathComponentPlotItem::addColumnFeature( double startX, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QwtPlotItem* RiuWellPathComponentPlotItem::createColumnShape( - double startX, double endX, double startDepth, double endDepth, cvf::Color4f baseColor, Qt::BrushStyle brushStyle ) +QwtPlotItem* RiuWellPathComponentPlotItem::createColumnShape( double startX, + double endX, + double startDepth, + double endDepth, + cvf::Color4f baseColor, + Qt::BrushStyle brushStyle ) { QwtPlotShapeItem* columnShape = new QwtPlotShapeItem( label() ); QPolygonF polygon;